From d1b8766bcc1e50a7f676d132e78573dbb6400bfd Mon Sep 17 00:00:00 2001 From: Benson Ma Date: Thu, 28 Sep 2023 20:55:42 -0700 Subject: [PATCH] Fix publication of ROCm wheels (#2052) Summary: Move Nova ROCm jobs into the same workflow file to prevent incorrect publication of ROCm wheels Separating build_wheels_linux.yml for rocm causes rocm wheels to be uploaded into the wrong folder on pytorch.org. On Nova, when publishing with one architecture, it pushes wheels to nightly/ rather than a specific architecure. pip fetches that nightly regardless of the underlying architecture. When publishing with multiple architectures, it uploads to the architecture-specific folder under nightly (e.g., cpu, cu118, rocm5.5). Pull Request resolved: https://github.com/pytorch/FBGEMM/pull/2052 Reviewed By: spcyppt Differential Revision: D49760071 Pulled By: q10 fbshipit-source-id: 34abb06cdcd0a294ff7a5937fdb966b204c3b717 --- .github/workflows/build_wheels_linux_x86.yml | 2 +- .../workflows/build_wheels_linux_x86_rocm.yml | 52 ------------------- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 .github/workflows/build_wheels_linux_x86_rocm.yml diff --git a/.github/workflows/build_wheels_linux_x86.yml b/.github/workflows/build_wheels_linux_x86.yml index 76b7db4ab..f2d962a75 100644 --- a/.github/workflows/build_wheels_linux_x86.yml +++ b/.github/workflows/build_wheels_linux_x86.yml @@ -27,7 +27,7 @@ jobs: test-infra-repository: pytorch/test-infra test-infra-ref: main with-cuda: enable - with-rocm: disable + with-rocm: enable with-cpu: enable build: needs: generate-matrix diff --git a/.github/workflows/build_wheels_linux_x86_rocm.yml b/.github/workflows/build_wheels_linux_x86_rocm.yml deleted file mode 100644 index 79b5e3545..000000000 --- a/.github/workflows/build_wheels_linux_x86_rocm.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Build x86 Linux Wheels (ROCm) - -on: - pull_request: - push: - branches: - - nightly - - main - # Release candidate branch look like: v1.11.0-rc1 - - v[0-9]+.[0-9]+.[0-9]+-release+ - tags: - # Release candidate tag look like: v1.11.0-rc1 - - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ - - v[0-9]+.[0-9]+.[0-9]+ - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main - with: - package-type: wheel - os: linux - test-infra-repository: pytorch/test-infra - test-infra-ref: main - with-cuda: disable - with-rocm: enable - with-cpu: disable - build: - # Only build and publish to nightly channel - if: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && startsWith(github.event.ref, 'refs/heads/nightly')) }} - needs: generate-matrix - name: pytorch/FBGEMM - uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main - with: - repository: pytorch/FBGEMM - ref: "" - pre-script: ../.github/scripts/nova_prescript.bash - post-script: ../.github/scripts/nova_postscript.bash - smoke-test-script: "" - env-var-script: .github/scripts/nova_dir.bash - package-name: fbgemm_gpu - test-infra-repository: pytorch/test-infra - test-infra-ref: main - build-matrix: ${{ needs.generate-matrix.outputs.matrix }} - trigger-event: ${{ github.event_name }} - 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 }}