Merge branch 'main' into windows-support

charliebudd · Apr 3, 2024 · 964f941 · 964f941
2 parents 1c2c065 + 83dff83
commit 964f941
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 50 deletions.
diff --git a/.github/workflows/build-pytorch-extension-wheels.yml b/.github/workflows/build-pytorch-extension-wheels.yml
@@ -11,13 +11,13 @@ on:
         default: "python setup.py bdist_wheel"
       python-versions:
         type: string
-        default: "[3.6, 3.7, 3.8, 3.9]"
+        default: "[3.7, 3.8, 3.9, '3.10', 3.11]"
       pytorch-versions:
         type: string
-        default: "[1.9, '1.10', 1.11, 1.12]"
+        default: "['1.10', 1.11, 1.12, 1.13]"
       cuda-versions:
         type: string
-        default: "[10.2, 11.3, 11.6]"
+        default: "[10.2, 11.3, 11.6, 11.7]"
 
 jobs:
   setup:
@@ -45,9 +45,9 @@ jobs:
           echo "Tag: $TAG"
 
           if [[ $TAG == main ]] || [[ $TAG =~ v[0-9] ]]; then
-              echo "::set-output name=image-tag::-$TAG"
+              echo "image-tag=-$TAG" >> $GITHUB_OUTPUT
           else
-              echo "::set-output name=image-tag::"
+              echo "image-tag=" >> $GITHUB_OUTPUT
           fi
 
   build-wheels:
@@ -63,18 +63,28 @@ jobs:
         pytorch-version: ${{ fromJson(inputs.pytorch-versions) }}
         cuda-version: ${{ fromJson(inputs.cuda-versions) }}
         exclude:
-          - pytorch-version: 1.9
-            cuda-version: 11.3
-          - python-version: 3.6
-            pytorch-version: 1.11
-          - python-version: 3.6
-            pytorch-version: 1.12
-          - pytorch-version: 1.9
-            cuda-version: 11.6 
           - pytorch-version: '1.10'
-            cuda-version: 11.6 
+            python-version: '3.10'
+          - pytorch-version: '1.10'
+            python-version: 3.11
+          - pytorch-version: '1.10'
+            cuda-version: 11.6
+          - pytorch-version: '1.10'
+            cuda-version: 11.7
           - pytorch-version: 1.11
-            cuda-version: 11.6 
+            python-version: 3.11
+          - pytorch-version: 1.11
+            cuda-version: 11.6
+          - pytorch-version: 1.11
+            cuda-version: 11.7
+          - pytorch-version: 1.12
+            python-version: 3.11
+          - pytorch-version: 1.12
+            cuda-version: 11.7
+          - pytorch-version: 1.13
+            cuda-version: 10.2
+          - pytorch-version: 1.13
+            cuda-version: 11.3
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -34,32 +34,45 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        pytorch-version: [1.9, '1.10', 1.11, 1.12]
-        cuda-version: [10.2, 11.3, 11.6]
+        python-version: [3.7, 3.8, 3.9, '3.10', 3.11]
+        pytorch-version: ['1.10', 1.11, 1.12, 1.13]
+        cuda-version: [10.2, 11.3, 11.6, 11.7]
         include:
           - cuda-version: 10.2
-            cuda-arch-list: "3.7 5.0 6.0 6.1 6.2 7.0 7.2 7.5+PTX"
-            gcc-version: 8
+            cuda-arch-list: "6.0 6.1 6.2 7.0 7.2 7.5+PTX" # archs taken from... https://en.wikipedia.org/wiki/CUDA#GPUs_supported
+            gcc-version: 8 # gcc versions taken from... https://gist.github.com/ax3l/9489132#nvcc
           - cuda-version: 11.3
-            cuda-arch-list: "3.7 5.0 6.0 6.1 6.2 7.0 7.2 7.5 8.0 8.6+PTX"
+            cuda-arch-list: "6.0 6.1 6.2 7.0 7.2 7.5 8.0 8.6+PTX"
             gcc-version: 10
           - cuda-version: 11.6
-            cuda-arch-list: "3.7 5.0 6.0 6.1 6.2 7.0 7.2 7.5 8.0 8.6+PTX"
+            cuda-arch-list: "6.0 6.1 6.2 7.0 7.2 7.5 8.0 8.6+PTX" # 8.7 "should" work for 11.5 and later but appears not to work
+            gcc-version: 10
+          - cuda-version: 11.7
+            cuda-arch-list: "6.0 6.1 6.2 7.0 7.2 7.5 8.0 8.6+PTX"
             gcc-version: 10
         exclude:
-          - python-version: 3.6
-            pytorch-version: 1.11
-          - python-version: 3.6
-            pytorch-version: 1.12
-          - pytorch-version: 1.9
-            cuda-version: 11.3
-          - pytorch-version: 1.9
-            cuda-version: 11.6 
           - pytorch-version: '1.10'
-            cuda-version: 11.6 
+            python-version: '3.10'
+          - pytorch-version: '1.10'
+            python-version: 3.11
+          - pytorch-version: '1.10'
+            cuda-version: 11.6
+          - pytorch-version: '1.10'
+            cuda-version: 11.7
+          - pytorch-version: 1.11
+            python-version: 3.11
           - pytorch-version: 1.11
-            cuda-version: 11.6 
+            cuda-version: 11.6
+          - pytorch-version: 1.11
+            cuda-version: 11.7
+          - pytorch-version: 1.12
+            python-version: 3.11
+          - pytorch-version: 1.12
+            cuda-version: 11.7
+          - pytorch-version: 1.13
+            cuda-version: 10.2
+          - pytorch-version: 1.13
+            cuda-version: 11.3
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -102,22 +115,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        pytorch-version: [1.9, '1.10', 1.11, 1.12]
-        cuda-version: [10.2, 11.3, 11.6]
+        python-version: [3.7, 3.8, 3.9, '3.10', 3.11]
+        pytorch-version: ['1.10', 1.11, 1.12, 1.13]
+        cuda-version: [10.2, 11.3, 11.6, 11.7]
         exclude:
-          - python-version: 3.6
-            pytorch-version: 1.11
-          - python-version: 3.6
-            pytorch-version: 1.12
-          - pytorch-version: 1.9
-            cuda-version: 11.3
-          - pytorch-version: 1.9
-            cuda-version: 11.6 
           - pytorch-version: '1.10'
-            cuda-version: 11.6 
+            python-version: '3.10'
+          - pytorch-version: '1.10'
+            python-version: 3.11
+          - pytorch-version: '1.10'
+            cuda-version: 11.6
+          - pytorch-version: '1.10'
+            cuda-version: 11.7
           - pytorch-version: 1.11
-            cuda-version: 11.6 
+            python-version: 3.11
+          - pytorch-version: 1.11
+            cuda-version: 11.6
+          - pytorch-version: 1.11
+            cuda-version: 11.7
+          - pytorch-version: 1.12
+            python-version: 3.11
+          - pytorch-version: 1.12
+            cuda-version: 11.7
+          - pytorch-version: 1.13
+            cuda-version: 10.2
+          - pytorch-version: 1.13
+            cuda-version: 11.3
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -6,10 +6,10 @@ Packages built using Torch Extension Builder currently suppport the following ru
 
 <div>
 <img src="https://img.shields.io/badge/OS-Linux%20(glibc%20>=%202.17)-7a3b8f.svg"/>
-<img src="https://img.shields.io/badge/Python-3.6%20|%203.7%20|%203.8%20|%203.9-3776ab.svg"/>
+<img src="https://img.shields.io/badge/Python-3.7%20|%203.8%20|%203.9%20|%203.10%20|%203.11-3776ab.svg"/>
 <br />
-<img src="https://img.shields.io/badge/PyTorch-1.9%20|%201.10%20|%201.11-EE4C2C.svg"/>
-<img src="https://img.shields.io/badge/CUDA-10.2%20|%2011.3-76b900.svg"/>
+<img src="https://img.shields.io/badge/PyTorch-1.10%20|%201.11%20|%201.12%20|%201.13-EE4C2C.svg"/>
+<img src="https://img.shields.io/badge/CUDA-10.2%20|%2011.3%20|%2011.6%20|%2011.7-76b900.svg"/>
 <div />
 
 ## Explanation

diff --git a/manylinux/scripts/utils.py b/manylinux/scripts/utils.py
@@ -1,9 +1,9 @@
 import subprocess
 
 def get_ptcu_code():
-    from torch import __version__
+    from torch.version import __version__, cuda
     torch_version = "".join(__version__.split(".")[:2])
-    cuda_version = __version__.split("+cu")[-1]
+    cuda_version = "".join(cuda.split("+cu")[-1].split("."))
     return "pt" + torch_version + "cu" + cuda_version
 
 def unpack_wheel(wheel_path, directory=None):