From 184b2808a5eed5f03ce381b8e7bd73f6188d8453 Mon Sep 17 00:00:00 2001
From: dan_the_3rd <43445237+danthe3rd@users.noreply.github.com>
Date: Sat, 6 Jul 2024 07:42:37 +0000
Subject: [PATCH] Build for PyTorch 2.3.1 (fairinternal/xformers#1150)

__original_commit__ = fairinternal/xformers@4fd39a1f4dce2a4a506b5653c9a8d3e993e7115b
---
 .github/workflows/conda.yml        | 6 ++++--
 .github/workflows/wheels.yml       | 8 ++++----
 .github/workflows/wheels_build.yml | 2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 857a57ea5e..cb2f17e116 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -21,6 +21,8 @@ env:
   MAX_JOBS: 3  # Avoids OOMs
   XFORMERS_BUILD_TYPE: "Release"
   XFORMERS_PACKAGE_FROM: "conda-${{ github.ref_name }}"
+  # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: "true"
 
 jobs:
   build:
@@ -31,13 +33,13 @@ jobs:
           - "3.9"
           - "3.10"
         config:
-          - torch_version: "2.3.0"
+          - torch_version: "2.3.1"
             torch_channel: "pytorch"
             cuda_version: "12.1.0"
             cuda_dep_runtime: ">=12.0,<13.0"
             cuda_short_version: "121"
 
-          - torch_version: "2.3.0"
+          - torch_version: "2.3.1"
             torch_channel: "pytorch"
             cuda_version: "11.8.0"
             cuda_dep_runtime: ">=11.7,<11.9"
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index a40bccd13f..0a4858ee54 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -35,7 +35,7 @@ jobs:
         include = []
         for os in ['8-core-ubuntu', 'windows-8-core']:
           for python in PY_VERSIONS:
-            for torch_version in ['2.3.0']:
+            for torch_version in ['2.3.1']:
               for cuda_short_version in ["118", "121"]:
                 include.append(dict(
                   os=os,
@@ -67,7 +67,7 @@ jobs:
     uses: ./.github/workflows/wheels_upload_pip.yml
     with:
       twine_username: __token__
-      filter: "*torch2.3.0+cu121*"
+      filter: "*torch2.3.1+cu121*"
       execute: ${{ github.repository == 'facebookresearch/xformers' && github.event_name != 'pull_request' }}
     secrets:
       twine_password: ${{ secrets.PYPI_TOKEN }}
@@ -79,7 +79,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.3.0+cu118*"
+      filter: "*torch2.3.1+cu118*"
       execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}
 
   upload_pt_cu121:
@@ -89,6 +89,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.3.0+cu121*"
+      filter: "*torch2.3.1+cu121*"
       execute: ${{ github.repository == 'facebookresearch/xformers' && github.ref_type == 'tag' }}
 
diff --git a/.github/workflows/wheels_build.yml b/.github/workflows/wheels_build.yml
index 055aa21707..e99b7b41ab 100644
--- a/.github/workflows/wheels_build.yml
+++ b/.github/workflows/wheels_build.yml
@@ -32,6 +32,8 @@ env:
   XFORMERS_BUILD_TYPE: "Release"
   TWINE_USERNAME: __token__
   XFORMERS_PACKAGE_FROM: "wheel-${{ github.ref_name }}"
+  # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: "true"
 
 jobs:
   build: