Skip to content

Commit 6293b70

Browse files
bdicebdice
authored
Use GCC 13 in CUDA 12 conda builds. (rapidsai#17721)
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) - Vukasin Milovanovic (https://github.com/vuule) - https://github.com/jakirkham Approvers: - James Lamb (https://github.com/jameslamb) - https://github.com/jakirkham - David Wendt (https://github.com/davidwendt) URL: rapidsai#17721
1 parent 67b9913 commit 6293b70

File tree

12 files changed

+61
-65
lines changed

12 files changed

+61
-65
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ dependencies:
9494
- sphinx>=8.1.0
9595
- sphinxcontrib-websupport
9696
- streamz
97-
- sysroot_linux-64==2.17
97+
- sysroot_linux-64==2.28
9898
- typing_extensions>=4.0.0
9999
- zlib>=1.2.13
100100
name: all_cuda-118_arch-x86_64

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies:
3434
- flatbuffers==24.3.25
3535
- fmt>=11.0.2,<12
3636
- fsspec>=0.6.0
37-
- gcc_linux-64=11.*
37+
- gcc_linux-64=13.*
3838
- hypothesis
3939
- identify>=2.5.20
4040
- ipython
@@ -93,7 +93,7 @@ dependencies:
9393
- sphinx>=8.1.0
9494
- sphinxcontrib-websupport
9595
- streamz
96-
- sysroot_linux-64==2.17
96+
- sysroot_linux-64==2.28
9797
- tokenizers==0.15.2
9898
- transformers==4.39.3
9999
- typing_extensions>=4.0.0

‎conda/recipes/cudf/conda_build_config.yaml

Lines changed: 7 additions & 7 deletions
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
c_stdlib:
810
- sysroot
911

1012
c_stdlib_version:
11-
- "2.17"
13+
- "2.28"
1214

1315
cmake_version:
1416
- ">=3.26.4,!=3.30.0"
1517

1618
cuda_compiler:
17-
- cuda-nvcc
18-
19-
cuda11_compiler:
20-
- nvcc
19+
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
20+
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

‎conda/recipes/cudf/meta.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ build:
3737
# libcudf's run_exports pinning is looser than we would like
3838
- libcudf
3939
ignore_run_exports_from:
40-
{% if cuda_major == "11" %}
41-
- {{ compiler('cuda11') }}
42-
{% else %}
4340
- {{ compiler('cuda') }}
41+
{% if cuda_major != "11" %}
4442
- cuda-cudart-dev
4543
- libcufile-dev # [linux64]
4644
{% endif %}
@@ -52,7 +50,7 @@ requirements:
5250
- {{ compiler('c') }}
5351
- {{ compiler('cxx') }}
5452
{% if cuda_major == "11" %}
55-
- {{ compiler('cuda11') }} ={{ cuda_version }}
53+
- {{ compiler('cuda') }} ={{ cuda_version }}
5654
{% else %}
5755
- {{ compiler('cuda') }}
5856
{% endif %}

‎conda/recipes/cudf_kafka/conda_build_config.yaml

Lines changed: 7 additions & 7 deletions
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
c_stdlib:
810
- sysroot
911

1012
c_stdlib_version:
11-
- "2.17"
13+
- "2.28"
1214

1315
cmake_version:
1416
- ">=3.26.4,!=3.30.0"
1517

1618
cuda_compiler:
17-
- cuda-nvcc
18-
19-
cuda11_compiler:
20-
- nvcc
19+
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
20+
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

‎conda/recipes/cudf_kafka/meta.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020-2024, NVIDIA CORPORATION.
1+
# Copyright (c) 2020-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

@@ -48,7 +46,7 @@ requirements:
4846
- {{ compiler('c') }}
4947
- {{ compiler('cxx') }}
5048
{% if cuda_major == "11" %}
51-
- {{ compiler('cuda11') }} ={{ cuda_version }}
49+
- {{ compiler('cuda') }} ={{ cuda_version }}
5250
{% else %}
5351
- {{ compiler('cuda') }}
5452
{% endif %}

‎conda/recipes/libcudf/conda_build_config.yaml

Lines changed: 7 additions & 7 deletions
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/libcudf/meta.yaml

Lines changed: 5 additions & 17 deletions
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] %}
@@ -37,7 +37,7 @@ requirements:
3737
- {{ compiler('c') }}
3838
- {{ compiler('cxx') }}
3939
{% if cuda_major == "11" %}
40-
- {{ compiler('cuda11') }} ={{ cuda_version }}
40+
- {{ compiler('cuda') }} ={{ cuda_version }}
4141
{% else %}
4242
- {{ compiler('cuda') }}
4343
{% endif %}
@@ -80,11 +80,7 @@ outputs:
8080
run_exports:
8181
- {{ pin_subpackage("libcudf", max_pin="x.x") }}
8282
ignore_run_exports_from:
83-
{% if cuda_major == "11" %}
84-
- {{ compiler('cuda11') }}
85-
{% else %}
8683
- {{ compiler('cuda') }}
87-
{% endif %}
8884
requirements:
8985
build:
9086
- cmake {{ cmake_version }}
@@ -120,11 +116,7 @@ outputs:
120116
number: {{ GIT_DESCRIBE_NUMBER }}
121117
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
122118
ignore_run_exports_from:
123-
{% if cuda_major == "11" %}
124-
- {{ compiler('cuda11') }}
125-
{% else %}
126119
- {{ compiler('cuda') }}
127-
{% endif %}
128120
requirements:
129121
build:
130122
- cmake {{ cmake_version }}
@@ -150,10 +142,8 @@ outputs:
150142
number: {{ GIT_DESCRIBE_NUMBER }}
151143
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
152144
ignore_run_exports_from:
153-
{% if cuda_major == "11" %}
154-
- {{ compiler('cuda11') }}
155-
{% else %}
156145
- {{ compiler('cuda') }}
146+
{% if cuda_major != "11" %}
157147
- cuda-nvtx-dev
158148
{% endif %}
159149
requirements:
@@ -162,7 +152,7 @@ outputs:
162152
- {{ compiler('c') }}
163153
- {{ compiler('cxx') }}
164154
{% if cuda_major == "11" %}
165-
- {{ compiler('cuda11') }} ={{ cuda_version }}
155+
- {{ compiler('cuda') }} ={{ cuda_version }}
166156
{% else %}
167157
- {{ compiler('cuda') }}
168158
{% endif %}
@@ -196,10 +186,8 @@ outputs:
196186
number: {{ GIT_DESCRIBE_NUMBER }}
197187
string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
198188
ignore_run_exports_from:
199-
{% if cuda_major == "11" %}
200-
- {{ compiler('cuda11') }}
201-
{% else %}
202189
- {{ compiler('cuda') }}
190+
{% if cuda_major != "11" %}
203191
- libcurand-dev
204192
{% endif %}
205193
requirements:

‎conda/recipes/pylibcudf/conda_build_config.yaml

Lines changed: 7 additions & 7 deletions
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
c_stdlib:
810
- sysroot
911

1012
c_stdlib_version:
11-
- "2.17"
13+
- "2.28"
1214

1315
cmake_version:
1416
- ">=3.26.4,!=3.30.0"
1517

1618
cuda_compiler:
17-
- cuda-nvcc
18-
19-
cuda11_compiler:
20-
- nvcc
19+
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
20+
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

‎conda/recipes/pylibcudf/meta.yaml

Lines changed: 3 additions & 5 deletions
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] %}
@@ -37,10 +37,8 @@ build:
3737
# libcudf's run_exports pinning is looser than we would like
3838
- libcudf
3939
ignore_run_exports_from:
40-
{% if cuda_major == "11" %}
41-
- {{ compiler('cuda11') }}
42-
{% else %}
4340
- {{ compiler('cuda') }}
41+
{% if cuda_major != "11" %}
4442
- cuda-cudart-dev
4543
- libcufile-dev # [linux64]
4644
{% endif %}
@@ -52,7 +50,7 @@ requirements:
5250
- {{ compiler('c') }}
5351
- {{ compiler('cxx') }}
5452
{% if cuda_major == "11" %}
55-
- {{ compiler('cuda11') }} ={{ cuda_version }}
53+
- {{ compiler('cuda') }} ={{ cuda_version }}
5654
{% else %}
5755
- {{ compiler('cuda') }}
5856
{% endif %}

‎cpp/src/io/orc/writer_impl.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ size_t RLE_stream_size(TypeKind kind, size_t count)
509509
case TypeKind::DOUBLE:
510510
return div_rounding_up_unsafe(count, gpu::encode_block_size) *
511511
(gpu::encode_block_size * max_varint_size<int64_t>() + 2);
512-
default: CUDF_FAIL("Unsupported ORC type for RLE stream size");
512+
default: CUDF_FAIL("Unsupported ORC type for RLE stream size: " + std::to_string(kind));
513513
}
514514
}
515515

‎dependencies.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,14 +382,28 @@ dependencies:
382382
matrices:
383383
- matrix:
384384
arch: x86_64
385+
cuda: "11.8"
385386
packages:
386387
- gcc_linux-64=11.*
387-
- sysroot_linux-64==2.17
388+
- sysroot_linux-64==2.28
388389
- matrix:
389390
arch: aarch64
391+
cuda: "11.8"
390392
packages:
391393
- gcc_linux-aarch64=11.*
392-
- sysroot_linux-aarch64==2.17
394+
- sysroot_linux-aarch64==2.28
395+
- matrix:
396+
arch: x86_64
397+
cuda: "12.*"
398+
packages:
399+
- gcc_linux-64=13.*
400+
- sysroot_linux-64==2.28
401+
- matrix:
402+
arch: aarch64
403+
cuda: "12.*"
404+
packages:
405+
- gcc_linux-aarch64=13.*
406+
- sysroot_linux-aarch64==2.28
393407
- output_types: conda
394408
matrices:
395409
- matrix:

0 commit comments

Comments
 (0)