Merge pull request #465 from kmaehashi/update-for-v14

kmaehashi · web-flow · commit 7512c6118d1d · 2025-12-18T13:32:34.000+09:00
Update tools for CuPy v14 release
diff --git a/.pfnci/build_submit.sh b/.pfnci/build_submit.sh
@@ -29,8 +29,8 @@ submit_job() {
 }
 
 # wheels (Windows)
-for CUDA in 11.x 12.x 13.x; do
-  for PYTHON in 3.10 3.11 3.12 3.13; do
+for CUDA in 12.x 13.x; do
+  for PYTHON in 3.10 3.11 3.12 3.13 3.14; 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
@@ -10,7 +10,7 @@ configs {
     time_limit {
       seconds: 10800
     }
-    command: ".pfnci/wheel-linux/main.sh 13.x 3.13"
+    command: ".pfnci/wheel-linux/main.sh 13.x 3.14"
   }
 }
 configs {
@@ -24,7 +24,7 @@ configs {
     time_limit {
       seconds: 10800
     }
-    command: ".pfnci/wheel-linux/main.sh rocm-5.0 3.9"
+    command: ".pfnci/wheel-linux/main.sh rocm-7.0 3.12"
     environment_variables { key: "CUPY_RELEASE_SKIP_VERIFY" value: "1" }
   }
 }
@@ -41,7 +41,7 @@ configs {
     time_limit {
       seconds: 10800
     }
-    command: ".pfnci\\wheel-windows\\main.bat 13.x 3.13"
+    command: ".pfnci\\wheel-windows\\main.bat 13.x 3.14"
   }
 }
 configs {
diff --git a/.pfnci/wheel-windows/_flexci.ps1 b/.pfnci/wheel-windows/_flexci.ps1
@@ -9,6 +9,8 @@ function ActivatePython($version) {
         $pydir = "Python312"
     } elseif ($version -eq "3.13") {
         $pydir = "Python313"
+    } elseif ($version -eq "3.14") {
+        $pydir = "Python314"
     } else {
         throw "Unsupported Python version: $version"
     }
@@ -62,6 +64,10 @@ function ActivateCUDA($version) {
     $Env:PATH = "$Env:CUDA_PATH\bin;$Env:CUDA_PATH\bin\x64;" + $Env:PATH
 }
 
+function InstallZLIB() {
+    Copy-Item -Path "C:\Development\ZLIB\zlibwapi.dll" -Destination "C:\Windows\System32"
+}
+
 function IsPullRequestTest() {
     return ${Env:FLEXCI_BRANCH} -ne $null -and ${Env:FLEXCI_BRANCH}.StartsWith("refs/pull/")
 }
diff --git a/build.sh b/build.sh
@@ -39,9 +39,8 @@ esac
 # Set additional environment variables
 case ${CUDA} in
   rocm-* )
-    # https://github.com/RadeonOpenCompute/ROCm#hardware-and-software-support
-    # https://rocmdocs.amd.com/en/latest/ROCm_Compiler_SDK/ROCm-Native-ISA.html#processors
-    export HCC_AMDGPU_TARGET=gfx801,gfx802,gfx803,gfx900,gfx906,gfx908,gfx1010,gfx1011,gfx1012
+    # https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/system-requirements.html
+    export HCC_AMDGPU_TARGET=gfx908,gfx90a,gfx942,gfx950,gfx1030,gfx1100,gfx1101,gfx1200,gfx1201
     ;;
   * )
     ;;
diff --git a/builder/setup_python.sh b/builder/setup_python.sh
@@ -8,6 +8,9 @@ if [[ "$(rpm --eval '%{rhel}')" == "7" ]]; then
     export CFLAGS="-I/usr/include/openssl11"
     export CPPFLAGS="-I/usr/include/openssl11"
     export LDFLAGS="-L/usr/lib64/openssl11"
+else
+    # Explicitly override "LDFLAGS" set in ROCm docker images.
+    export LDFLAGS=""
 fi
 
 # Install Python
diff --git a/check_release_assets.py b/check_release_assets.py
@@ -13,7 +13,6 @@
 if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping, Sequence
 
-CP39 = 'cp39-cp39'
 CP310 = 'cp310-cp310'
 CP311 = 'cp311-cp311'
 CP312 = 'cp312-cp312'
@@ -34,30 +33,26 @@
     (CP310, CP311, CP312, CP313), (LINUX_AARCH64,)))
 _main_rocm_matrix: _MatrixType = list(itertools.product(
     (CP310, CP311, CP312, CP313), (LINUX,)))
-_v13_cuda_x86_matrix: _MatrixType = list(itertools.product(
-    (CP39, CP310, CP311, CP312, CP313), (LINUX, WINDOWS)))
-_v13_cuda_aarch64_matrix: _MatrixType = list(itertools.product(
-    (CP39, CP310, CP311, CP312, CP313), (LINUX_AARCH64,)))
-_v13_rocm_matrix: _MatrixType = list(itertools.product(
-    (CP39, CP310, CP311, CP312, CP313), (LINUX,)))
+_v14_cuda_x86_matrix: _MatrixType = list(itertools.product(
+    (CP310, CP311, CP312, CP313), (LINUX, WINDOWS)))
+_v14_cuda_aarch64_matrix: _MatrixType = list(itertools.product(
+    (CP310, CP311, CP312, CP313), (LINUX_AARCH64,)))
+_v14_rocm_matrix: _MatrixType = list(itertools.product(
+    (CP310, CP311, CP312, CP313), (LINUX,)))
 
 pypi_wheel_projects = {
-    # v14.x
-    '14': [
-        ('cupy-cuda11x', _main_cuda_x86_matrix + _main_cuda_aarch64_matrix),
+    # v15.x
+    '15': [
         ('cupy-cuda12x', _main_cuda_x86_matrix + _main_cuda_aarch64_matrix),
         ('cupy-cuda13x', _main_cuda_x86_matrix + _main_cuda_aarch64_matrix),
-        # ('cupy-rocm-6-2', _main_rocm_matrix),
+        ('cupy-rocm-7-0', _main_rocm_matrix),
     ],
 
-    # v13.x
-    '13': [
-        ('cupy-cuda11x', _v13_cuda_x86_matrix + _v13_cuda_aarch64_matrix),
-        ('cupy-cuda12x', _v13_cuda_x86_matrix + _v13_cuda_aarch64_matrix),
-        ('cupy-cuda13x', _v13_cuda_x86_matrix + _v13_cuda_aarch64_matrix),
-        # ('cupy-rocm-4-3', _v13_rocm_matrix),
-        # ('cupy-rocm-5-0', _v13_rocm_matrix),
-        # ('cupy-rocm-6-2', _v13_rocm_matrix),
+    # v14.x
+    '14': [
+        ('cupy-cuda12x', _v14_cuda_x86_matrix + _v14_cuda_aarch64_matrix),
+        ('cupy-cuda13x', _v14_cuda_x86_matrix + _v14_cuda_aarch64_matrix),
+        ('cupy-rocm-7-0', _v14_rocm_matrix),
     ],
 }
 
diff --git a/dist.py b/dist.py
@@ -74,7 +74,7 @@ def run_command_output(*cmd: str, cwd: str | None = None) -> str:
 
 
 def generate_wheel_metadata(
-    libraries: list[str], cuda_version: str,
+    libraries: list[str], cuda_version: str, workdir: str
 ) -> dict[str, Any]:
     machine = platform.machine()
     if machine == 'AMD64':  # Windows
@@ -93,7 +93,7 @@ def generate_wheel_metadata(
     for library in libraries:
         command += ['--library', library]
 
-    ret: dict[str, Any] = json.loads(run_command_output(*command))
+    ret: dict[str, Any] = json.loads(run_command_output(*command, cwd=workdir))
     return ret
 
 
@@ -503,7 +503,7 @@ def build_linux(
             if target == 'wheel-linux':
                 assert preloads_cuda_version is not None
                 wheel_metadata = generate_wheel_metadata(
-                    preloads, preloads_cuda_version)
+                    preloads, preloads_cuda_version, workdir)
                 log('Writing wheel metadata')
                 with open(
                     f'{workdir}/_wheel.json', 'w', encoding='UTF-8'
@@ -662,7 +662,8 @@ def build_windows(
 
             # Create a wheel metadata file for preload.
             log('Creating wheel metadata')
-            wheel_metadata = generate_wheel_metadata(preloads, cuda_version)
+            wheel_metadata = generate_wheel_metadata(
+                preloads, cuda_version, workdir)
             log('Writing wheel metadata')
             with open(f'{workdir}/_wheel.json', 'w', encoding='UTF-8') as f:
                 json.dump(wheel_metadata, f)
diff --git a/dist_config.py b/dist_config.py
@@ -24,10 +24,10 @@ class _SDistConfig(TypedDict):
 # Key-value of sdist build settings.
 # See descriptions of WHEEL_LINUX_CONFIGS for details.
 SDIST_CONFIG: _SDistConfig = {
-    'image': 'nvidia/cuda:11.2.2-devel-centos7',
+    'image': 'nvidia/cuda:12.0.1-devel-centos7',
     # This image contains NCCL.
-    'verify_image': 'nvidia/cuda:11.4.3-devel-{system}',
-    'verify_systems': ['ubuntu18.04'],
+    'verify_image': 'nvidia/cuda:12.0.1-devel-{system}',
+    'verify_systems': ['ubuntu22.04'],
 }
 
 
@@ -66,55 +66,6 @@ class _WheelLinuxConfig(TypedDict):
 # - `system_packages`: a string of depending library names expanded into the
 #                      package manager command.
 WHEEL_LINUX_CONFIGS: dict[str, _WheelLinuxConfig] = {
-    '11.x': {
-        # CUDA Enhanced Compatibility wheel (for CUDA 11.2~11.x)
-        'name': 'cupy-cuda11x',
-        'kind': 'cuda',
-        'platform_version': '11.2 - 11.8',
-        # Use the latest CUDA version for build.
-        'image': 'cupy/cupy-release-tools:cuda-runfile-11.8.0-centos7',
-        'libs': [],
-        'includes': [],
-        'preloads': ['cutensor', 'nccl'],
-        'verify_image': 'nvidia/cuda:{system}',
-        'verify_systems': [
-            # Test on all supported CUDA version variants.
-            '11.2.2-runtime-ubuntu18.04',
-            '11.3.1-runtime-ubuntu18.04',
-            '11.4.3-runtime-ubuntu18.04',
-            '11.5.2-runtime-ubuntu18.04',
-            '11.6.2-runtime-ubuntu18.04',
-            '11.7.1-runtime-ubuntu18.04',
-            '11.8.0-runtime-ubuntu18.04',
-        ],
-        'system_packages': '',
-    },
-    '11.x-aarch64': {
-        # CUDA Enhanced Compatibility wheel (for CUDA 11.2~11.x)
-        'name': 'cupy-cuda11x',
-        'kind': 'cuda',
-        'arch': 'aarch64',
-        'platform_version': '11.2 - 11.8',
-        # Use the latest image.
-        'image': 'cupy/cupy-release-tools:cuda-runfile-11.8.0-el8',
-        'libs': [],
-        'includes': [],
-        'preloads': ['nccl'],
-        'preloads_cuda_version': '11.x',
-        'builder_dockerfile': 'Dockerfile.el8',
-        'verify_image': 'nvidia/cuda:{system}',
-        'verify_systems': [
-            # Test on all supported CUDA version variants.
-            '11.2.2-runtime-ubi8',
-            '11.3.1-runtime-ubi8',
-            '11.4.3-runtime-ubi8',
-            '11.5.2-runtime-ubi8',
-            '11.6.2-runtime-ubi8',
-            '11.7.1-runtime-ubi8',
-            '11.8.0-runtime-ubi8',
-        ],
-        'system_packages': '',
-    },
     '12.x': {
         # CUDA Enhanced Compatibility wheel (for CUDA 12.x)
         'name': 'cupy-cuda12x',
@@ -129,7 +80,7 @@ class _WheelLinuxConfig(TypedDict):
         'verify_image': 'nvidia/cuda:{system}',
         'verify_systems': [
             # Test on all supported CUDA version variants.
-            '12.0.1-runtime-ubuntu18.04',
+            '12.0.1-runtime-ubuntu20.04',
             '12.1.1-runtime-ubuntu22.04',
             '12.2.0-runtime-ubuntu22.04',
             '12.3.0-runtime-ubuntu22.04',
@@ -207,27 +158,16 @@ class _WheelLinuxConfig(TypedDict):
         ],
         'system_packages': '',
     },
-    'rocm-4.3': {
-        'name': 'cupy-rocm-4-3',
-        'kind': 'rocm',
-        'platform_version': '4.3',
-        'image': 'rocm/dev-centos-7:4.3',
-        'libs': [],
-        'includes': [],
-        'preloads': [],
-        'verify_image': 'rocm/rocm-terminal:4.3',
-        'verify_systems': ['default'],
-        'system_packages': 'rocm-dev hipblas hipfft hipsparse rocsparse rocrand rocthrust rocsolver rocfft hipcub rocprim rccl'  # NOQA
-    },
-    'rocm-5.0': {
-        'name': 'cupy-rocm-5-0',
+    'rocm-7.0': {
+        'name': 'cupy-rocm-7-0',
         'kind': 'rocm',
-        'platform_version': '5.0',
-        'image': 'rocm/dev-centos-7:5.0',
+        'platform_version': '7.0',
+        'image': 'rocm/dev-almalinux-8:7.0-complete',
         'libs': [],
         'includes': [],
         'preloads': [],
-        'verify_image': 'rocm/rocm-terminal:5.0',
+        'builder_dockerfile': 'Dockerfile.el8',
+        'verify_image': 'rocm/dev-ubuntu-24.04:7.0.2',
         'verify_systems': ['default'],
         'system_packages': 'rocm-hip-sdk hip-runtime-amd roctracer-dev'  # NOQA
     },
@@ -250,15 +190,6 @@ class _WheelWindowsConfig(TypedDict):
 # - `cudart_lib`: name of CUDA Runtime DLL
 # - `check_version`: a function to check if the CUDA version is correct.
 WHEEL_WINDOWS_CONFIGS: dict[str, _WheelWindowsConfig] = {
-    '11.x': {
-        # CUDA Enhanced Compatibility wheel (for CUDA 11.2~11.x)
-        'name': 'cupy-cuda11x',
-        'kind': 'cuda',
-        'libs': [],
-        'preloads': ['cutensor'],
-        'cudart_lib': 'cudart64_110',  # binary compatible between CUDA 11.x
-        'check_version': lambda x: 11080 <= x < 11090,  # CUDA 11.8
-    },
     '12.x': {
         # CUDA Enhanced Compatibility wheel (for CUDA 12.x)
         'name': 'cupy-cuda12x',
@@ -297,12 +228,10 @@ class _WheelWindowsConfig(TypedDict):
 This package (``cupy``) is a source distribution.
 For most users, use of pre-build wheel distributions are recommended:
 
-- `cupy-cuda13x <https://pypi.org/project/cupy-cuda13x/>`_ (for CUDA 13.x)
-- `cupy-cuda12x <https://pypi.org/project/cupy-cuda12x/>`_ (for CUDA 12.x)
-- `cupy-cuda11x <https://pypi.org/project/cupy-cuda11x/>`_ (for CUDA 11.2 ~ 11.x)
+- `cupy-cuda13x <https://pypi.org/project/cupy-cuda13x/>`_ (for NVIDIA CUDA 13.x)
+- `cupy-cuda12x <https://pypi.org/project/cupy-cuda12x/>`_ (for NVIDIA CUDA 12.x)
 
-- `cupy-rocm-5-0 <https://pypi.org/project/cupy-rocm-5-0/>`_ (for ROCm 5.0)
-- `cupy-rocm-4-3 <https://pypi.org/project/cupy-rocm-4-3/>`_ (for ROCm 4.3)
+- `cupy-rocm-7-0 <https://pypi.org/project/cupy-rocm-7-0/>`_ (for AMD ROCm 7.0)
 
 Please see `Installation Guide <https://docs.cupy.dev/en/latest/install.html>`_ for the detailed instructions.
 '''  # NOQA
@@ -344,11 +273,6 @@ class _WheelPythonConfig(TypedDict):
 # - `python_tag`: a CPython implementation tag
 # - `abi_tag`: a CPython ABI tag
 WHEEL_PYTHON_VERSIONS: dict[str, _WheelPythonConfig] = {
-    '3.9': {
-        'pyenv': '3.9.0',
-        'python_tag': 'cp39',
-        'abi_tag': 'cp39',
-    },
     '3.10': {
         'pyenv': '3.10.0',
         'python_tag': 'cp310',
@@ -369,4 +293,9 @@ class _WheelPythonConfig(TypedDict):
         'python_tag': 'cp313',
         'abi_tag': 'cp313',
     },
+    '3.14': {
+        'pyenv': '3.14.2',
+        'python_tag': 'cp314',
+        'abi_tag': 'cp314',
+    },
 }
diff --git a/verifier/Dockerfile.debian b/verifier/Dockerfile.debian
@@ -35,13 +35,11 @@ RUN for VERSION in ${python_versions}; do \
 
 # Install Python libraries.
 # The last version installed will be used to run the verifier agent.
-# Pin to NumPy v2.2.6 as NumPy v2.3+ wheels require glibc-2.28 where Ubuntu 18.04 uses glibc-2.27.
 RUN for VERSION in ${python_versions}; do \
       echo "Installing libraries on Python ${VERSION}..." && \
       pyenv global ${VERSION} && \
       pip install -U pip setuptools && \
       pip install pytest mock; \
-      pip install "numpy==2.2.6" "scipy==1.15.3"; \
     done
 
 # Install additional dependencies.

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ configs {`
`10`	`10`	`time_limit {`
`11`	`11`	`seconds: 10800`
`12`	`12`	`}`
`13`		`- command: ".pfnci/wheel-linux/main.sh 13.x 3.13"`
	`13`	`+ command: ".pfnci/wheel-linux/main.sh 13.x 3.14"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`configs {`
`@@ -24,7 +24,7 @@ configs {`
`24`	`24`	`time_limit {`
`25`	`25`	`seconds: 10800`
`26`	`26`	`}`
`27`		`- command: ".pfnci/wheel-linux/main.sh rocm-5.0 3.9"`
	`27`	`+ command: ".pfnci/wheel-linux/main.sh rocm-7.0 3.12"`
`28`	`28`	`environment_variables { key: "CUPY_RELEASE_SKIP_VERIFY" value: "1" }`
`29`	`29`	`}`
`30`	`30`	`}`
`@@ -41,7 +41,7 @@ configs {`
`41`	`41`	`time_limit {`
`42`	`42`	`seconds: 10800`
`43`	`43`	`}`
`44`		`- command: ".pfnci\\wheel-windows\\main.bat 13.x 3.13"`
	`44`	`+ command: ".pfnci\\wheel-windows\\main.bat 13.x 3.14"`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`configs {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ function ActivatePython($version) {`
`9`	`9`	`$pydir = "Python312"`
`10`	`10`	`} elseif ($version -eq "3.13") {`
`11`	`11`	`$pydir = "Python313"`
	`12`	`+ } elseif ($version -eq "3.14") {`
	`13`	`+ $pydir = "Python314"`
`12`	`14`	`} else {`
`13`	`15`	`throw "Unsupported Python version: $version"`
`14`	`16`	`}`
`@@ -62,6 +64,10 @@ function ActivateCUDA($version) {`
`62`	`64`	`$Env:PATH = "$Env:CUDA_PATH\bin;$Env:CUDA_PATH\bin\x64;" + $Env:PATH`
`63`	`65`	`}`
`64`	`66`
	`67`	`+function InstallZLIB() {`
	`68`	`+ Copy-Item -Path "C:\Development\ZLIB\zlibwapi.dll" -Destination "C:\Windows\System32"`
	`69`	`+}`
	`70`	`+`
`65`	`71`	`function IsPullRequestTest() {`
`66`	`72`	`return ${Env:FLEXCI_BRANCH} -ne $null -and ${Env:FLEXCI_BRANCH}.StartsWith("refs/pull/")`
`67`	`73`	`}`