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. #1773

Merged
merged 7 commits into from
Jan 17, 2025
+43 −35
Merged

Use GCC 13 in CUDA 12 conda builds. #1773

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87c7296
Use GCC 13 in CUDA 12 builds.
bdice Dec 23, 2024
72e6ad1
Fix conditionals.
bdice Dec 23, 2024
a0013e1
Update dependencies.yaml.
bdice Jan 3, 2025
a6bd58b
Use sysroot 2.28 and pin to gcc 13.*.
bdice Jan 13, 2025
0a1355d
Merge branch 'branch-25.02' into try-gcc-13
bdice Jan 13, 2025
b984c92
Add spdlog back.
bdice Jan 13, 2025
8a6a84d
Fix spacing
bdice Jan 13, 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
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx_rtd_theme
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
name: all_cuda-118_arch-x86_64
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cython>=3.0.0
- doxygen=1.9.1
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- gcc_linux-64=13.*
- gcovr>=5.0
- graphviz
- identify>=2.5.20
Expand All @@ -39,5 +39,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx_rtd_theme
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
name: all_cuda-125_arch-x86_64
23 changes: 12 additions & 11 deletions conda/recipes/librmm/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
c_compiler_version:
- 11
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

cxx_compiler_version:
- 11
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

cuda_compiler:
- cuda-nvcc
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

cuda11_compiler:
- nvcc
c_stdlib:
- sysroot

c_stdlib_version:
- "2.28"

cmake_version:
- ">=3.26.4,!=3.30.0"
Expand All @@ -17,9 +23,4 @@ fmt_version:
- ">=11.0.2,<12"

spdlog_version:
- ">=1.14.1,<1.15"

c_stdlib:
- sysroot
c_stdlib_version:
- "2.17"
- ">=1.14.1,<1.15"
bdice marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 2 additions & 8 deletions conda/recipes/librmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }} {{ cuda_version }}
- {{ compiler('cuda') }} {{ cuda_version }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}
Expand Down Expand Up @@ -57,11 +57,7 @@ outputs:
run_exports:
- {{ pin_subpackage("librmm", max_pin="x.x") }}
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}
requirements:
build:
- cmake {{ cmake_version }}
Expand All @@ -88,10 +84,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('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
{% endif %}
requirements:
Expand Down
15 changes: 8 additions & 7 deletions conda/recipes/rmm/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
c_compiler_version:
- 11
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

cxx_compiler_version:
- 11
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

cuda_compiler:
- cuda-nvcc

cuda11_compiler:
- nvcc
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
Comment on lines +10 to +11
Copy link
Contributor Author

@bdice bdice Jan 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is optional -- we could leave it as cuda11_compiler / cuda_compiler and not make the corresponding change in meta.yaml (leave {{ compiler('cuda11') }} in place).

The plus side of doing this is that it slightly simplifies the ignore_run_exports_from logic so it's no longer conditional on major versions.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this change, keeping more of the future compiler-version churn concentrated in the git blame in conda_build_config.yaml.


c_stdlib:
- sysroot

c_stdlib_version:
- "2.17"
- "2.28"

cmake_version:
- ">=3.26.4,!=3.30.0"
8 changes: 3 additions & 5 deletions conda/recipes/rmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019-2024, NVIDIA CORPORATION.
# Copyright (c) 2019-2025, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].strip().lstrip('v') %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
Expand Down Expand Up @@ -32,10 +32,8 @@ build:
- SCCACHE_S3_USE_SSL
- SCCACHE_S3_NO_CREDENTIALS
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
{% if cuda_major != "11" %}
- cuda-cudart-dev
{% endif %}
- cuda-python
Expand All @@ -47,7 +45,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }} {{ cuda_version }}
- {{ compiler('cuda') }} {{ cuda_version }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}
Expand Down
18 changes: 16 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,28 @@ dependencies:
matrices:
- matrix:
arch: x86_64
cuda: "11.*"
packages:
- gcc_linux-64=11.*
- sysroot_linux-64==2.17
- &sysroot_x86_64 sysroot_linux-64==2.28
- matrix:
arch: x86_64
cuda: "12.*"
packages:
- gcc_linux-64=13.*
- *sysroot_x86_64
- matrix:
arch: aarch64
cuda: "11.*"
packages:
- gcc_linux-aarch64=11.*
- sysroot_linux-aarch64==2.17
- &sysroot_aarch64 sysroot_linux-aarch64==2.28
- matrix:
arch: aarch64
cuda: "12.*"
packages:
- gcc_linux-aarch64=13.*
- *sysroot_aarch64
- output_types: conda
matrices:
- matrix:
Expand Down
Loading