From fcaad02277f2dbb933bf038bacd8e73600113e1b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 13 Jan 2025 10:01:09 -0600 Subject: [PATCH 1/3] Use GCC 13 in CUDA 12 conda builds. --- .../rapids_core_dependencies/conda_build_config.yaml | 11 +++++------ conda/recipes/rapids_core_dependencies/meta.yaml | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/conda/recipes/rapids_core_dependencies/conda_build_config.yaml b/conda/recipes/rapids_core_dependencies/conda_build_config.yaml index 304a0b3d..89980ad3 100644 --- a/conda/recipes/rapids_core_dependencies/conda_build_config.yaml +++ b/conda/recipes/rapids_core_dependencies/conda_build_config.yaml @@ -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" @@ -14,4 +13,4 @@ c_stdlib: - sysroot c_stdlib_version: - - "2.17" + - "2.28" diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index be59652b..f5080cf0 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -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]) %} @@ -17,7 +17,7 @@ build: string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} ignore_run_exports_from: {% if cuda_major == "11" %} - - {{ compiler('cuda11') }} + - {{ compiler('cuda') }} {% else %} - {{ compiler('cuda') }} {% endif %} @@ -27,7 +27,7 @@ requirements: - cmake {{ cmake_version }} - {{ compiler('cxx') }} {% if cuda_major == "11" %} - - {{ compiler('cuda11') }} ={{ cuda_version }} + - {{ compiler('cuda') }} ={{ cuda_version }} {% else %} - {{ compiler('cuda') }} {% endif %} From e2b401b08ea35153fe410d448da02ae0462c3ea4 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 13 Jan 2025 13:47:25 -0600 Subject: [PATCH 2/3] Manual changes. --- conda/recipes/rapids_core_dependencies/meta.yaml | 4 ---- dependencies.yaml | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index f5080cf0..b7fface3 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -16,11 +16,7 @@ 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('cuda') }} - {% else %} - {{ compiler('cuda') }} - {% endif %} requirements: build: diff --git a/dependencies.yaml b/dependencies.yaml index a4f93750..6892706f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -49,17 +49,17 @@ dependencies: - matrix: cuda: "12.*" packages: - - gcc<13.0.0 + - 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: From cde11d829f3516e8570f218057e14a721286a842 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 13 Jan 2025 16:58:52 -0600 Subject: [PATCH 3/3] Use gcc 12 on CUDA 12.0 through 12.3. --- dependencies.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index 6892706f..bca12849 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -46,6 +46,10 @@ dependencies: cuda: "11.[68]" packages: - gcc<12.0.0 + - matrix: + cuda: "12.[0123]" + packages: + - gcc<13.0.0 - matrix: cuda: "12.*" packages: