Merge pull request #368 from kmaehashi/add-python312

Add support for Python 3.12 wheel
cupy · Oct 23, 2023 · 91adbe6 · 91adbe6
2 parents da7bf13 + 477ff86
commit 91adbe6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/.pfnci/build_submit.sh b/.pfnci/build_submit.sh
@@ -30,7 +30,7 @@ submit_job() {
 
 # wheels (Windows)
 for CUDA in 11.x 12.x; do
- for PYTHON in 3.9 3.10 3.11; do
+ for PYTHON in 3.9 3.10 3.11 3.12; do
  submit_job cupy-wheel-win ".pfnci\\wheel-windows\\main.bat ${CUDA} ${PYTHON} ${BRANCH} ${JOB_GROUP}"
  done
 done

diff --git a/.pfnci/config.pbtxt b/.pfnci/config.pbtxt
@@ -56,7 +56,7 @@ configs {
  time_limit {
  seconds: 10800
  }
- command: ".pfnci\\wheel-windows\\main.bat 12.x 3.11"
+ command: ".pfnci\\wheel-windows\\main.bat 12.x 3.12"
  }
 }
 configs {

diff --git a/.pfnci/wheel-windows/_flexci.ps1 b/.pfnci/wheel-windows/_flexci.ps1
@@ -13,6 +13,8 @@ function ActivatePython($version) {
  $pydir = "Python310"
  } elseif ($version -eq "3.11") {
  $pydir = "Python311"
+ } elseif ($version -eq "3.12") {
+ $pydir = "Python312"
  } else {
  throw "Unsupported Python version: $version"
  }

diff --git a/check_release_assets.py b/check_release_assets.py
@@ -15,6 +15,7 @@
 CP39 = 'cp39-cp39'
 CP310 = 'cp310-cp310'
 CP311 = 'cp311-cp311'
+CP312 = 'cp312-cp312'
 LINUX = 'manylinux2014_x86_64'
 LINUX_V11 = 'manylinux1_x86_64'
 LINUX_AARCH64 = 'manylinux2014_aarch64'
@@ -24,18 +25,18 @@
 sdist_project = 'cupy'
 
 _v13_cuda_matrix = list(itertools.product(
- (CP39, CP310, CP311), (LINUX, WINDOWS)))
+ (CP39, CP310, CP311, CP312), (LINUX, WINDOWS)))
 _v13_aarch64_matrix = list(itertools.product(
- (CP39, CP310, CP311), (LINUX_AARCH64,)))
+ (CP39, CP310, CP311, CP312), (LINUX_AARCH64,)))
 _v13_rocm_matrix = list(itertools.product(
- (CP39, CP310, CP311), (LINUX,)))
+ (CP39, CP310, CP311, CP312), (LINUX,)))
 
 _v12_cuda_matrix = list(itertools.product(
- (CP38, CP39, CP310, CP311), (LINUX, WINDOWS)))
+ (CP38, CP39, CP310, CP311, CP312), (LINUX, WINDOWS)))
 _v12_aarch64_matrix = list(itertools.product(
- (CP38, CP39, CP310, CP311), (LINUX_AARCH64,)))
+ (CP38, CP39, CP310, CP311, CP312), (LINUX_AARCH64,)))
 _v12_rocm_matrix = list(itertools.product(
- (CP38, CP39, CP310, CP311), (LINUX,)))
+ (CP38, CP39, CP310, CP311, CP312), (LINUX,)))
 
 pypi_wheel_projects = {
  # v12.x

diff --git a/dist_config.py b/dist_config.py
@@ -5,7 +5,7 @@
 
 # Tools to be used for build.
 CYTHON_VERSION = '0.29.36'
-FASTRLOCK_VERSION = '0.8.1'
+FASTRLOCK_VERSION = '0.8.2'
 
 # Key-value of sdist build settings.
 # See descriptions of WHEEL_LINUX_CONFIGS for details.
@@ -246,4 +246,9 @@
  'python_tag': 'cp311',
  'abi_tag': 'cp311',
  },
+ '3.12': {
+ 'pyenv': '3.12.0',
+ 'python_tag': 'cp312',
+ 'abi_tag': 'cp312',
+ },
 }
diff --git a/dist_utils.py b/dist_utils.py
@@ -2,7 +2,6 @@
 
 import ctypes
 import ctypes.util
-import imp
 import os
 
 from dist_config import WHEEL_PYTHON_VERSIONS
@@ -39,7 +38,9 @@ def wheel_name(pkg_name, version, python_version, platform_tag):
 
 def get_version_from_source_tree(source_tree):
  version_file_path = '{}/cupy/_version.py'.format(source_tree)
- return imp.load_source('_version', version_file_path).__version__
+ with open(version_file_path) as f:
+ exec(f.read())
+ return locals()['__version__']
 
 
 def get_system_cuda_version(cudart_name='cudart'):