From f5e37e838f4436a4c49b16aec096b41f3e955040 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 17 Jan 2025 14:12:44 -0600 Subject: [PATCH] Use GCC 13 in CUDA 12 conda builds. (#741) 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 https://github.com/rapidsai/build-planning/issues/129 for details. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - James Lamb (https://github.com/jameslamb) URL: https://github.com/rapidsai/rapids-cmake/pull/741 --- .../rapids_core_dependencies/conda_build_config.yaml | 11 +++++------ conda/recipes/rapids_core_dependencies/meta.yaml | 8 ++------ dependencies.yaml | 10 +++++++--- 3 files changed, 14 insertions(+), 15 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..b7fface3 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]) %} @@ -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 %} diff --git a/dependencies.yaml b/dependencies.yaml index a4f93750..bca12849 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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: