From 87c7296bbbfd2900474de35ccc80618356a85899 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 23 Dec 2024 15:15:10 -0600 Subject: [PATCH 1/6] Use GCC 13 in CUDA 12 builds. --- conda/recipes/librmm/conda_build_config.yaml | 22 +++++++++----------- conda/recipes/librmm/meta.yaml | 10 ++------- conda/recipes/rmm/conda_build_config.yaml | 11 +++++----- conda/recipes/rmm/meta.yaml | 6 ++---- 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index b4791745f..53c3f547f 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -1,25 +1,23 @@ c_compiler_version: - - 11 + - 13 + - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cxx_compiler_version: - - 11 + - 13 + - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cuda_compiler: - cuda-nvcc + - nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] -cuda11_compiler: - - nvcc +c_stdlib: + - sysroot + +c_stdlib_version: + - "2.17" cmake_version: - ">=3.26.4,!=3.30.0" fmt_version: - ">=11.0.2,<12" - -spdlog_version: - - ">=1.14.1,<1.15" - -c_stdlib: - - sysroot -c_stdlib_version: - - "2.17" diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 31aaf0e63..35ede1a96 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -18,7 +18,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} {% if cuda_major == "11" %} - - {{ compiler('cuda11') }} {{ cuda_version }} + - {{ compiler('cuda') }} {{ cuda_version }} {% else %} - {{ compiler('cuda') }} {% endif %} @@ -62,11 +62,7 @@ outputs: run_exports: - {{ pin_subpackage("librmm", max_pin="x.x") }} ignore_run_exports_from: - {% if cuda_major == "11" %} - - {{ compiler('cuda11') }} - {% else %} - {{ compiler('cuda') }} - {% endif %} requirements: build: - cmake {{ cmake_version }} @@ -93,10 +89,8 @@ outputs: 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') }} + {% if cuda_major != "11" %} - cuda-cudart-dev {% endif %} requirements: diff --git a/conda/recipes/rmm/conda_build_config.yaml b/conda/recipes/rmm/conda_build_config.yaml index 68947bade..63ac1e918 100644 --- a/conda/recipes/rmm/conda_build_config.yaml +++ b/conda/recipes/rmm/conda_build_config.yaml @@ -1,17 +1,18 @@ c_compiler_version: - - 11 + - 13 + - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cxx_compiler_version: - - 11 + - 13 + - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cuda_compiler: - cuda-nvcc - -cuda11_compiler: - - nvcc + - nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] c_stdlib: - sysroot + c_stdlib_version: - "2.17" diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 206a80c46..f1f4f0b2b 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -32,10 +32,8 @@ build: - SCCACHE_S3_USE_SSL - SCCACHE_S3_NO_CREDENTIALS ignore_run_exports_from: - {% if cuda_major == "11" %} - - {{ compiler('cuda11') }} - {% else %} - {{ compiler('cuda') }} + {% if cuda_major != "11" %} - cuda-cudart-dev {% endif %} - cuda-python @@ -47,7 +45,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} {% if cuda_major == "11" %} - - {{ compiler('cuda11') }} {{ cuda_version }} + - {{ compiler('cuda') }} {{ cuda_version }} {% else %} - {{ compiler('cuda') }} {% endif %} From 72e6ad102b813f95c12362253e1ffc692e351052 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 23 Dec 2024 15:29:29 -0600 Subject: [PATCH 2/6] Fix conditionals. --- conda/recipes/librmm/conda_build_config.yaml | 6 +++--- conda/recipes/rmm/conda_build_config.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 53c3f547f..cc83fcd2b 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -1,13 +1,13 @@ c_compiler_version: - - 13 + - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cxx_compiler_version: - - 13 + - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cuda_compiler: - - cuda-nvcc + - cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] c_stdlib: diff --git a/conda/recipes/rmm/conda_build_config.yaml b/conda/recipes/rmm/conda_build_config.yaml index 63ac1e918..22e6e30f1 100644 --- a/conda/recipes/rmm/conda_build_config.yaml +++ b/conda/recipes/rmm/conda_build_config.yaml @@ -1,13 +1,13 @@ c_compiler_version: - - 13 + - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cxx_compiler_version: - - 13 + - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] cuda_compiler: - - cuda-nvcc + - cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] c_stdlib: From a0013e13ba99394ae1bc48d8861455645fbb1d66 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 3 Jan 2025 13:47:33 -0600 Subject: [PATCH 3/6] Update dependencies.yaml. --- .../environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/librmm/meta.yaml | 2 +- conda/recipes/rmm/meta.yaml | 2 +- dependencies.yaml | 18 ++++++++++++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 0d0659215..7daf93c5a 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -17,7 +17,7 @@ dependencies: - cython>=3.0.0 - doxygen=1.9.1 - fmt>=11.0.2,<12 -- gcc_linux-64=11.* +- gcc_linux-64>=11,<14 - gcovr>=5.0 - graphviz - identify>=2.5.20 diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 35ede1a96..2b5353ccd 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2024, NVIDIA CORPORATION. +# Copyright (c) 2018-2025, NVIDIA CORPORATION. {% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index f1f4f0b2b..03d5cd758 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2024, NVIDIA CORPORATION. +# Copyright (c) 2019-2025, NVIDIA CORPORATION. {% set version = environ['RAPIDS_PACKAGE_VERSION'].strip().lstrip('v') %} {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} diff --git a/dependencies.yaml b/dependencies.yaml index 7f94f3f6e..89d688dbe 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -117,14 +117,28 @@ dependencies: matrices: - matrix: arch: x86_64 + cuda: "11.*" packages: - gcc_linux-64=11.* - - sysroot_linux-64==2.17 + - &sysroot_x86_64 sysroot_linux-64==2.17 + - matrix: + arch: x86_64 + cuda: "12.*" + packages: + - gcc_linux-64>=11,<14 + - *sysroot_x86_64 - matrix: arch: aarch64 + cuda: "11.*" packages: - gcc_linux-aarch64=11.* - - sysroot_linux-aarch64==2.17 + - &sysroot_aarch64 sysroot_linux-aarch64==2.17 + - matrix: + arch: aarch64 + cuda: "12.*" + packages: + - gcc_linux-aarch64>=11,<14 + - *sysroot_aarch64 - output_types: conda matrices: - matrix: From a6bd58bbd8df89fcefb439a5a5a0ada017e54ca6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 13 Jan 2025 11:03:47 -0600 Subject: [PATCH 4/6] Use sysroot 2.28 and pin to gcc 13.*. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 4 ++-- conda/recipes/librmm/conda_build_config.yaml | 2 +- conda/recipes/rmm/conda_build_config.yaml | 2 +- dependencies.yaml | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index b885e77cf..069c36254 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -39,5 +39,5 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sphinx_rtd_theme -- sysroot_linux-64==2.17 +- sysroot_linux-64==2.28 name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 7daf93c5a..5ffd68ff2 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -17,7 +17,7 @@ dependencies: - cython>=3.0.0 - doxygen=1.9.1 - fmt>=11.0.2,<12 -- gcc_linux-64>=11,<14 +- gcc_linux-64=13.* - gcovr>=5.0 - graphviz - identify>=2.5.20 @@ -38,5 +38,5 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sphinx_rtd_theme -- sysroot_linux-64==2.17 +- sysroot_linux-64==2.28 name: all_cuda-125_arch-x86_64 diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index cc83fcd2b..425750cf9 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -14,7 +14,7 @@ c_stdlib: - sysroot c_stdlib_version: - - "2.17" + - "2.28" cmake_version: - ">=3.26.4,!=3.30.0" diff --git a/conda/recipes/rmm/conda_build_config.yaml b/conda/recipes/rmm/conda_build_config.yaml index 22e6e30f1..83f5ebcb1 100644 --- a/conda/recipes/rmm/conda_build_config.yaml +++ b/conda/recipes/rmm/conda_build_config.yaml @@ -14,7 +14,7 @@ c_stdlib: - sysroot c_stdlib_version: - - "2.17" + - "2.28" cmake_version: - ">=3.26.4,!=3.30.0" diff --git a/dependencies.yaml b/dependencies.yaml index 89d688dbe..90417538d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -120,24 +120,24 @@ dependencies: cuda: "11.*" packages: - gcc_linux-64=11.* - - &sysroot_x86_64 sysroot_linux-64==2.17 + - &sysroot_x86_64 sysroot_linux-64==2.28 - matrix: arch: x86_64 cuda: "12.*" packages: - - gcc_linux-64>=11,<14 + - gcc_linux-64=13.* - *sysroot_x86_64 - matrix: arch: aarch64 cuda: "11.*" packages: - gcc_linux-aarch64=11.* - - &sysroot_aarch64 sysroot_linux-aarch64==2.17 + - &sysroot_aarch64 sysroot_linux-aarch64==2.28 - matrix: arch: aarch64 cuda: "12.*" packages: - - gcc_linux-aarch64>=11,<14 + - gcc_linux-aarch64=13.* - *sysroot_aarch64 - output_types: conda matrices: From b984c929c0074883db42cb166daf38aeb444a26b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 13 Jan 2025 14:29:00 -0600 Subject: [PATCH 5/6] Add spdlog back. --- conda/recipes/librmm/conda_build_config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 425750cf9..1399141a1 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -21,3 +21,6 @@ cmake_version: fmt_version: - ">=11.0.2,<12" + +spdlog_version: + - ">=1.14.1,<1.15" From 8a6a84d966d2a507705f262e153dc6fd718ceb36 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 13 Jan 2025 15:20:50 -0600 Subject: [PATCH 6/6] Fix spacing --- conda/recipes/librmm/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 1399141a1..2980a8d5c 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -23,4 +23,4 @@ fmt_version: - ">=11.0.2,<12" spdlog_version: - - ">=1.14.1,<1.15" + - ">=1.14.1,<1.15"