Properly upload wheels for cu124 to PyTorch S3 bucket (fairinternal/x…

…formers#1221)

__original_commit__ = fairinternal/xformers@a3bcf08

.github/workflows/wheels.yml

@@ -29,6 +29,8 @@ jobs:
         environ = os.environ
 
         PY_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12']
+        # NOTE: Don't forget to update `upload_pt`'s matrix
+        # when changing the CUDA/ROCM versions below!
         CU_VERSIONS = ['118', '121', '124']
         ROCM_VERSIONS = ["6.1"] # <- 6.0 broken in `manylinux_2_28`
         PY_CU = list(itertools.product(PY_VERSIONS, CU_VERSIONS))
@@ -99,43 +101,21 @@ jobs:
     secrets:
       twine_password: ${{ secrets.PYPI_TOKEN }}
 
-  upload_pt_cu118:
-    needs: build
-    uses: ./.github/workflows/wheels_upload_s3.yml
-    with:
-      aws_role: "arn:aws:iam::749337293305:role/pytorch_bot_uploader_role"
-      s3_path: s3://pytorch/whl/cu118/
-      aws_s3_cp_extra_args: --acl public-read
-      filter: "*torch2.4.1+cu118*"
-      execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}
-
-  upload_pt_cu121:
-    needs: build
-    uses: ./.github/workflows/wheels_upload_s3.yml
-    with:
-      aws_role: "arn:aws:iam::749337293305:role/pytorch_bot_uploader_role"
-      s3_path: s3://pytorch/whl/cu121/
-      aws_s3_cp_extra_args: --acl public-read
-      filter: "*torch2.4.1+cu121*"
-      execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}
-
-  # upload_pt_rocm6_0:
-  #   needs: build
-  #   uses: ./.github/workflows/wheels_upload_s3.yml
-  #   with:
-  #     aws_role: "arn:aws:iam::749337293305:role/pytorch_bot_uploader_role"
-  #     s3_path: s3://pytorch/whl/rocm6.0/
-  #     aws_s3_cp_extra_args: --acl public-read
-  #     filter: "*torch2.4.1+rocm6.0*"
-  #     execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}
-
-  upload_pt_rocm6_1:
+  upload_pt:
     needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        suffix:
+          - cu118
+          - cu121
+          - cu124
+          - rocm6.1
     uses: ./.github/workflows/wheels_upload_s3.yml
     with:
       aws_role: "arn:aws:iam::749337293305:role/pytorch_bot_uploader_role"
-      s3_path: s3://pytorch/whl/rocm6.1/
+      s3_path: s3://pytorch/whl/${{ matrix.suffix }}/
       aws_s3_cp_extra_args: --acl public-read
-      filter: "*torch2.4.1+rocm6.1*"
+      filter: "*torch2.4.1+${{ matrix.suffix }}*"
       execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}
 

CHANGELOG.md

@@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.0.28] - TBD
+## [0.0.28.post1] - 2024-09-13
+Properly upload wheels for cuda 12.4
+
+## [0.0.28] - 2024-09-12
 Pre-built binary wheels require PyTorch 2.4.1
 ### Added
 - Added wheels for cuda 12.4

version.txt

@@ -1 +1 @@
-0.0.28
+0.0.29