From 80851eee5e98e8c9aa5ca20845a1bb57e42fcc8f Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Mon, 31 Oct 2022 11:16:06 -0700 Subject: [PATCH 1/8] [Nova] Passing Torchvision Smoke Test to build workflow --- .github/workflows/test_build_conda_linux_with_cuda.yml | 2 +- .github/workflows/test_build_conda_m1.yml | 2 +- .github/workflows/test_build_conda_macos.yml | 2 +- .github/workflows/test_build_conda_windows_without_cuda.yml | 2 +- .github/workflows/test_build_wheels_linux_with_cuda.yml | 2 +- .github/workflows/test_build_wheels_m1.yml | 2 +- .github/workflows/test_build_wheels_macos.yml | 2 +- .github/workflows/test_build_wheels_windows.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_build_conda_linux_with_cuda.yml b/.github/workflows/test_build_conda_linux_with_cuda.yml index 19bb56a63f..dc645f0de4 100644 --- a/.github/workflows/test_build_conda_linux_with_cuda.yml +++ b/.github/workflows/test_build_conda_linux_with_cuda.yml @@ -32,7 +32,7 @@ jobs: - repository: pytorch/vision pre-script: "" post-script: "" - smoke-test-script: "" + smoke-test-script: test/smoke_test.py conda-package-directory: packaging/torchvision package-name: torchvision name: ${{ matrix.repository }} diff --git a/.github/workflows/test_build_conda_m1.yml b/.github/workflows/test_build_conda_m1.yml index d950a86b8b..4b8f849490 100644 --- a/.github/workflows/test_build_conda_m1.yml +++ b/.github/workflows/test_build_conda_m1.yml @@ -33,7 +33,7 @@ jobs: pre-script: "" post-script: "" conda-package-directory: packaging/torchvision - smoke-test-script: "" + smoke-test-script: test/smoke_test.py package-name: torchvision - repository: pytorch/text pre-script: "" diff --git a/.github/workflows/test_build_conda_macos.yml b/.github/workflows/test_build_conda_macos.yml index 3fc31d515e..96d0c20003 100644 --- a/.github/workflows/test_build_conda_macos.yml +++ b/.github/workflows/test_build_conda_macos.yml @@ -32,7 +32,7 @@ jobs: pre-script: "" post-script: "" conda-package-directory: packaging/torchvision - smoke-test-script: "" + smoke-test-script: test/smoke_test.py package-name: torchvision - repository: pytorch/text pre-script: "" diff --git a/.github/workflows/test_build_conda_windows_without_cuda.yml b/.github/workflows/test_build_conda_windows_without_cuda.yml index e60ddf8a21..09258c8b27 100644 --- a/.github/workflows/test_build_conda_windows_without_cuda.yml +++ b/.github/workflows/test_build_conda_windows_without_cuda.yml @@ -31,7 +31,7 @@ jobs: conda-package-directory: packaging/torchaudio - repository: pytorch/vision pre-script: "" - post-script: "" + post-script: test/smoke_test.py package-name: torchvision conda-package-directory: packaging/torchvision - repository: pytorch/text diff --git a/.github/workflows/test_build_wheels_linux_with_cuda.yml b/.github/workflows/test_build_wheels_linux_with_cuda.yml index b3b33db043..42e959c474 100644 --- a/.github/workflows/test_build_wheels_linux_with_cuda.yml +++ b/.github/workflows/test_build_wheels_linux_with_cuda.yml @@ -32,7 +32,7 @@ jobs: - repository: pytorch/vision pre-script: "" post-script: "" - smoke-test-script: "" + smoke-test-script: test/smoke_test.py package-name: torchvision uses: ./.github/workflows/build_wheels_linux.yml name: ${{ matrix.repository }} diff --git a/.github/workflows/test_build_wheels_m1.yml b/.github/workflows/test_build_wheels_m1.yml index f8b76c4803..9796511942 100644 --- a/.github/workflows/test_build_wheels_m1.yml +++ b/.github/workflows/test_build_wheels_m1.yml @@ -31,7 +31,7 @@ jobs: - repository: pytorch/vision pre-script: "" post-script: "" - smoke-test-script: "" + smoke-test-script: test/smoke_test.py package-name: torchvision - repository: pytorch/text pre-script: "" diff --git a/.github/workflows/test_build_wheels_macos.yml b/.github/workflows/test_build_wheels_macos.yml index 47b10c55c1..cb4bee1e60 100644 --- a/.github/workflows/test_build_wheels_macos.yml +++ b/.github/workflows/test_build_wheels_macos.yml @@ -31,7 +31,7 @@ jobs: - repository: pytorch/vision pre-script: "" post-script: "" - smoke-test-script: "" + smoke-test-script: test/smoke_test.py package-name: torchvision - repository: pytorch/text pre-script: "" diff --git a/.github/workflows/test_build_wheels_windows.yml b/.github/workflows/test_build_wheels_windows.yml index ed7e7f0499..e4186eadd2 100644 --- a/.github/workflows/test_build_wheels_windows.yml +++ b/.github/workflows/test_build_wheels_windows.yml @@ -34,7 +34,7 @@ jobs: pre-script: "" env-script: packaging/windows/internal/vc_env_helper.bat post-script: "" - smoke-test-script: "" + smoke-test-script: test/smoke_test.py package-name: torchvision - repository: pytorch/text pre-script: "" From 16ac7bb6e265d1df4818a8e8e7cca6335f98ff24 Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Mon, 31 Oct 2022 16:48:29 -0700 Subject: [PATCH 2/8] pytorch should not be installed twice during smoke testing --- .github/workflows/build_conda_macos.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml index a2e58651ca..ea45996b37 100644 --- a/.github/workflows/build_conda_macos.yml +++ b/.github/workflows/build_conda_macos.yml @@ -160,9 +160,6 @@ jobs: echo "${{ inputs.repository }}/${SMOKE_TEST_SCRIPT} not found" else echo "${{ inputs.repository }}/${SMOKE_TEST_SCRIPT} found" - - ${CONDA_RUN} conda install -y pytorch -c pytorch cpuonly - CONDA_BINARY="$(ls ${{ inputs.repository }}/dist/${ARCH_NAME}/*.tar.bz2)" ${CONDA_RUN} conda install -v -y -c pytorch-nightly pytorch From 2b608c3d3defc827f5345d5f534b8350d9aaf92f Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Mon, 31 Oct 2022 17:33:48 -0700 Subject: [PATCH 3/8] fix error with passing smoke test to windows post script --- .github/workflows/test_build_conda_windows_without_cuda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build_conda_windows_without_cuda.yml b/.github/workflows/test_build_conda_windows_without_cuda.yml index 09258c8b27..e60ddf8a21 100644 --- a/.github/workflows/test_build_conda_windows_without_cuda.yml +++ b/.github/workflows/test_build_conda_windows_without_cuda.yml @@ -31,7 +31,7 @@ jobs: conda-package-directory: packaging/torchaudio - repository: pytorch/vision pre-script: "" - post-script: test/smoke_test.py + post-script: "" package-name: torchvision conda-package-directory: packaging/torchvision - repository: pytorch/text From ed729301d1a9eed90d4344c99b44e6876b950b83 Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Mon, 31 Oct 2022 18:11:27 -0700 Subject: [PATCH 4/8] dont install ffmpeg for every domain --- .github/workflows/build_conda_macos.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml index ea45996b37..5e19771902 100644 --- a/.github/workflows/build_conda_macos.yml +++ b/.github/workflows/build_conda_macos.yml @@ -165,7 +165,10 @@ jobs: ${CONDA_RUN} conda install -v -y -c pytorch-nightly pytorch ${CONDA_RUN} conda install --offline "$CONDA_BINARY" - ${CONDA_RUN} conda install -y 'ffmpeg<5' + if [[ "${{ inputs.package-name }}" = "torchaudio" ]]; then + ${CONDA_RUN} conda install -y 'ffmpeg<5' + fi + ${CONDA_RUN} python3 "${{ inputs.repository }}/${SMOKE_TEST_SCRIPT}" fi - name: Upload package to conda From 6cd0caa00fa258fc4fc352571fa916b2eae341ff Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Wed, 2 Nov 2022 15:31:26 -0700 Subject: [PATCH 5/8] try non-offline install in the smoke tests to see if it pulls down numpy --- .github/workflows/build_conda_macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml index 5e19771902..7f914acd80 100644 --- a/.github/workflows/build_conda_macos.yml +++ b/.github/workflows/build_conda_macos.yml @@ -163,7 +163,8 @@ jobs: CONDA_BINARY="$(ls ${{ inputs.repository }}/dist/${ARCH_NAME}/*.tar.bz2)" ${CONDA_RUN} conda install -v -y -c pytorch-nightly pytorch - ${CONDA_RUN} conda install --offline "$CONDA_BINARY" + # ${CONDA_RUN} conda install --offline "$CONDA_BINARY" + ${CONDA RUN} conda install -v -y "$CONDA_BINARY" if [[ "${{ inputs.package-name }}" = "torchaudio" ]]; then ${CONDA_RUN} conda install -y 'ffmpeg<5' From 85bf3144d6f3dfa931cfe7d57ab4751610b3849e Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Wed, 2 Nov 2022 15:43:41 -0700 Subject: [PATCH 6/8] typo --- .github/workflows/build_conda_macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml index 7f914acd80..d1afce8c63 100644 --- a/.github/workflows/build_conda_macos.yml +++ b/.github/workflows/build_conda_macos.yml @@ -164,7 +164,7 @@ jobs: ${CONDA_RUN} conda install -v -y -c pytorch-nightly pytorch # ${CONDA_RUN} conda install --offline "$CONDA_BINARY" - ${CONDA RUN} conda install -v -y "$CONDA_BINARY" + ${CONDA_RUN} conda install -v -y "$CONDA_BINARY" if [[ "${{ inputs.package-name }}" = "torchaudio" ]]; then ${CONDA_RUN} conda install -y 'ffmpeg<5' From 92821f8a834e269722068f29b4b6610b47b68075 Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Wed, 2 Nov 2022 15:57:18 -0700 Subject: [PATCH 7/8] do explicit numpy install --- .github/workflows/build_conda_macos.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml index d1afce8c63..22172a3b1b 100644 --- a/.github/workflows/build_conda_macos.yml +++ b/.github/workflows/build_conda_macos.yml @@ -163,12 +163,15 @@ jobs: CONDA_BINARY="$(ls ${{ inputs.repository }}/dist/${ARCH_NAME}/*.tar.bz2)" ${CONDA_RUN} conda install -v -y -c pytorch-nightly pytorch - # ${CONDA_RUN} conda install --offline "$CONDA_BINARY" - ${CONDA_RUN} conda install -v -y "$CONDA_BINARY" + ${CONDA_RUN} conda install --offline "$CONDA_BINARY" + # ${CONDA_RUN} conda install -v -y "$CONDA_BINARY" if [[ "${{ inputs.package-name }}" = "torchaudio" ]]; then ${CONDA_RUN} conda install -y 'ffmpeg<5' fi + if [[ "${{ inputs.package-name }}" = "torchvision" ]]; then + ${CONDA_RUN} conda install -y 'numpy>=1.11' + fi ${CONDA_RUN} python3 "${{ inputs.repository }}/${SMOKE_TEST_SCRIPT}" fi From 9aff0ba160545d2e805e01a18d71a958652a905f Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Wed, 2 Nov 2022 17:25:46 -0700 Subject: [PATCH 8/8] remove comment --- .github/workflows/build_conda_macos.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml index 22172a3b1b..d553a5b57f 100644 --- a/.github/workflows/build_conda_macos.yml +++ b/.github/workflows/build_conda_macos.yml @@ -164,7 +164,6 @@ jobs: ${CONDA_RUN} conda install -v -y -c pytorch-nightly pytorch ${CONDA_RUN} conda install --offline "$CONDA_BINARY" - # ${CONDA_RUN} conda install -v -y "$CONDA_BINARY" if [[ "${{ inputs.package-name }}" = "torchaudio" ]]; then ${CONDA_RUN} conda install -y 'ffmpeg<5'