From 8fc8dd2bdbe3669f2b8663287aa3da416ec0c6c0 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 27 Mar 2023 13:08:13 -0700 Subject: [PATCH 1/8] testing vision --- .../test_build_wheels_windows_with_cuda.yml | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test_build_wheels_windows_with_cuda.yml b/.github/workflows/test_build_wheels_windows_with_cuda.yml index 8bd6324d54..a7af97bab0 100644 --- a/.github/workflows/test_build_wheels_windows_with_cuda.yml +++ b/.github/workflows/test_build_wheels_windows_with_cuda.yml @@ -24,13 +24,19 @@ jobs: fail-fast: false matrix: include: - - repository: pytorch/audio - pre-script: packaging/ffmpeg/build.bat - env-script: packaging/vc_env_helper.bat - wheel-build-params: "--plat-name win_amd64" - post-script: "" - smoke-test-script: "" - package-name: torchaudio + #- repository: pytorch/audio + # pre-script: packaging/ffmpeg/build.bat + # env-script: packaging/vc_env_helper.bat + # wheel-build-params: "--plat-name win_amd64" + # post-script: "" + # smoke-test-script: "" + # package-name: torchaudio + - repository: pytorch/vision + pre-script: packaging/pre_build_script.sh + env-script: packaging/windows/internal/vc_env_helper.bat + post-script: packaging/post_build_script.sh + smoke-test-script: test/smoke_test.py + package-name: torchvision uses: ./.github/workflows/build_wheels_windows.yml name: ${{ matrix.repository }} with: From fb562674e4bea7724e4ee51a923a06117c86a2b4 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 28 Mar 2023 15:05:28 -0700 Subject: [PATCH 2/8] use vc instal helper --- .github/workflows/test_build_wheels_windows_with_cuda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build_wheels_windows_with_cuda.yml b/.github/workflows/test_build_wheels_windows_with_cuda.yml index a7af97bab0..27eeb3d802 100644 --- a/.github/workflows/test_build_wheels_windows_with_cuda.yml +++ b/.github/workflows/test_build_wheels_windows_with_cuda.yml @@ -32,7 +32,7 @@ jobs: # smoke-test-script: "" # package-name: torchaudio - repository: pytorch/vision - pre-script: packaging/pre_build_script.sh + pre-script: packaging/windows/internal/vc_install_helper.sh env-script: packaging/windows/internal/vc_env_helper.bat post-script: packaging/post_build_script.sh smoke-test-script: test/smoke_test.py From db9ea330900a43996d1ea1364d033a9c3f8e2093 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 28 Mar 2023 15:47:00 -0700 Subject: [PATCH 3/8] testing --- .github/workflows/build_wheels_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 8fc5bdd5ac..b9394db707 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -166,7 +166,7 @@ jobs: echo "::error::Specified post-script file (${POST_SCRIPT}) not found, not going execute it" exit 1 else - ${CONDA_RUN} bash "${POST_SCRIPT}" + ${CONDA_RUN} ${ENV_SCRIPT} bash "${POST_SCRIPT}" fi - name: Smoke Test env: From f42a1340f6923c7c1a5fbdba79adce8de2e26837 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 29 Mar 2023 11:59:43 -0700 Subject: [PATCH 4/8] testing --- .github/workflows/build_wheels_windows.yml | 2 +- .github/workflows/test_build_wheels_windows_with_cuda.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index b9394db707..54fb05d61f 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -166,7 +166,7 @@ jobs: echo "::error::Specified post-script file (${POST_SCRIPT}) not found, not going execute it" exit 1 else - ${CONDA_RUN} ${ENV_SCRIPT} bash "${POST_SCRIPT}" + ${CONDA_RUN} ${ENV_SCRIPT} "${POST_SCRIPT}" fi - name: Smoke Test env: diff --git a/.github/workflows/test_build_wheels_windows_with_cuda.yml b/.github/workflows/test_build_wheels_windows_with_cuda.yml index 27eeb3d802..f0b04de2a4 100644 --- a/.github/workflows/test_build_wheels_windows_with_cuda.yml +++ b/.github/workflows/test_build_wheels_windows_with_cuda.yml @@ -34,7 +34,7 @@ jobs: - repository: pytorch/vision pre-script: packaging/windows/internal/vc_install_helper.sh env-script: packaging/windows/internal/vc_env_helper.bat - post-script: packaging/post_build_script.sh + post-script: "python packaging/wheel/relocate.py" smoke-test-script: test/smoke_test.py package-name: torchvision uses: ./.github/workflows/build_wheels_windows.yml From 81b4242879299f4e6795a47e7e77d57c2e0468a4 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 29 Mar 2023 12:39:26 -0700 Subject: [PATCH 5/8] test --- .github/workflows/build_wheels_windows.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 54fb05d61f..2c5c4e9f10 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -162,12 +162,7 @@ jobs: if: ${{ inputs.post-script != '' }} run: | source "${BUILD_ENV_FILE}" - if [[ ! -f ${POST_SCRIPT} ]]; then - echo "::error::Specified post-script file (${POST_SCRIPT}) not found, not going execute it" - exit 1 - else - ${CONDA_RUN} ${ENV_SCRIPT} "${POST_SCRIPT}" - fi + ${CONDA_RUN} ${ENV_SCRIPT} ${POST_SCRIPT} - name: Smoke Test env: PACKAGE_NAME: ${{ inputs.package-name }} From eeee9168ea04b1d7e6c32e9e8b1213445379e087 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 29 Mar 2023 12:54:16 -0700 Subject: [PATCH 6/8] test --- .github/workflows/build_wheels_windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 2c5c4e9f10..7f61ecbe9b 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -159,8 +159,10 @@ jobs: working-directory: ${{ inputs.repository }} env: POST_SCRIPT: ${{ inputs.post-script }} + ENV_SCRIPT: ${{ inputs.env-script }} if: ${{ inputs.post-script != '' }} run: | + set -euxo pipefail source "${BUILD_ENV_FILE}" ${CONDA_RUN} ${ENV_SCRIPT} ${POST_SCRIPT} - name: Smoke Test From fa17b981a56009bcb54c6f5a5eac86a2a2c6c4fc Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 30 Mar 2023 08:37:12 -0700 Subject: [PATCH 7/8] testing --- .github/workflows/test_build_wheels_windows_with_cuda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build_wheels_windows_with_cuda.yml b/.github/workflows/test_build_wheels_windows_with_cuda.yml index f0b04de2a4..c068510f35 100644 --- a/.github/workflows/test_build_wheels_windows_with_cuda.yml +++ b/.github/workflows/test_build_wheels_windows_with_cuda.yml @@ -32,7 +32,7 @@ jobs: # smoke-test-script: "" # package-name: torchaudio - repository: pytorch/vision - pre-script: packaging/windows/internal/vc_install_helper.sh + pre-script: packaging/pre_build_script.sh env-script: packaging/windows/internal/vc_env_helper.bat post-script: "python packaging/wheel/relocate.py" smoke-test-script: test/smoke_test.py From 9b891cc082168d0f9725b7248cc89dcad0c9c216 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 30 Mar 2023 10:39:11 -0700 Subject: [PATCH 8/8] Enable audio --- .../test_build_wheels_windows_with_cuda.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test_build_wheels_windows_with_cuda.yml b/.github/workflows/test_build_wheels_windows_with_cuda.yml index c068510f35..28329b6b12 100644 --- a/.github/workflows/test_build_wheels_windows_with_cuda.yml +++ b/.github/workflows/test_build_wheels_windows_with_cuda.yml @@ -24,13 +24,13 @@ jobs: fail-fast: false matrix: include: - #- repository: pytorch/audio - # pre-script: packaging/ffmpeg/build.bat - # env-script: packaging/vc_env_helper.bat - # wheel-build-params: "--plat-name win_amd64" - # post-script: "" - # smoke-test-script: "" - # package-name: torchaudio + - repository: pytorch/audio + pre-script: packaging/ffmpeg/build.bat + env-script: packaging/vc_env_helper.bat + wheel-build-params: "--plat-name win_amd64" + post-script: "" + smoke-test-script: "" + package-name: torchaudio - repository: pytorch/vision pre-script: packaging/pre_build_script.sh env-script: packaging/windows/internal/vc_env_helper.bat