| win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython |
@@ -308,7 +336,7 @@ available continuous integration services. Thanks to the awesome service provide
[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/),
[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/)
it is possible to build and upload installable packages to the
-[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/)
+[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/)
channel for Linux, Windows and OSX respectively.
To manage the continuous integration and simplify feedstock maintenance
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 77845f62..efd80af7 100755
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -21,13 +21,12 @@ source:
- url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
- - support_new_cuda_layout.diff # [(linux and (cuda_compiler_version or "").startswith("12")) or (build_platform != target_platform)]
+ - support_new_cuda_layout.diff # [((linux or win64) and (cuda_compiler_version or "").startswith("12")) or (build_platform != target_platform)]
- support_nvtx3_win.diff # [win64]
build:
- number: 3
- # TODO: turn on win64 + CUDA 12 once it's ready
- skip: true # [cuda_compiler_version not in ("11.8", "12.0") or (cuda_compiler_version == "12.0" and win64)]
+ number: 4
+ skip: true # [cuda_compiler_version not in ("11.8", "12.0")]
script:
# CuPy default detects CUDA from nvcc, but on Conda-Forge's dockers nvcc lives in a different place...
# With conda-forge/nvcc-feedstock#58, CUDA_PATH is set correctly
@@ -90,7 +89,7 @@ requirements:
- cython >=0.29.22,<3 # [build_platform != target_platform]
# TODO: clean up
{% if cuda_major >= 12 %}
- - cuda-driver-dev # [build_platform != target_platform]
+ - cuda-driver-dev # [linux and build_platform != target_platform]
- cuda-cudart-dev # [build_platform != target_platform]
- cuda-nvrtc-dev # [build_platform != target_platform]
- cuda-nvtx-dev # [build_platform != target_platform]
@@ -118,7 +117,7 @@ requirements:
- nvtx-c # [win64]
# TODO: clean up
{% if cuda_major >= 12 %}
- - cuda-driver-dev
+ - cuda-driver-dev # [linux]
- cuda-cudart-dev
- cuda-nvrtc-dev
- cuda-nvtx-dev
@@ -161,7 +160,7 @@ requirements:
test:
requires:
# need the libcuda stub for import test
- - cuda-driver-dev # [(cuda_compiler_version or "").startswith("12")]
+ - cuda-driver-dev # [linux and (cuda_compiler_version or "").startswith("12")]
source_files:
- tests
diff --git a/recipe/support_new_cuda_layout.diff b/recipe/support_new_cuda_layout.diff
index 4179d91b..7974159a 100644
--- a/recipe/support_new_cuda_layout.diff
+++ b/recipe/support_new_cuda_layout.diff
@@ -1,16 +1,19 @@
diff --git a/install/cupy_builder/cupy_setup_build.py b/install/cupy_builder/cupy_setup_build.py
-index 8023e46ad..4349ebe05 100644
+index 8023e46ad..466f7152f 100644
--- a/install/cupy_builder/cupy_setup_build.py
+++ b/install/cupy_builder/cupy_setup_build.py
-@@ -5,6 +5,7 @@ from distutils import ccompiler
+@@ -3,8 +3,10 @@
+ import copy
+ from distutils import ccompiler
from distutils import sysconfig
++import logging
import os
import shutil
+import subprocess
import sys
import setuptools
-@@ -294,16 +295,36 @@ def make_extensions(ctx: Context, compiler, use_cython):
+@@ -294,16 +296,39 @@ def make_extensions(ctx: Context, compiler, use_cython):
# deprecated since ROCm 4.2.0
settings['define_macros'].append(('__HIP_PLATFORM_HCC__', '1'))
@@ -26,19 +29,22 @@ index 8023e46ad..4349ebe05 100644
- 'Please check above error log.')
+ try:
+ host_compiler = compiler
-+ if os.environ.get('CONDA_BUILD_CROSS_COMPILATION'):
++ if int(os.environ.get('CONDA_BUILD_CROSS_COMPILATION', 0)) == 1:
+ os.symlink(f'{os.environ["BUILD_PREFIX"]}/x86_64-conda-linux-gnu/bin/x86_64-conda-linux-gnu-ld',
+ f'{os.environ["BUILD_PREFIX"]}/bin/ld')
-+ if os.environ.get('CONDA_BUILD_CROSS_COMPILATION') or os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith('12'):
++ if int(os.environ.get('CONDA_BUILD_CROSS_COMPILATION', 0)) == 1 or os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith('12'):
+ # 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 environment.
++ logging.debug("creating a new compiler instance...")
+ compiler = ccompiler.new_compiler()
-+ compiler.compiler = [os.environ['CC_FOR_BUILD'],]
-+ compiler.compiler_cxx = [os.environ['CXX_FOR_BUILD'],]
-+ compiler.compiler_so = [os.environ['CC_FOR_BUILD'],]
-+ compiler.linker_exe = [os.environ['CC_FOR_BUILD'], f'-B{os.environ["BUILD_PREFIX"]}/bin']
-+ compiler.linker_so = [os.environ['CC_FOR_BUILD'], f'-B{os.environ["BUILD_PREFIX"]}/bin', '-shared']
++ cc = os.environ['CC_FOR_BUILD'] if PLATFORM_LINUX else os.environ['CC']
++ cxx = os.environ['CXX_FOR_BUILD'] if PLATFORM_LINUX else os.environ['CXX']
++ compiler.compiler = [cc,]
++ compiler.compiler_cxx = [cxx,]
++ compiler.compiler_so = [cc,]
++ compiler.linker_exe = [cc, f'-B{os.environ["BUILD_PREFIX"]}/bin']
++ compiler.linker_so = [cc, f'-B{os.environ["BUILD_PREFIX"]}/bin', '-shared']
+
+ available_modules = []
+ if no_cuda:
@@ -52,13 +58,13 @@ index 8023e46ad..4349ebe05 100644
+ 'Please check above error log.')
+ finally:
+ compiler = host_compiler
-+ if os.environ.get('CONDA_BUILD_CROSS_COMPILATION'):
++ if int(os.environ.get('CONDA_BUILD_CROSS_COMPILATION', 0)) == 1:
+ os.remove(f'{os.environ["BUILD_PREFIX"]}/bin/ld')
ret = []
for module in MODULES:
diff --git a/install/cupy_builder/install_build.py b/install/cupy_builder/install_build.py
-index d0317e324..759d27157 100644
+index d0317e324..210bf46f7 100644
--- a/install/cupy_builder/install_build.py
+++ b/install/cupy_builder/install_build.py
@@ -1,7 +1,9 @@
@@ -81,7 +87,21 @@ index d0317e324..759d27157 100644
PLATFORM_LINUX = sys.platform.startswith('linux')
PLATFORM_WIN32 = sys.platform.startswith('win32')
-@@ -689,9 +694,59 @@ def get_cusparselt_version(formatted=False):
+@@ -188,6 +193,13 @@ def get_compiler_setting(ctx: Context, use_hip):
+ cuda_cub_path = None
+ else:
+ cuda_cub_path = None
++
++ if cuda_cub_path is None:
++ if int(os.environ.get('CONDA_BUILD', 0)) == 1 and PLATFORM_WIN32:
++ cuda_cub_path = os.path.join(os.environ['BUILD_PREFIX'], 'Library', 'include', 'targets', 'x64', 'cub')
++ if not os.path.exists(cuda_cub_path):
++ cuda_cub_path = None
++
+ global _cub_path
+ if cuda_cub_path:
+ _cub_path = cuda_cub_path
+@@ -689,9 +701,69 @@ def get_cusparselt_version(formatted=False):
return _cusparselt_version
@@ -93,8 +113,10 @@ index d0317e324..759d27157 100644
+ out = "sbsa-linux"
+ else:
+ out = f"{plat}-linux"
++ elif PLATFORM_WIN32:
++ out = 'x64'
+ else:
-+ raise NotImplementedError
++ assert False
+ logging.debug(f"{out=}")
+ return out
+
@@ -106,7 +128,7 @@ index d0317e324..759d27157 100644
+ include_dirs = list(include_dirs)
+ library_dirs = list(library_dirs)
+
-+ if os.environ.get('CONDA_BUILD_CROSS_COMPILATION'):
++ if int(os.environ.get('CONDA_BUILD_CROSS_COMPILATION', 0)) == 1:
+ # If we're cross compiling, we need to generate stub files that are
+ # executable in the build environment, not the target environment.
+ # This assumes, however, that the build/host environments see the same
@@ -124,11 +146,18 @@ index d0317e324..759d27157 100644
+ library_dirs.append(f'{os.environ["BUILD_PREFIX"]}/lib')
+
+ if os.environ.get('CONDA_OVERRIDE_CUDA', '0').startswith('12'):
-+ include_dirs.append(f'{os.environ["BUILD_PREFIX"]}/targets/{conda_get_target_name()}/include') # for crt headers
-+ library_dirs.append(f'{os.environ["PREFIX"]}/lib/stubs')
-+ # for optional dependencies
-+ include_dirs.append(f'{os.environ["PREFIX"]}/include')
-+ library_dirs.append(f'{os.environ["PREFIX"]}/lib')
++ if PLATFORM_LINUX:
++ include_dirs.append(f'{os.environ["BUILD_PREFIX"]}/targets/{conda_get_target_name()}/include') # for crt headers
++ library_dirs.append(f'{os.environ["PREFIX"]}/lib/stubs')
++ # for optional dependencies
++ include_dirs.append(f'{os.environ["PREFIX"]}/include')
++ library_dirs.append(f'{os.environ["PREFIX"]}/lib')
++ else:
++ include_dirs.append(f'{os.environ["BUILD_PREFIX"]}/Library/include/targets/{conda_get_target_name()}') # for CCCL headers
++ # there seems to be no stubs for windows
++ # for optional dependencies
++ include_dirs.append(f'{os.environ["LIBRARY_INC"]}') # $PREFIX/Library/include
++ library_dirs.append(f'{os.environ["LIBRARY_LIB"]}') # $PREFIX/Library/lib
+
+ return include_dirs, library_dirs
+
@@ -137,15 +166,17 @@ index d0317e324..759d27157 100644
include_dirs=(), library_dirs=(), define_macros=None,
extra_compile_args=()):
+ include_dirs, library_dirs = conda_update_dirs(include_dirs, library_dirs)
++ logging.debug(include_dirs)
+
with _tempdir() as temp_dir:
fname = os.path.join(temp_dir, 'a.cpp')
with open(fname, 'w') as f:
-@@ -717,6 +772,8 @@ def build_shlib(compiler, source, libraries=(),
+@@ -717,6 +789,9 @@ def build_shlib(compiler, source, libraries=(),
def build_and_run(compiler, source, libraries=(),
include_dirs=(), library_dirs=(), define_macros=None,
extra_compile_args=()):
+ include_dirs, library_dirs = conda_update_dirs(include_dirs, library_dirs)
++ logging.debug(include_dirs)
+
with _tempdir() as temp_dir:
fname = os.path.join(temp_dir, 'a.cpp')
|