diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.10.____cpython.yaml index eb85676b..bf000c45 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.10.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.11.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.11.____cpython.yaml index 884c3a49..c88273f0 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.11.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.12.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.12.____cpython.yaml index 97954ba9..a6b80234 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.12.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml index f5860243..0a1ce44a 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml index 42e3aa49..1e1bdbf9 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml index c9826be8..3bce70c8 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml index f5475f81..f6b0c953 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml index 2e54bc4b..b589f61c 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ cudnn: cutensor: - '2' cxx_compiler: -- vs2017 +- vs2019 pin_run_as_build: python: min_pin: x.x diff --git a/recipe/activate.bat b/recipe/activate.bat deleted file mode 100755 index 611d7027..00000000 --- a/recipe/activate.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -if defined CONDA_BUILD_STATE ( - @echo on -) - -if defined CUDA_PATH ( - set "CONDA_CUPY_CUDA_PATH=%CUDA_PATH%" -) - -set "CUDA_PATH=%CONDA_PREFIX%" diff --git a/recipe/activate.sh b/recipe/activate.sh deleted file mode 100755 index 265ac99e..00000000 --- a/recipe/activate.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - - -if [[ -n ${CUDA_PATH:+x} ]]; then - export CONDA_CUPY_CUDA_PATH=$CUDA_PATH -fi - -export CUDA_PATH=$CONDA_PREFIX diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index bd6e07bf..00000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -c_compiler: # [win] - - vs2017 # [win] -cxx_compiler: # [win] - - vs2017 # [win] diff --git a/recipe/deactivate.bat b/recipe/deactivate.bat deleted file mode 100755 index dd9bd2e5..00000000 --- a/recipe/deactivate.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -if defined CONDA_BUILD_STATE ( - @echo on -) - -if not "%CONDA_CUPY_CUDA_PATH%"=="" ( - set "CUDA_PATH=%CONDA_CUPY_CUDA_PATH%" - set "CONDA_CUPY_CUDA_PATH=" -) else ( - set CUDA_PATH="" -) diff --git a/recipe/deactivate.sh b/recipe/deactivate.sh deleted file mode 100755 index 2128f20a..00000000 --- a/recipe/deactivate.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - - -if [[ -n ${CONDA_CUPY_CUDA_PATH:+x} ]]; then - export CUDA_PATH=$CONDA_CUPY_CUDA_PATH - unset CONDA_CUPY_CUDA_PATH -else - unset CUDA_PATH -fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 815f8dc0..a2a813c4 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "cupy" %} {% set version = "13.0.0" %} {% set sha256 = "2f04e7857f692a713360dc9c3b06709806ab8404fca39b5af9721c04a2979aae" %} -{% set build_num = 2 %} +{% set build_num = 3 %} {% set target_name = "x86_64-linux" %} # [linux64] {% set target_name = "ppc64le-linux" %} # [ppc64le] @@ -102,16 +102,6 @@ outputs: {{ PYTHON }} -m pip install . --no-deps -vv - if errorlevel 1 exit 1 # [win] - # copy activate/deactivate scripts - - mkdir -p "${PREFIX}/etc/conda/activate.d" # [linux] - - cp "${RECIPE_DIR}/activate.sh" "${PREFIX}/etc/conda/activate.d/cupy_activate.sh" # [linux] - - mkdir -p "${PREFIX}/etc/conda/deactivate.d" # [linux] - - cp "${RECIPE_DIR}/deactivate.sh" "${PREFIX}/etc/conda/deactivate.d/cupy_deactivate.sh" # [linux] - - if not exist %PREFIX%\etc\conda\activate.d mkdir %PREFIX%\etc\conda\activate.d # [win] - - copy %RECIPE_DIR%\activate.bat %PREFIX%\etc\conda\activate.d\cupy_activate.bat # [win] - - if not exist %PREFIX%\etc\conda\deactivate.d mkdir %PREFIX%\etc\conda\deactivate.d # [win] - - copy %RECIPE_DIR%\deactivate.bat %PREFIX%\etc\conda\deactivate.d\cupy_deactivate.bat # [win] - # enable CuPy's preload mechanism - mkdir -p "${SP_DIR}/cupy/.data/" # [linux] - cp ${RECIPE_DIR}/preload_config/linux64_cuda{{ cuda_major }}_wheel.json ${SP_DIR}/cupy/.data/_wheel.json # [linux] diff --git a/recipe/run_test.py b/recipe/run_test.py index b723210c..ce74cdff 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -14,11 +14,6 @@ def get_target_name(): out = f"{plat}-linux" return out -# Check CUDA_PATH is set -cuda_path = os.environ.get('CUDA_PATH') -assert cuda_path is not None -print("CUDA_PATH:", cuda_path) - # check _wheel.json exists # note that we don't rely on cupy.__file__ because we cannot import CuPy on Windows pypaths = site.getsitepackages()