From be4f584ef8a410038ba74950460d93c794631dc6 Mon Sep 17 00:00:00 2001
From: xFormers Bot <oncall+xformers@xmail.facebook.com>
Date: Fri, 1 Dec 2023 12:05:30 +0000
Subject: [PATCH] Build wheels/conda for 2.1.1

We no longer build conda packages for 1.13/2.0

ghstack-source-id: bde8420f9352efa3431dec8f6f4daa649371134c
Pull Request resolved: https://github.com/fairinternal/xformers/pull/936

__original_commit__ = fairinternal/xformers@602ad0425e6d4dffb29beeb0fc97da9d71e2e737
---
 .github/workflows/conda.yml  | 16 ++--------------
 .github/workflows/wheels.yml |  8 ++++----
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 80d47c22d1..bfcbc0f5ac 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -33,30 +33,18 @@ jobs:
           - "3.9"
           - "3.10"
         config:
-          - torch_version: "2.1.0"
+          - torch_version: "2.1.1"
             torch_channel: "pytorch"
             cuda_version: "12.1.0"
             cuda_dep_runtime: ">=12.0,<13.0"
             cuda_short_version: "121"
 
-          - torch_version: "2.1.0"
+          - torch_version: "2.1.1"
             torch_channel: "pytorch"
             cuda_version: "11.8.0"
             cuda_dep_runtime: ">=11.7,<11.9"
             cuda_short_version: "118"
 
-          - torch_version: "2.0.1"
-            torch_channel: "pytorch"
-            cuda_version: "11.8.0"
-            cuda_dep_runtime: ">=11.7,<11.9"
-            cuda_short_version: "118"
-
-          - torch_version: "1.13.1"
-            torch_channel: "pytorch"
-            cuda_version: "11.7.1"
-            cuda_dep_runtime: ">=11.6,<11.8"
-            cuda_short_version: "116"
-
     name: py${{ matrix.python }}-torch${{ matrix.config.torch_version }}-cu${{ matrix.config.cuda_version }}
     runs-on: 8-core-ubuntu  # 32GB RAM, 8 vCPUs
 
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 431ff5711d..36a336f3b8 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -27,7 +27,7 @@ jobs:
           - "3.10"
           - "3.11"
         torch_version:
-          - "2.1.0"
+          - "2.1.1"
         cuda_short_version:
           - "118"
           - "121"
@@ -45,7 +45,7 @@ jobs:
     uses: ./.github/workflows/wheels_upload_pip.yml
     with:
       twine_username: __token__
-      filter: "*torch2.1.0+cu121*"
+      filter: "*torch2.1.1+cu121*"
       execute: ${{ github.repository == 'facebookresearch/xformers' && github.event_name != 'pull_request' }}
     secrets:
       twine_password: ${{ secrets.PYPI_TOKEN }}
@@ -57,7 +57,7 @@ jobs:
       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.1.0+cu118*"
+      filter: "*torch2.1.1+cu118*"
       execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}
 
   upload_pt_cu121:
@@ -67,6 +67,6 @@ jobs:
       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.1.0+cu121*"
+      filter: "*torch2.1.1+cu121*"
       execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}