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

Use GCC 13 in CUDA 12 conda builds. #567

Merged
merged 8 commits into from
Jan 21, 2025
+68 −64
Merged

Use GCC 13 in CUDA 12 conda builds. #567

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
438045c
Use GCC 13 in CUDA 12 conda builds.
bdice Jan 13, 2025
2a9b5ec
Manual changes.
bdice Jan 13, 2025
7ddf45b
Merge branch 'branch-25.02' into use-gcc-13-with-cuda-12-conda-builds
bdice Jan 16, 2025
bc0827f
Use KVP[] to get the proper deleter.
bdice Jan 16, 2025
a753a63
Fix template argument for raft::update_host.
bdice Jan 16, 2025
c2d9f1a
Revert changes in examples/cpp/CMakeLists.
bdice Jan 16, 2025
20aed89
Merge branch 'branch-25.02' into use-gcc-13-with-cuda-12-conda-builds
bdice Jan 17, 2025
d96ef99
Merge branch 'branch-25.02' into use-gcc-13-with-cuda-12-conda-builds
bdice Jan 17, 2025
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
Prev Previous commit
Next Next commit
Manual changes.
@bdice
bdice committed Jan 13, 2025
commit 2a9b5ec009790bff2139d73560956e8ec76b9bee
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx>=8.0.0
- sysroot_linux-aarch64==2.17
- sysroot_linux-aarch64==2.28
- pip:
- nvidia-sphinx-theme
name: all_cuda-118_arch-aarch64
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx>=8.0.0
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
- pip:
- nvidia-sphinx-theme
name: all_cuda-118_arch-x86_64
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-125_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ dependencies:
- cython>=3.0.0
- dlpack>=0.8,<1.0
- doxygen>=1.8.20
- gcc_linux-aarch64=11.*
- gcc_linux-aarch64=13.*
- graphviz
- ipython
- libclang
@@ -51,7 +51,7 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx>=8.0.0
- sysroot_linux-aarch64==2.17
- sysroot_linux-aarch64==2.28
- pip:
- nvidia-sphinx-theme
name: all_cuda-125_arch-aarch64
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ dependencies:
- cython>=3.0.0
- dlpack>=0.8,<1.0
- doxygen>=1.8.20
- gcc_linux-64=11.*
- gcc_linux-64=13.*
- graphviz
- ipython
- libclang
@@ -51,7 +51,7 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx>=8.0.0
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
- pip:
- nvidia-sphinx-theme
name: all_cuda-125_arch-x86_64
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- setuptools
- sysroot_linux-aarch64==2.17
- sysroot_linux-aarch64==2.28
- wheel
name: bench_ann_cuda-118_arch-aarch64
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- setuptools
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
- wheel
name: bench_ann_cuda-118_arch-x86_64
4 changes: 2 additions & 2 deletions conda/environments/bench_ann_cuda-125_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dlpack>=0.8,<1.0
- gcc_linux-aarch64=11.*
- gcc_linux-aarch64=13.*
- glog>=0.6.0
- h5py>=3.8.0
- libcublas-dev
@@ -43,6 +43,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- setuptools
- sysroot_linux-aarch64==2.17
- sysroot_linux-aarch64==2.28
- wheel
name: bench_ann_cuda-125_arch-aarch64
4 changes: 2 additions & 2 deletions conda/environments/bench_ann_cuda-125_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dlpack>=0.8,<1.0
- gcc_linux-64=11.*
- gcc_linux-64=13.*
- glog>=0.6.0
- h5py>=3.8.0
- libcublas-dev
@@ -43,6 +43,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- setuptools
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
- wheel
name: bench_ann_cuda-125_arch-x86_64
4 changes: 1 addition & 3 deletions conda/recipes/cuvs-bench/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -37,10 +37,8 @@ build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
- libcublas-dev
{% endif %}
4 changes: 1 addition & 3 deletions conda/recipes/cuvs/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,8 @@ build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
{% endif %}
- cuda-python
16 changes: 4 additions & 12 deletions conda/recipes/libcuvs/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -39,10 +39,8 @@ outputs:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
- libcublas-dev
- libcurand-dev
@@ -106,10 +104,8 @@ outputs:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
- libcublas-dev
- libcurand-dev
@@ -174,10 +170,8 @@ outputs:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
- libcublas-dev
- libcurand-dev
@@ -246,10 +240,8 @@ outputs:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
- libcublas-dev
- libcurand-dev
18 changes: 16 additions & 2 deletions dependencies.yaml
View file
Original file line number Diff line number Diff line change
@@ -166,14 +166,28 @@ dependencies:
matrices:
- matrix:
arch: x86_64
cuda: "11.*"
packages:
- gcc_linux-64=11.*
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
- matrix:
arch: aarch64
cuda: "11.*"
packages:
- gcc_linux-aarch64=11.*
- sysroot_linux-aarch64==2.17
- sysroot_linux-aarch64==2.28
- matrix:
arch: x86_64
cuda: "12.*"
packages:
- gcc_linux-64=13.*
- sysroot_linux-64==2.28
- matrix:
arch: aarch64
cuda: "12.*"
packages:
- gcc_linux-aarch64=13.*
- sysroot_linux-aarch64==2.28
- output_types: conda
matrices:
- matrix: {cuda: "12.*"}