Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use vs2019 and drop setting CUDA_PATH #252

Merged
merged 9 commits into from
Feb 5, 2024
Merged

Use vs2019 and drop setting CUDA_PATH #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dca3b36
dummy commit for rerendering
conda-forge-webservices[bot] Feb 4, 2024
8971787
Delete recipe/conda_build_config.yaml
leofang Feb 4, 2024
58a9643
Delete recipe/activate.bat
leofang Feb 4, 2024
07f86c5
Delete recipe/activate.sh
leofang Feb 4, 2024
954e1a7
Delete recipe/deactivate.bat
leofang Feb 4, 2024
0633867
Delete recipe/deactivate.sh
leofang Feb 4, 2024
7a7a388
Update meta.yaml
leofang Feb 4, 2024
a0cacc5
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
Feb 4, 2024
2168b6f
Update run_test.py
leofang Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
4 changes: 2 additions & 2 deletions ...support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
4 changes: 2 additions & 2 deletions ...support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cudnn:
cutensor:
- '2'
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
10 changes: 0 additions & 10 deletions recipe/activate.bat
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions recipe/activate.sh
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions recipe/conda_build_config.yaml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions recipe/deactivate.bat
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions recipe/deactivate.sh
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand Down Expand Up @@ -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]
Expand Down
5 changes: 0 additions & 5 deletions recipe/run_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down