Skip to content

Commit 549f77b

Browse files
bdicebdice
authored
Use GCC 13 in CUDA 12 conda builds. (#1513)
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: - Jake Awe (https://github.com/AyodeAwe) - James Lamb (https://github.com/jameslamb) URL: #1513
1 parent dbdc75d commit 549f77b

9 files changed

+80
-46
lines changed

‎conda/environments/all_cuda-118_arch-x86_64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ dependencies:
4949
- shapely
5050
- sphinx
5151
- sqlite
52-
- sysroot_linux-64==2.17
52+
- sysroot_linux-64==2.28
5353
name: all_cuda-118_arch-x86_64

‎conda/environments/all_cuda-125_arch-x86_64.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
- cxx-compiler
2323
- cython>=3.0.0
2424
- doxygen
25-
- gcc_linux-64=11.*
25+
- gcc_linux-64=13.*
2626
- geopandas>=1.0.0
2727
- ipython
2828
- ipywidgets
@@ -51,5 +51,5 @@ dependencies:
5151
- shapely
5252
- sphinx
5353
- sqlite
54-
- sysroot_linux-64==2.17
54+
- sysroot_linux-64==2.28
5555
name: all_cuda-125_arch-x86_64

‎conda/recipes/cuproj/conda_build_config.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
c_compiler_version:
2-
- 11
2+
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
3+
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
34

45
cxx_compiler_version:
5-
- 11
6+
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
7+
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
68

79
cuda_compiler:
8-
- cuda-nvcc
9-
10-
cuda11_compiler:
11-
- nvcc
10+
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
11+
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
1212

1313
c_stdlib:
1414
- sysroot
1515

1616
c_stdlib_version:
17-
- "2.17"
17+
- "2.28"
1818

1919
cmake_version:
2020
- ">=3.26.4,!=3.30.0"

‎conda/recipes/cuproj/meta.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
1+
# Copyright (c) 2018-2025, NVIDIA CORPORATION.
22

33
{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
44
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
@@ -34,10 +34,8 @@ build:
3434
- SCCACHE_S3_USE_SSL
3535
- SCCACHE_S3_NO_CREDENTIALS
3636
ignore_run_exports_from:
37-
{% if cuda_major == "11" %}
38-
- {{ compiler('cuda11') }}
39-
{% else %}
4037
- {{ compiler('cuda') }}
38+
{% if cuda_major != "11" %}
4139
- cuda-cudart-dev
4240
{% endif %}
4341

@@ -46,7 +44,7 @@ requirements:
4644
- {{ compiler('c') }}
4745
- {{ compiler('cxx') }}
4846
{% if cuda_major == "11" %}
49-
- {{ compiler('cuda11') }} ={{ cuda_version }}
47+
- {{ compiler('cuda') }} ={{ cuda_version }}
5048
{% else %}
5149
- {{ compiler('cuda') }}
5250
{% endif %}

‎conda/recipes/cuspatial/conda_build_config.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
c_compiler_version:
2-
- 11
2+
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
3+
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
34

45
cxx_compiler_version:
5-
- 11
6+
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
7+
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
68

79
cuda_compiler:
8-
- cuda-nvcc
9-
10-
cuda11_compiler:
11-
- nvcc
10+
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
11+
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
1212

1313
c_stdlib:
1414
- sysroot
1515

1616
c_stdlib_version:
17-
- "2.17"
17+
- "2.28"
1818

1919
cmake_version:
2020
- ">=3.26.4,!=3.30.0"

‎conda/recipes/cuspatial/meta.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
1+
# Copyright (c) 2018-2025, NVIDIA CORPORATION.
22

33
{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
44
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
@@ -34,10 +34,8 @@ build:
3434
- SCCACHE_S3_USE_SSL
3535
- SCCACHE_S3_NO_CREDENTIALS
3636
ignore_run_exports_from:
37-
{% if cuda_major == "11" %}
38-
- {{ compiler('cuda11') }}
39-
{% else %}
4037
- {{ compiler('cuda') }}
38+
{% if cuda_major != "11" %}
4139
- cuda-cudart-dev
4240
{% endif %}
4341

@@ -46,7 +44,7 @@ requirements:
4644
- {{ compiler('c') }}
4745
- {{ compiler('cxx') }}
4846
{% if cuda_major == "11" %}
49-
- {{ compiler('cuda11') }} ={{ cuda_version }}
47+
- {{ compiler('cuda') }} ={{ cuda_version }}
5048
{% else %}
5149
- {{ compiler('cuda') }}
5250
{% endif %}

‎conda/recipes/libcuspatial/conda_build_config.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
c_compiler_version:
2-
- 11
2+
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
3+
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
34

45
cxx_compiler_version:
5-
- 11
6+
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
7+
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
68

79
cuda_compiler:
8-
- cuda-nvcc
9-
10-
cuda11_compiler:
11-
- nvcc
10+
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
11+
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
1212

1313
cmake_version:
1414
- ">=3.26.4,!=3.30.0"
@@ -20,4 +20,4 @@ c_stdlib:
2020
- sysroot
2121

2222
c_stdlib_version:
23-
- "2.17"
23+
- "2.28"

‎conda/recipes/libcuspatial/meta.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
1+
# Copyright (c) 2018-2025, NVIDIA CORPORATION.
22

33
{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
44
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
@@ -35,7 +35,7 @@ requirements:
3535
- {{ compiler('c') }}
3636
- {{ compiler('cxx') }}
3737
{% if cuda_major == "11" %}
38-
- {{ compiler('cuda11') }} ={{ cuda_version }}
38+
- {{ compiler('cuda') }} ={{ cuda_version }}
3939
{% else %}
4040
- {{ compiler('cuda') }}
4141
{% endif %}
@@ -61,10 +61,8 @@ outputs:
6161
run_exports:
6262
- {{ pin_subpackage("libcuspatial", max_pin="x.x") }}
6363
ignore_run_exports_from:
64-
{% if cuda_major == "11" %}
65-
- {{ compiler('cuda11') }}
66-
{% else %}
6764
- {{ compiler('cuda') }}
65+
{% if cuda_major != "11" %}
6866
- cuda-cudart-dev
6967
{% endif %}
7068
requirements:
@@ -103,10 +101,8 @@ outputs:
103101
number: {{ GIT_DESCRIBE_NUMBER }}
104102
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
105103
ignore_run_exports_from:
106-
{% if cuda_major == "11" %}
107-
- {{ compiler('cuda11') }}
108-
{% else %}
109104
- {{ compiler('cuda') }}
105+
{% if cuda_major != "11" %}
110106
- cuda-cudart-dev
111107
{% endif %}
112108
requirements:

‎dependencies.yaml

+46-4
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,28 @@ dependencies:
187187
matrices:
188188
- matrix:
189189
arch: x86_64
190+
cuda: "11.8"
191+
packages:
192+
- &gcc_amd64_cuda11 gcc_linux-64=11.*
193+
- &sysroot_amd64 sysroot_linux-64==2.28
194+
- matrix:
195+
arch: aarch64
196+
cuda: "11.8"
197+
packages:
198+
- &gcc_aarch64_cuda11 gcc_linux-aarch64=11.*
199+
- &sysroot_aarch64 sysroot_linux-aarch64==2.28
200+
- matrix:
201+
arch: x86_64
202+
cuda: "12.*"
190203
packages:
191-
- &gcc_amd64 gcc_linux-64=11.*
192-
- &sysroot_amd64 sysroot_linux-64==2.17
204+
- &gcc_amd64 gcc_linux-64=13.*
205+
- *sysroot_amd64
193206
- matrix:
194207
arch: aarch64
208+
cuda: "12.*"
195209
packages:
196-
- &gcc_aarch64 gcc_linux-aarch64=11.*
197-
- &sysroot_aarch64 sysroot_linux-aarch64==2.17
210+
- &gcc_aarch64 gcc_linux-aarch64=13.*
211+
- *sysroot_aarch64
198212
- output_types: conda
199213
matrices:
200214
- matrix:
@@ -228,11 +242,25 @@ dependencies:
228242
matrices:
229243
- matrix:
230244
arch: x86_64
245+
cuda: "11.8"
246+
packages:
247+
- *gcc_amd64_cuda11
248+
- *sysroot_amd64
249+
- matrix:
250+
arch: aarch64
251+
cuda: "11.8"
252+
packages:
253+
- *gcc_aarch64_cuda11
254+
- *sysroot_aarch64
255+
- matrix:
256+
arch: x86_64
257+
cuda: "12.*"
231258
packages:
232259
- *gcc_amd64
233260
- *sysroot_amd64
234261
- matrix:
235262
arch: aarch64
263+
cuda: "12.*"
236264
packages:
237265
- *gcc_aarch64
238266
- *sysroot_aarch64
@@ -262,11 +290,25 @@ dependencies:
262290
matrices:
263291
- matrix:
264292
arch: x86_64
293+
cuda: "11.8"
294+
packages:
295+
- *gcc_amd64_cuda11
296+
- *sysroot_amd64
297+
- matrix:
298+
arch: aarch64
299+
cuda: "11.8"
300+
packages:
301+
- *gcc_aarch64_cuda11
302+
- *sysroot_aarch64
303+
- matrix:
304+
arch: x86_64
305+
cuda: "12.*"
265306
packages:
266307
- *gcc_amd64
267308
- *sysroot_amd64
268309
- matrix:
269310
arch: aarch64
311+
cuda: "12.*"
270312
packages:
271313
- *gcc_aarch64
272314
- *sysroot_aarch64

0 commit comments

Comments
 (0)