Allow 3.12 wheels to be built.

mlpack · Oct 12, 2023 · 404b26f · 404b26f
1 parent a95df46
commit 404b26f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 125 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -44,14 +44,13 @@ pipeline
             name 'PYTHON_VERSION'
 //            values 'cp36', 'cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'pp37',
 //                   'pp38', 'pp39'
-            values 'cp311', 'cp310', 'cp39', 'cp38', 'cp37'
+            values 'cp312'
           }
 
           axis
           {
             name 'ARCH'
-//            values 'x86_64', 'i686', 'aarch64', 's390x', 'ppc64le'
-            values 'x86_64', 'aarch64', 'ppc64le'
+            values 'x86_64', 'i686', 'aarch64', 's390x', 'ppc64le'
           }
 
           axis
@@ -89,128 +88,6 @@ pipeline
               values 'musllinux'
             }
           }
-
-          // Specific excludes for one-off run.  We want to run only these:
-          //    cp311-manylinux-ppc64le
-          //    cp310-manylinux-x86_64
-          //    cp310-manylinux-aarch64
-          //    cp39-musllinux-ppc64le
-          //    cp39-manylinux-ppc64le
-          //    cp38-musllinux-aarch64
-          //    cp37-musllinux-aarch64
-          exclude
-          {
-            axis
-            {
-              name 'PYTHON_VERSION'
-              values 'cp310', 'cp311'
-            }
-
-            axis
-            {
-              name 'PYTHON_IMAGE'
-              values 'musllinux'
-            }
-          }
-
-          exclude
-          {
-            axis
-            {
-              name 'PYTHON_VERSION'
-              values 'cp37', 'cp38'
-            }
-
-            axis
-            {
-              name 'PYTHON_IMAGE'
-              values 'musllinux'
-            }
-
-            axis
-            {
-              name 'ARCH'
-              values 'ppc64le'
-            }
-          }
-
-          exclude
-          {
-            axis
-            {
-              name 'PYTHON_VERSION'
-              values 'cp39'
-            }
-
-            axis
-            {
-              name 'PYTHON_IMAGE'
-              values 'musllinux'
-            }
-
-            axis
-            {
-              name 'ARCH'
-              values 'aarch64'
-            }
-          }
-
-          exclude
-          {
-            axis
-            {
-              name 'PYTHON_VERSION'
-              values 'cp37', 'cp38'
-            }
-
-            axis
-            {
-              name 'PYTHON_IMAGE'
-              values 'manylinux'
-            }
-          }
-
-          exclude
-          {
-            axis
-            {
-              name 'PYTHON_VERSION'
-              values 'cp310'
-            }
-
-            axis
-            {
-              name 'PYTHON_IMAGE'
-              values 'manylinux'
-            }
-
-            axis
-            {
-              name 'ARCH'
-              values 'ppc64le'
-            }
-          }
-
-          exclude
-          {
-            axis
-            {
-              name 'PYTHON_VERSION'
-              values 'cp39', 'cp311'
-            }
-
-            axis
-            {
-              name 'PYTHON_IMAGE'
-              values 'manylinux'
-            }
-
-            axis
-            {
-              name 'ARCH'
-              values 'aarch64', 'x86_64'
-            }
-          }
         }
 
         stages

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -42,6 +42,14 @@ jobs:
         CIBW_BUILD: cp311-macosx_arm64
         BUILD_SCRIPT: build_mlpack.osx.sh
         CIBW_ARCHS_MACOS: "arm64"
+      cp312-macosx_x86_64:
+        CIBW_BUILD: cp312-macosx_x86_64
+        BUILD_SCRIPT: build_mlpack.osx.sh
+        CIBW_ARCHS_MACOS: "x86_64"
+      cp312-macosx_arm64:
+        CIBW_BUILD: cp312-macosx_arm64
+        BUILD_SCRIPT: build_mlpack.osx.sh
+        CIBW_ARCHS_MACOS: "arm64"
       pp38-macosx_x86_64:
         CIBW_BUILD: pp38-macosx_x86_64
         BUILD_SCRIPT: build_mlpack.osx.sh
@@ -130,6 +138,17 @@ jobs:
         WIN_ARCH: "Win32"
         OPENBLAS_ARCH: "x86"
         PANDAS_VER: 2.0.3
+      cp312-win_amd64:
+        CIBW_BUILD: cp312-win_amd64
+        BUILD_SCRIPT: build_mlpack.bat
+        WIN_ARCH: "x64"
+        OPENBLAS_ARCH: "x64"
+      cp312-win32:
+        CIBW_BUILD: cp312-win32
+        BUILD_SCRIPT: build_mlpack.bat
+        WIN_ARCH: "Win32"
+        OPENBLAS_ARCH: "x86"
+        PANDAS_VER: 2.0.3
       pp38-win_amd64:
         CIBW_BUILD: pp38-win_amd64
         BUILD_SCRIPT: build_mlpack.bat