Skip to content

Commit

Permalink
Use CUDA Enhanced Compatibility on CUDA 12 (conda-forge#201)
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 0c88b84 + f62536e commit d213489
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 54 deletions.
30 changes: 15 additions & 15 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.

4 changes: 2 additions & 2 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.

3 changes: 1 addition & 2 deletions ...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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'
pin_run_as_build:
Expand All @@ -42,7 +42,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 2 additions & 3 deletions ...piler_version12python3.9.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ channel_targets:
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'
pin_run_as_build:
Expand All @@ -42,7 +42,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
3 changes: 1 addition & 2 deletions ...uda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:cos7
nccl:
- '2'
pin_run_as_build:
Expand All @@ -42,7 +42,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
3 changes: 1 addition & 2 deletions ...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ 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'
pin_run_as_build:
Expand All @@ -46,7 +46,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 2 additions & 3 deletions ...piler_version12python3.9.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ channel_targets:
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'
pin_run_as_build:
Expand All @@ -46,7 +46,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
3 changes: 1 addition & 2 deletions ...uda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:cos7
nccl:
- '2'
pin_run_as_build:
Expand All @@ -46,7 +46,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
3 changes: 1 addition & 2 deletions ...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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'
pin_run_as_build:
Expand All @@ -42,7 +42,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
5 changes: 2 additions & 3 deletions ...piler_version12python3.9.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ channel_targets:
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'
pin_run_as_build:
Expand All @@ -42,7 +42,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
3 changes: 1 addition & 2 deletions ...uda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:cos7
nccl:
- '2'
pin_run_as_build:
Expand All @@ -42,7 +42,6 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler
- cuda_compiler_version
- docker_image
2 changes: 1 addition & 1 deletion ...ler_version12.0python3.9.____cpython.yaml → ...ler_version12.6python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ channel_targets:
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
- '12.6'
cxx_compiler:
- vs2019
m2w64_c_compiler:
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file

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

14 changes: 7 additions & 7 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "xgboost" %}
{% set version = "2.1.2" %}
{% set build_number = 1 %}
{% set build_number = 2 %}
{% set min_python = "3.9" %}

{% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) if (cuda_compiler_version or "None") != "None" else "cpu" %}
Expand Down Expand Up @@ -54,7 +54,7 @@ outputs:
activate_in_script: true
string: {{ string_prefix }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
ignore_run_exports_from:
- {{ compiler('cuda') }} # [(cuda_compiler_version or "").startswith("11")]
- {{ compiler('cuda') }} # [cuda_compiler != "None"]
missing_dso_whitelist:
# Conda-build raises the missing `R.dll` linkage erroneously.
# xref: https://github.com/conda/conda-build/pull/4786
Expand All @@ -74,12 +74,12 @@ outputs:
- llvm-openmp # [osx]
- libgomp # [linux]
host:
- nccl # [linux and cuda_compiler != "None"]
- cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"]
- nccl # [linux and cuda_compiler != "None"]
run:
- __cuda # [cuda_compiler != "None"]
{% if (cuda_compiler_version or "").startswith("11") %}
- cuda-version >=11.2,<12
{% endif %}
- __cuda # [cuda_compiler != "None"]
- cuda-version >=11.2,<12.0a0 # [(cuda_compiler_version or "").startswith("11")]
- cuda-version >=12.0,<13.0a0 # [(cuda_compiler_version or "").startswith("12")]
test:
commands:
- test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix]
Expand Down

0 comments on commit d213489

Please sign in to comment.