Skip to content

Commit

Permalink
Use GCC 13 in CUDA 12 conda builds. (#741)
Browse files Browse the repository at this point in the history
conda-forge is using GCC 13 for CUDA 12 builds. This PR updates CUDA 12 conda builds to use GCC 13, for alignment.

These PRs should be merged in a specific order, see rapidsai/build-planning#129 for details.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: #741
  • Loading branch information
bdice authored Jan 17, 2025
1 parent af4fe43 commit f5e37e8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
11 changes: 5 additions & 6 deletions conda/recipes/rapids_core_dependencies/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
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")]

cmake_version:
- ">=3.26.4"
Expand All @@ -14,4 +13,4 @@ c_stdlib:
- sysroot

c_stdlib_version:
- "2.17"
- "2.28"
8 changes: 2 additions & 6 deletions conda/recipes/rapids_core_dependencies/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
# Copyright (c) 2022-2025, NVIDIA CORPORATION.

{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
Expand All @@ -16,18 +16,14 @@ build:
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') }}
{% endif %}

requirements:
build:
- cmake {{ cmake_version }}
- {{ compiler('cxx') }}
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }} ={{ cuda_version }}
- {{ compiler('cuda') }} ={{ cuda_version }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}
Expand Down
10 changes: 7 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,23 @@ dependencies:
packages:
- gcc<12.0.0
- matrix:
cuda: "12.*"
cuda: "12.[0123]"
packages:
- gcc<13.0.0
- matrix:
cuda: "12.*"
packages:
- gcc<14.0.0
- output_types: conda
matrices:
- matrix:
arch: x86_64
packages:
- sysroot_linux-64==2.17
- sysroot_linux-64==2.28
- matrix:
arch: aarch64
packages:
- sysroot_linux-aarch64==2.17
- sysroot_linux-aarch64==2.28
- output_types: conda
matrices:
- matrix:
Expand Down

0 comments on commit f5e37e8

Please sign in to comment.