| win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython |
diff --git a/recipe/01-cuda13-build.diff b/recipe/01-cuda13-build.diff
new file mode 100644
index 00000000..8128624a
--- /dev/null
+++ b/recipe/01-cuda13-build.diff
@@ -0,0 +1,43 @@
+diff --git a/install/cupy_builder/cupy_setup_build.py b/install/cupy_builder/cupy_setup_build.py
+index cf7096b10..fdbfa7760 100644
+--- a/install/cupy_builder/cupy_setup_build.py
++++ b/install/cupy_builder/cupy_setup_build.py
+@@ -366,7 +366,7 @@ def make_extensions(ctx: Context, compiler, use_cython):
+ f'{os.environ["BUILD_PREFIX"]}/bin/ld')
+ if (PLATFORM_LINUX and (
+ int(os.environ.get('CONDA_BUILD_CROSS_COMPILATION', 0)) == 1 or
+- os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith('12'))):
++ os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith(('12', '13')))):
+ # If cross-compiling, we need build_and_run() & build_shlib() to
+ # use the compiler on the build platform to generate stub files
+ # that are executable in the build environment, not the target
+diff --git a/install/cupy_builder/install_build.py b/install/cupy_builder/install_build.py
+index 2d9b3aaa0..35fe517d0 100644
+--- a/install/cupy_builder/install_build.py
++++ b/install/cupy_builder/install_build.py
+@@ -151,6 +151,7 @@ def get_compiler_setting(ctx: Context, use_hip):
+ include_dirs.append(os.path.join(cuda_path, 'include'))
+ if PLATFORM_WIN32:
+ library_dirs.append(os.path.join(cuda_path, 'bin'))
++ library_dirs.append(os.path.join(cuda_path, 'bin', 'x64'))
+ library_dirs.append(os.path.join(cuda_path, 'lib', 'x64'))
+ else:
+ library_dirs.append(os.path.join(cuda_path, 'lib64'))
+@@ -746,7 +747,7 @@ def conda_update_dirs(include_dirs, library_dirs):
+ # executable in the build environment, not the target environment.
+ # This assumes, however, that the build/host environments see the same
+ # CUDA Toolkit.
+- if os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith('12'):
++ if os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith(('12', '13')):
+ include_dirs.insert(
+ 0,
+ f'{os.environ["BUILD_PREFIX"]}/targets/x86_64-linux/include')
+@@ -761,7 +762,7 @@ def conda_update_dirs(include_dirs, library_dirs):
+ include_dirs.append(f'{os.environ["BUILD_PREFIX"]}/include')
+ library_dirs.append(f'{os.environ["BUILD_PREFIX"]}/lib')
+
+- if os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith('12'):
++ if os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith(('12', '13')):
+ if PLATFORM_LINUX:
+ include_dirs.append(
+ f'{os.environ["BUILD_PREFIX"]}/targets/'
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index e6d76da0..85d903b1 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,7 +1,7 @@
{% set name = "cupy" %}
-{% set version = "13.5.1" %}
-{% set sha256 = "3dba2f30258463482d52deb420862fbbbaf2c446165a5e8d67377ac6cb5c0870" %}
-{% set number = 2 %}
+{% set version = "13.6.0" %}
+{% set sha256 = "3cba30ae3dd32b5d5c6536e710cb98015227cd4ba83c46b3f1825a7ae55b6667" %}
+{% set number = 0 %}
{% set target_name = "x86_64-linux" %} # [linux64]
{% set target_name = "ppc64le-linux" %} # [ppc64le]
@@ -27,11 +27,13 @@ package:
source:
- url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: {{ sha256 }}
+ patches:
+ - 01-cuda13-build.diff
build:
number: {{ number }}
# For CUDA 12, the compiler version is hard-coded in the cuda120.yaml migrator
- skip: true # [(py < 39) or cuda_compiler_version not in ("11.8", "12.9") or ppc64le]
+ skip: true # [(py < 39) or cuda_compiler_version not in ("11.8", "12.9", "13.0") or ppc64le]
requirements:
host:
@@ -43,7 +45,7 @@ outputs:
build:
number: {{ number }}
# For CUDA 12, the compiler version is hard-coded in the cuda120.yaml migrator
- skip: true # [(py < 39) or cuda_compiler_version not in ("11.8", "12.9") or ppc64le]
+ skip: true # [(py < 39) or cuda_compiler_version not in ("11.8", "12.9", "13.0") or ppc64le]
requirements:
host:
- python
@@ -83,7 +85,7 @@ outputs:
build:
number: {{ number }}
# For CUDA 12, the compiler version is hard-coded in the cuda120.yaml migrator
- skip: true # [(py < 39) or cuda_compiler_version not in ("11.8", "12.9") or ppc64le]
+ skip: true # [(py < 39) or cuda_compiler_version not in ("11.8", "12.9", "13.0") or ppc64le]
script_env:
# To avoid memory usage warnings on CI, reduce parallelism of CuPy builds.
- CUPY_NUM_BUILD_JOBS=1
@@ -95,12 +97,15 @@ outputs:
- export CUDA_PATH=$PREFIX/targets/{{ target_name }} # [linux]
{% endif %}
- echo "nvcc is $NVCC, CUDA path is $CUDA_PATH" # [linux]
- - for /f "tokens=* usebackq" %%f in (`where nvcc`) do (set "dummy=%%f" && call set "NVCC=%%dummy:\=\\%%") # [win]
+ - echo "CONDA_OVERRIDE_CUDA is $CONDA_OVERRIDE_CUDA" # [linux]
+ - for /f "tokens=* usebackq" %%f in (`where nvcc`) do (set "dummy=%%f" && call set "NVCC=%%dummy:\=\\%%") # [win64]
# we use this WAR until we figure out how to proceed with conda-forge/nvcc-feedstock#88
- - set "NVCC=%NVCC% --use-local-env" # [win64]
- - echo "nvcc is %NVCC%, CUDA path is %CUDA_PATH%" # [win]
- # Workaround __ieee128 error; see https://github.com/LLNL/blt/issues/341
- - export NVCC="$NVCC -Xcompiler -mno-float128" # [ppc64le]
+ - set "NVCC=%NVCC% --use-local-env" # [win64]
+ # Starting CUDA 13, everything is pushed one level down (bin->bin\x64, lib->lib\x64). We need to assist CuPy's build
+ # system to locate things when build env != target env.
+ - set "CUDA_PATH=%PREFIX%\Library" # [win64 and cuda_compiler_version == "13.0"]
+ - echo "nvcc is %NVCC%, CUDA path is %CUDA_PATH%" # [win64]
+ - echo "CONDA_OVERRIDE_CUDA is %CONDA_OVERRIDE_CUDA%" # [win64]
- >-
{{ PYTHON }} -m pip install . --no-deps -vv
- if errorlevel 1 exit 1 # [win]
@@ -131,8 +136,10 @@ outputs:
{% endif %}
ignore_run_exports:
# optional dependencies
+ {% if cuda_major < 13 %}
- nccl # [linux]
- cutensor
+ {% endif %}
requirements:
build:
- {{ compiler("c") }}
@@ -157,8 +164,10 @@ outputs:
- libcusparse-dev # [build_platform != target_platform]
{% endif %}
# optional dependencies for CUDA 11.2+
+ {% if cuda_major < 13 %}
- nccl ~=2.16 # [build_platform != target_platform]
- cutensor ~=2.0 # [build_platform != target_platform]
+ {% endif %}
host:
- python
- pip
@@ -181,8 +190,10 @@ outputs:
- libcusparse-dev
{% endif %}
# optional dependencies
+ {% if cuda_major < 13 %}
- nccl ~=2.16 # [linux]
- cutensor ~=2.0
+ {% endif %}
run:
- python
- {{ pin_compatible('fastrlock', max_pin='x.x') }}
@@ -203,8 +214,10 @@ outputs:
- __cuda >={{ cuda_major }}.2 # [cuda_compiler == "nvcc"]
- __cuda >={{ cuda_major }}.0 # [cuda_compiler == "cuda-nvcc"]
- {{ pin_subpackage('cupy', max_pin='x.x') }}
+ {% if cuda_major < 13 %}
- {{ pin_compatible('nccl') }} # [linux]
- {{ pin_compatible('cutensor') }}
+ {% endif %}
test:
requires:
- pip
diff --git a/recipe/preload_config/linux64_cuda13_wheel.json b/recipe/preload_config/linux64_cuda13_wheel.json
new file mode 100644
index 00000000..aed5c027
--- /dev/null
+++ b/recipe/preload_config/linux64_cuda13_wheel.json
@@ -0,0 +1,4 @@
+{
+ "packaging": "conda",
+ "cuda": "13.x"
+}
diff --git a/recipe/preload_config/win64_cuda13_wheel.json b/recipe/preload_config/win64_cuda13_wheel.json
new file mode 100644
index 00000000..aed5c027
--- /dev/null
+++ b/recipe/preload_config/win64_cuda13_wheel.json
@@ -0,0 +1,4 @@
+{
+ "packaging": "conda",
+ "cuda": "13.x"
+}
|