From a8a270f6c692b1ff58cb9eb4a6e0689b61b7d938 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 1 May 2023 13:38:38 -0700 Subject: [PATCH 1/7] [Nova] Add windows conda builds --- .github/workflows/build-conda-windows.yml | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/build-conda-windows.yml diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml new file mode 100644 index 0000000000..5e77760113 --- /dev/null +++ b/.github/workflows/build-conda-windows.yml @@ -0,0 +1,57 @@ +name: Build Windows Conda + +on: + pull_request: + push: + branches: + - nightly + - main + - release/* + tags: + # NOTE: Binary build pipelines should only get triggered on release candidate builds + # Release candidate tags look like: v1.11.0-rc1 + - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ + workflow_dispatch: + +jobs: + generate-matrix: + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + with: + package-type: conda + os: windows + test-infra-repository: pytorch/test-infra + test-infra-ref: main + build: + needs: generate-matrix + strategy: + fail-fast: false + matrix: + include: + - repository: pytorch/audio + pre-script: packaging/ffmpeg/build.bat + env-script: "" + wheel-build-params: "--plat-name win_amd64" + post-script: "" + smoke-test-script: "" + package-name: torchaudio + conda-package-directory: packaging/torchaudio + name: ${{ matrix.repository }} + uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main + with: + conda-package-directory: ${{ matrix.conda-package-directory }} + repository: ${{ matrix.repository }} + ref: "" + test-infra-repository: pytorch/test-infra + test-infra-ref: main + build-matrix: ${{ needs.generate-matrix.outputs.matrix }} + pre-script: ${{ matrix.pre-script }} + env-script: ${{ matrix.env-script }} + post-script: ${{ matrix.post-script }} + package-name: ${{ matrix.package-name }} + smoke-test-script: ${{ matrix.smoke-test-script }} + # Using "development" as trigger event so these binaries are not uploaded + # to official channels yet + trigger-event: development + secrets: + AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }} + AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }} From 36683e472bb8286f82031efb61b7a2b14e19371b Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 1 May 2023 13:50:52 -0700 Subject: [PATCH 2/7] Remove invalid param --- .github/workflows/build-conda-windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index 5e77760113..bc819d0fe3 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -38,7 +38,6 @@ jobs: name: ${{ matrix.repository }} uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main with: - conda-package-directory: ${{ matrix.conda-package-directory }} repository: ${{ matrix.repository }} ref: "" test-infra-repository: pytorch/test-infra From 0b546e0bdd6b7649b8868cbe0afb371820e1b987 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 1 May 2023 17:12:45 -0700 Subject: [PATCH 3/7] Fix typo --- .github/workflows/build-conda-windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index bc819d0fe3..54f3eac773 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -36,8 +36,9 @@ jobs: package-name: torchaudio conda-package-directory: packaging/torchaudio name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main + uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main with: + conda-package-directory: packaging/torchaudio repository: ${{ matrix.repository }} ref: "" test-infra-repository: pytorch/test-infra From 39ae7fc693110c41949f45d13f38ac70bea32090 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 1 May 2023 17:23:05 -0700 Subject: [PATCH 4/7] Remove not implemented params --- .github/workflows/build-conda-windows.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index 54f3eac773..92bb4ec779 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -45,10 +45,8 @@ jobs: test-infra-ref: main build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: ${{ matrix.pre-script }} - env-script: ${{ matrix.env-script }} post-script: ${{ matrix.post-script }} package-name: ${{ matrix.package-name }} - smoke-test-script: ${{ matrix.smoke-test-script }} # Using "development" as trigger event so these binaries are not uploaded # to official channels yet trigger-event: development From 3485012273b79b479697147b9af87a4d5c46b1d5 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 1 May 2023 17:25:02 -0700 Subject: [PATCH 5/7] Fix token --- .github/workflows/build-conda-windows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index 92bb4ec779..e0ed521489 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -51,5 +51,4 @@ jobs: # to official channels yet trigger-event: development secrets: - AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }} - AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }} + CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} From ee7748757476f9958cf325a84ada1a8db6ffc296 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 2 May 2023 14:38:29 -0700 Subject: [PATCH 6/7] Add smoke tests --- .github/workflows/build-conda-windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index e0ed521489..e34664483e 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -29,12 +29,12 @@ jobs: include: - repository: pytorch/audio pre-script: packaging/ffmpeg/build.bat - env-script: "" wheel-build-params: "--plat-name win_amd64" post-script: "" smoke-test-script: "" package-name: torchaudio conda-package-directory: packaging/torchaudio + smoke-test-script: test/smoke_test/smoke_test.py name: ${{ matrix.repository }} uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main with: @@ -47,6 +47,7 @@ jobs: pre-script: ${{ matrix.pre-script }} post-script: ${{ matrix.post-script }} package-name: ${{ matrix.package-name }} + smoke-test-script: ${{ matrix.smoke-test-script }} # Using "development" as trigger event so these binaries are not uploaded # to official channels yet trigger-event: development From 2539be478590996829b87d3536cce6e0b77f6157 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 2 May 2023 14:47:59 -0700 Subject: [PATCH 7/7] Fix snoke-test --- .github/workflows/build-conda-windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index e34664483e..a582738177 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -31,7 +31,6 @@ jobs: pre-script: packaging/ffmpeg/build.bat wheel-build-params: "--plat-name win_amd64" post-script: "" - smoke-test-script: "" package-name: torchaudio conda-package-directory: packaging/torchaudio smoke-test-script: test/smoke_test/smoke_test.py