Skip to content

Commit

Permalink
Merge d0788e8 into 4a12ae2
Browse files Browse the repository at this point in the history
  • Loading branch information
@conda-forge-admin
conda-forge-admin authored Dec 13, 2024
2 parents 4a12ae2 + d0788e8 commit e14f0f1
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 72 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion ...compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
1 change: 0 additions & 1 deletion ...compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
1 change: 0 additions & 1 deletion ...compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
1 change: 0 additions & 1 deletion ...a_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
1 change: 0 additions & 1 deletion ..._compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 0 additions & 5 deletions ...compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,8 +6,6 @@ c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand Down Expand Up @@ -37,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 0 additions & 5 deletions ...compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,8 +6,6 @@ c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand Down Expand Up @@ -37,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 0 additions & 5 deletions ...compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,8 +6,6 @@ c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand Down Expand Up @@ -37,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 0 additions & 5 deletions ...a_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,8 +6,6 @@ c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand Down Expand Up @@ -37,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 0 additions & 5 deletions ..._compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,8 +6,6 @@ c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand Down Expand Up @@ -37,7 +33,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
2 changes: 2 additions & 0 deletions .ci_support/migrations/cuda12x.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ __migrator:
- 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.4 # [linux and ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.6 # [((linux and not ppc64le) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
Expand Down
1 change: 1 addition & 0 deletions .scripts/run_win_build.bat
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions build-locally.py
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 0 additions & 33 deletions recipe/0001-include-pxd-pyx.patch
View file

This file was deleted.

18 changes: 9 additions & 9 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,18 @@ package:
version: {{ version }}

source:
url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.tar.gz
sha256: a6c7f6b802411fb1e0c9c2b6660d70c277a75b4f904f84d38cfe9ac341c9f379
patches:
- 0001-include-pxd-pyx.patch
# TODO: remove the hard-coded .post1 in the next release
url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.post1.tar.gz
sha256: abbfad534cb51d79f748cc5dfdc761fa6bb2c7a2b59e64b1d03608e7b0f64b1b

build:
number: 1
{% if not (environ.get("cuda_compiler_version")|string()) == (major_version|string()) %}
skip: true
{% endif %}
number: 2
# `linux_ppc64le` is unsupported by the CUDA Toolkit as of 12.5.0.
# So skip building `cuda-python` on `linux_ppc64le`
# xref: https://github.com/conda-forge/cuda-feedstock/issues/27
skip: true # [ppc64le]
{% if ppc64le or not (environ.get("cuda_compiler_version")|string()) == (major_version|string()) %}
skip: true
{% endif %}
script:
- pushd cuda_bindings
- {{ PYTHON }} -m pip install . --no-deps -vv
Expand Down Expand Up @@ -96,6 +94,8 @@ test:
- set "CL=%CL% /I%CONDA_PREFIX%\{{ subdir }}\include" # [win]
- cythonize -i -3 test_cimport.pyx
- python -c "import test_cimport; test_cimport.test()"
- python -c "import cuda.bindings; print(cuda.bindings.__version__)"
- python -c "import cuda; print(cuda.__version__)" # TODO: Remove this
imports:
- cuda
- cuda.cuda
Expand Down

0 comments on commit e14f0f1

Please sign in to comment.