Skip to content

Commit

Permalink
Use CUDA Enhanced Compatibility on CUDA 12 (#122)
Browse files Browse the repository at this point in the history 
automerged PR by conda-forge/automerge-action
  • Loading branch information
@conda-forge-admin
conda-forge-admin authored Nov 26, 2024
2 parents 88a8661 + b229ff4 commit 3e1ff81
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 51 deletions.
24 changes: 12 additions & 12 deletions .azure-pipelines/azure-pipelines-linux.yml
View file

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

6 changes: 2 additions & 4 deletions ...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -21,16 +21,14 @@ cxx_compiler:
cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.8
- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7
nccl:
- '2'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
8 changes: 3 additions & 5 deletions ...er_version12.0cxx_compiler_version12.yaml → ...er_version12.6cxx_compiler_version12.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,28 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
- '12.6'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:cos7
nccl:
- '2'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
6 changes: 2 additions & 4 deletions ...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -25,16 +25,14 @@ cxx_compiler:
cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.8
- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
nccl:
- '2'
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
8 changes: 3 additions & 5 deletions ...er_version12.0cxx_compiler_version12.yaml → ...er_version12.6cxx_compiler_version12.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,28 @@ c_stdlib_version:
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
- '12.6'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:cos7
nccl:
- '2'
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
6 changes: 2 additions & 4 deletions ...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -21,16 +21,14 @@ cxx_compiler:
cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.8
- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
nccl:
- '2'
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
8 changes: 3 additions & 5 deletions ...er_version12.0cxx_compiler_version12.yaml → ...er_version12.4cxx_compiler_version12.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,28 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
- '12.4'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:cos7
nccl:
- '2'
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
12 changes: 6 additions & 6 deletions README.md
View file

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

2 changes: 1 addition & 1 deletion azure-pipelines.yml
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.

11 changes: 6 additions & 5 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ source:
- 0001-use-conda-ar-not-system.patch

build:
number: 2
skip: true # [(not linux) or cuda_compiler_version in (undefined, "None", "10.2")]
number: 3
skip: true # [(not linux) or cuda_compiler_version in (undefined, "None")]
ignore_run_exports_from:
# Ignore `cudatoolkit` dependency in CUDA 11 builds
- {{ compiler("cuda") }} # [(cuda_compiler_version or "").startswith("11")]
# Ignore `cudatoolkit` dependency in CUDA 11 builds as it is unneeded.
# Also ignore `cuda-version` constraint in CUDA 12+ as this supports CUDA Enhanced Compatibility.
- {{ compiler("cuda") }}
run_exports:
# xref: https://github.com/NVIDIA/nccl/issues/218
- {{ pin_subpackage(name, max_pin="x") }}
Expand All @@ -29,7 +30,7 @@ requirements:
- {{ compiler("cuda") }}
- make
host:
- cuda-version ={{ cuda_compiler_version }} # [(cuda_compiler_version or "").startswith("11")]
- cuda-version {{ cuda_compiler_version }}
run:
- cuda-version >=12.0,<13.0a0 # [(cuda_compiler_version or "").startswith("12")]
- cuda-version >=11.0,<12.0a0 # [(cuda_compiler_version or "").startswith("11")]
Expand Down

0 comments on commit 3e1ff81

Please sign in to comment.