From acd3a3a4ced7d6c640e07b3fa836915d6edf4253 Mon Sep 17 00:00:00 2001 From: Ean Garvey <87458719+monorimet@users.noreply.github.com> Date: Wed, 24 Jan 2024 10:46:45 -0600 Subject: [PATCH 1/2] Fix nightly build for Studio2. --- .github/workflows/nightly.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0bfcd4b0c7..54a4752a74 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -77,7 +77,7 @@ jobs: linux-build: - runs-on: a100 + runs-on: nodai-ubuntu-builder-large strategy: fail-fast: false matrix: @@ -123,16 +123,8 @@ jobs: pip wheel -v -w wheelhouse . --pre -f https://download.pytorch.org/whl/nightly/torch -f https://llvm.github.io/torch-mlir/package-index/ -f https://openxla.github.io/iree/pip-release-links.html # Install the built wheel pip install ./wheelhouse/nodai* - # Validate the Models - /bin/bash "$GITHUB_WORKSPACE/build_tools/populate_sharktank_ci.sh" - pytest --ci --ci_sha=${SHORT_SHA} --local_tank_cache="./gen_shark_tank/" -k "not metal" | - tail -n 1 | - tee -a pytest_results.txt - if !(grep -Fxq " failed" pytest_results.txt) - then - export SHA=$(git log -1 --format='%h') - gsutil -m cp -r $GITHUB_WORKSPACE/gen_shark_tank/* gs://shark_tank/${DATE}_$SHA - gsutil -m cp -r gs://shark_tank/${DATE}_$SHA/* gs://shark_tank/nightly/ + # Run API tests + python apps/shark_studio/tests/api_test.py fi rm -rf ./wheelhouse/nodai* @@ -147,7 +139,5 @@ jobs: pip wheel -v -w wheelhouse . --pre -f https://download.pytorch.org/whl/nightly/torch -f https://llvm.github.io/torch-mlir/package-index/ -f https://nod-ai.github.io/SRT/pip-release-links.html # Install the built wheel pip install ./wheelhouse/nodai* - # Validate the Models - pytest --ci --ci_sha=${SHORT_SHA} -k "not metal" | - tail -n 1 | - tee -a pytest_results.txt + # Run API tests + python apps/shark_studio/tests/api_test.py From d46ccb10aac0b3d5c671bc4b6d1ae791b0734d2f Mon Sep 17 00:00:00 2001 From: Ean Garvey <87458719+monorimet@users.noreply.github.com> Date: Wed, 24 Jan 2024 10:49:00 -0600 Subject: [PATCH 2/2] Disable .exe build for studio2 Pending completion of studio2 app pyinstaller implementation. --- .github/workflows/nightly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 54a4752a74..db7580663f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -52,10 +52,10 @@ jobs: ./setup_venv.ps1 $env:SHARK_PACKAGE_VERSION=${{ env.package_version }} pip wheel -v -w dist . --pre -f https://download.pytorch.org/whl/nightly/cpu -f https://llvm.github.io/torch-mlir/package-index/ -f https://nod-ai.github.io/SRT/pip-release-links.html - python process_skipfiles.py - pyinstaller .\apps\stable_diffusion\shark_sd.spec - mv ./dist/nodai_shark_studio.exe ./dist/nodai_shark_studio_${{ env.package_version_ }}.exe - signtool sign /f c:\g\shark_02152023.cer /fd certHash /csp "eToken Base Cryptographic Provider" /k "${{ secrets.CI_CERT }}" ./dist/nodai_shark_studio_${{ env.package_version_ }}.exe + # python process_skipfiles.py + # pyinstaller .\apps\stable_diffusion\shark_sd.spec + # mv ./dist/nodai_shark_studio.exe ./dist/nodai_shark_studio_${{ env.package_version_ }}.exe + # signtool sign /f c:\g\shark_02152023.cer /fd certHash /csp "eToken Base Cryptographic Provider" /k "${{ secrets.CI_CERT }}" ./dist/nodai_shark_studio_${{ env.package_version_ }}.exe - name: Upload Release Assets id: upload-release-assets