Skip to content

Commit eef737b

Browse files
raydouglassraydouglass
authored
Merge pull request #529 from rapidsai/branch-24.02
[RELEASE] rapids-cmake v24.02
2 parents 3b5f6bb + e8d2cbc commit eef737b

File tree

104 files changed

+3777
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3777
-256
lines changed

‎.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
upload-conda:
3838
needs: [cpp-build]
3939
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.12
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.02
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
docs-build:
4747
if: github.ref_type == 'branch'
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-23.12
49+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02
5050
with:
5151
arch: "amd64"
5252
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ jobs:
1717
- conda-cpp-tests
1818
- docs-build
1919
secrets: inherit
20-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-23.12
20+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02
2121
checks:
2222
secrets: inherit
23-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-23.12
23+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02
2424
conda-cpp-build:
2525
needs: checks
2626
secrets: inherit
27-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
27+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02
2828
with:
2929
build_type: pull-request
3030
conda-cpp-tests:
3131
needs: conda-cpp-build
3232
secrets: inherit
33-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
33+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02
3434
with:
3535
build_type: pull-request
3636
docs-build:
3737
needs: conda-cpp-build
3838
secrets: inherit
39-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-23.12
39+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02
4040
with:
4141
build_type: pull-request
4242
node_type: "cpu4"

‎.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
cpp-tests:
1818
secrets: inherit
19-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}

‎CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
1+
# rapids-cmake 24.02.00 (12 Feb 2024)
2+
3+
## 🚨 Breaking Changes
4+
5+
- Drop Pascal architecture (60). ([#482](https://github.com/rapidsai/rapids-cmake/pull/482)) [@bdice](https://github.com/bdice)
6+
7+
## 🐛 Bug Fixes
8+
9+
- Error out if generate_ctest_json fails to build or run ([#533](https://github.com/rapidsai/rapids-cmake/pull/533)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
10+
- rapids_cpm_cccl now works as expected when given `DOWNLOAD_ONLY ON` ([#527](https://github.com/rapidsai/rapids-cmake/pull/527)) [@robertmaynard](https://github.com/robertmaynard)
11+
- Always download repos when they are being patched ([#525](https://github.com/rapidsai/rapids-cmake/pull/525)) [@vyasr](https://github.com/vyasr)
12+
- Mark all cccl and cuco kernels with hidden visibility ([#523](https://github.com/rapidsai/rapids-cmake/pull/523)) [@robertmaynard](https://github.com/robertmaynard)
13+
- Fix message context ([#520](https://github.com/rapidsai/rapids-cmake/pull/520)) [@vyasr](https://github.com/vyasr)
14+
- Generate template copyright year at build time. ([#325) (#519](https://github.com/rapidsai/rapids-cmake/pull/325) (#519)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
15+
- Add link libraries to generate_resource_spec cmake ([#516](https://github.com/rapidsai/rapids-cmake/pull/516)) [@davidwendt](https://github.com/davidwendt)
16+
- rapids_cpm_cccl preserve install location details from first invocation. ([#513](https://github.com/rapidsai/rapids-cmake/pull/513)) [@robertmaynard](https://github.com/robertmaynard)
17+
- Only apply install rules for CCCL if we actually downloaded ([#507](https://github.com/rapidsai/rapids-cmake/pull/507)) [@bdice](https://github.com/bdice)
18+
- Mark flaky test as serial ([#506](https://github.com/rapidsai/rapids-cmake/pull/506)) [@vyasr](https://github.com/vyasr)
19+
- Manually invoke install rules for components ([#505](https://github.com/rapidsai/rapids-cmake/pull/505)) [@vyasr](https://github.com/vyasr)
20+
- multiple entry overrides now sets FetchContent for all entries ([#494](https://github.com/rapidsai/rapids-cmake/pull/494)) [@robertmaynard](https://github.com/robertmaynard)
21+
- Remove deprecated function usages ([#484](https://github.com/rapidsai/rapids-cmake/pull/484)) [@robertmaynard](https://github.com/robertmaynard)
22+
23+
## 📖 Documentation
24+
25+
- Fix docs references to API sections. ([#509](https://github.com/rapidsai/rapids-cmake/pull/509)) [@bdice](https://github.com/bdice)
26+
- fix typo in README ([#501](https://github.com/rapidsai/rapids-cmake/pull/501)) [@jameslamb](https://github.com/jameslamb)
27+
- Fix indentation typo ([#497](https://github.com/rapidsai/rapids-cmake/pull/497)) [@vyasr](https://github.com/vyasr)
28+
29+
## 🚀 New Features
30+
31+
- rapids cpm patches now support differences in white space. ([#515](https://github.com/rapidsai/rapids-cmake/pull/515)) [@robertmaynard](https://github.com/robertmaynard)
32+
- Upgrade nvCOMP to 3.0.5 ([#498](https://github.com/rapidsai/rapids-cmake/pull/498)) [@davidwendt](https://github.com/davidwendt)
33+
- Move to latest nvbench which has nvml+static support ([#488](https://github.com/rapidsai/rapids-cmake/pull/488)) [@robertmaynard](https://github.com/robertmaynard)
34+
- Update to spdlog 1.12 and fmt 10.1.1 ([#473](https://github.com/rapidsai/rapids-cmake/pull/473)) [@kkraus14](https://github.com/kkraus14)
35+
- Support scikit-build-core ([#433](https://github.com/rapidsai/rapids-cmake/pull/433)) [@vyasr](https://github.com/vyasr)
36+
37+
## 🛠️ Improvements
38+
39+
- Remove usages of rapids-env-update ([#524](https://github.com/rapidsai/rapids-cmake/pull/524)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
40+
- refactor CUDA versions in dependencies.yaml ([#517](https://github.com/rapidsai/rapids-cmake/pull/517)) [@jameslamb](https://github.com/jameslamb)
41+
- Remove scikit-build from dependency list ([#512](https://github.com/rapidsai/rapids-cmake/pull/512)) [@vyasr](https://github.com/vyasr)
42+
- Add patch reverting CCCL PR 211. ([#511](https://github.com/rapidsai/rapids-cmake/pull/511)) [@bdice](https://github.com/bdice)
43+
- Update cuCollections for CCCL 2.2.0 support. ([#510](https://github.com/rapidsai/rapids-cmake/pull/510)) [@bdice](https://github.com/bdice)
44+
- Disable NVBench CUPTI support by default. ([#504](https://github.com/rapidsai/rapids-cmake/pull/504)) [@bdice](https://github.com/bdice)
45+
- Remove CCCL::Thrust from GLOBAL_TARGETS. ([#500](https://github.com/rapidsai/rapids-cmake/pull/500)) [@bdice](https://github.com/bdice)
46+
- Add missing nvcomp targets ([#496](https://github.com/rapidsai/rapids-cmake/pull/496)) [@vyasr](https://github.com/vyasr)
47+
- Add rapids_cpm_cccl feature. ([#495](https://github.com/rapidsai/rapids-cmake/pull/495)) [@bdice](https://github.com/bdice)
48+
- Drop Pascal architecture (60). ([#482](https://github.com/rapidsai/rapids-cmake/pull/482)) [@bdice](https://github.com/bdice)
49+
150
# rapids-cmake 23.12.00 (6 Dec 2023)
251

352
## 🚨 Breaking Changes

‎RAPIDS.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Allow users to control which version is used
2121
if(NOT rapids-cmake-version)
2222
# Define a default version if the user doesn't set one
23-
set(rapids-cmake-version 23.12)
23+
set(rapids-cmake-version 24.02)
2424
endif()
2525

2626
# Allow users to control which GitHub repo is fetched

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ The `rapids-cmake` module contains helpful general CMake functionality
6666
### cpm
6767

6868
The `rapids-cpm` module contains CPM functionality to allow projects to acquire dependencies consistently.
69-
For consistentcy All targets brought in via `rapids-cpm` are GLOBAL targets.
69+
For consistency, all targets brought in via `rapids-cpm` are GLOBAL targets.
7070

7171
- `rapids_cpm_init()` handles initialization of the CPM module.
72-
- `raipds_cpm_find(<project> name BUILD_EXPORT_SET <name> INSTALL_EXPORT_SET <name>)` Will search for a module and fall back to installing via CPM. Offers support to track dependencies for easy package exporting
72+
- `rapids_cpm_find(<project> name BUILD_EXPORT_SET <name> INSTALL_EXPORT_SET <name>)` Will search for a module and fall back to installing via CPM. Offers support to track dependencies for easy package exporting
7373

7474
### cuda
7575

‎ci/build_cpp.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
#!/bin/bash
2-
# Copyright (c) 2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2023-2024, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

6-
source rapids-env-update
6+
rapids-configure-conda-channels
7+
8+
source rapids-configure-sccache
9+
10+
source rapids-date-string
711

812
export CMAKE_GENERATOR=Ninja
913

‎ci/build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ conda activate docs
1616

1717
rapids-print-env
1818

19-
export RAPIDS_VERSION_NUMBER="23.12"
19+
export RAPIDS_VERSION_NUMBER="24.02"
2020
export RAPIDS_DOCS_DIR="$(mktemp -d)"
2121

2222
rapids-logger "Build Sphinx docs"

‎cmake-format-rapids-cmake.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@
8888
}
8989
},
9090

91+
"rapids_cpm_cccl": {
92+
"pargs": {
93+
"nargs": 0
94+
},
95+
"kwargs": {
96+
"BUILD_EXPORT_SET": 1,
97+
"INSTALL_EXPORT_SET": 1
98+
}
99+
},
91100
"rapids_cpm_cuco": {
92101
"pargs": {
93102
"nargs": 0

‎conda/recipes/rapids_core_dependencies/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2022, NVIDIA CORPORATION.
2+
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@ include(${rapids-cmake-dir}/cpm/init.cmake)
2323
rapids_cpm_init()
2424

2525
# Download all source packages
26-
include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)
27-
include(${rapids-cmake-dir}/cpm/thrust.cmake)
26+
include(${rapids-cmake-dir}/cpm/cccl.cmake)
2827
set(CPM_DOWNLOAD_ALL "ON")
29-
rapids_cpm_libcudacxx(INSTALL_EXPORT_SET rapids-dependencies)
30-
rapids_cpm_thrust(NAMESPACE temp INSTALL_EXPORT_SET rapids-dependencies)
28+
rapids_cpm_cccl(NAMESPACE temp INSTALL_EXPORT_SET rapids-dependencies)

‎dependencies.yaml

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ files:
44
output: none
55
includes:
66
- build
7-
- cudatoolkit
7+
- cuda
8+
- cuda_version
89
- docs
910
- py_version
1011
- test
@@ -17,7 +18,7 @@ files:
1718
docs:
1819
output: none
1920
includes:
20-
- cudatoolkit
21+
- cuda_version
2122
- docs
2223
channels:
2324
- rapidsai
@@ -35,6 +36,30 @@ dependencies:
3536
- cxx-compiler
3637
- make
3738
specific:
39+
- output_types: conda
40+
matrices:
41+
- matrix:
42+
cuda: "11.[245]"
43+
packages:
44+
- gcc<11.0.0
45+
- matrix:
46+
cuda: "11.[68]"
47+
packages:
48+
- gcc<12.0.0
49+
- matrix:
50+
cuda: "12.*"
51+
packages:
52+
- gcc<13.0.0
53+
- output_types: conda
54+
matrices:
55+
- matrix:
56+
arch: x86_64
57+
packages:
58+
- sysroot_linux-64==2.17
59+
- matrix:
60+
arch: aarch64
61+
packages:
62+
- sysroot_linux-aarch64==2.17
3863
- output_types: conda
3964
matrices:
4065
- matrix:
@@ -80,54 +105,47 @@ dependencies:
80105
- matrix:
81106
cuda: "12.0"
82107
packages:
83-
- cuda-version=12.0
84108
- cuda-nvcc
85-
cudatoolkit:
109+
cuda_version:
86110
specific:
87111
- output_types: conda
88112
matrices:
89113
- matrix:
90114
cuda: "11.2"
91115
packages:
92116
- cuda-version=11.2
93-
- cudatoolkit
94-
- gcc<11.0.0
95-
- sysroot_linux-64==2.17
96117
- matrix:
97118
cuda: "11.4"
98119
packages:
99120
- cuda-version=11.4
100-
- cudatoolkit
101-
- gcc<11.0.0
102-
- sysroot_linux-64==2.17
103121
- matrix:
104122
cuda: "11.5"
105123
packages:
106124
- cuda-version=11.5
107-
- cudatoolkit
108-
- gcc<11.0.0
109-
- sysroot_linux-64==2.17
110125
- matrix:
111126
cuda: "11.6"
112127
packages:
113128
- cuda-version=11.6
114-
- cudatoolkit
115-
- gcc<12.0.0
116-
- sysroot_linux-64==2.17
117129
- matrix:
118130
cuda: "11.8"
119131
packages:
120132
- cuda-version=11.8
121-
- cudatoolkit
122-
- gcc<12.0.0
123-
- sysroot_linux-64==2.17
124133
- matrix:
125134
cuda: "12.0"
126135
packages:
127136
- cuda-version=12.0
137+
cuda:
138+
specific:
139+
- output_types: conda
140+
matrices:
141+
- matrix:
142+
cuda: "11.*"
143+
packages:
144+
- cudatoolkit
145+
- matrix:
146+
cuda: "12.*"
147+
packages:
128148
- cuda-cupti-dev
129-
- gcc<13.0.0
130-
- sysroot_linux-64==2.17
131149
docs:
132150
common:
133151
- output_types: [conda]
@@ -143,7 +161,6 @@ dependencies:
143161
- output_types: [conda, requirements]
144162
packages:
145163
- cython>=0.29,<0.30
146-
- scikit-build>=0.13.1
147164
- libpng
148165
- zlib
149166
- output_types: [conda]

‎docs/api.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ tracking of these dependencies for correct export support.
3535
/command/rapids_cpm_find
3636
/command/rapids_cpm_package_override
3737

38+
.. _`cpm_pre-configured_packages`:
39+
3840
CPM Pre-Configured Packages
3941
***************************
4042

@@ -48,6 +50,7 @@ package uses :ref:`can be found here. <cpm_versions>`
4850
.. toctree::
4951
:titlesonly:
5052

53+
/packages/rapids_cpm_cccl
5154
/packages/rapids_cpm_cuco
5255
/packages/rapids_cpm_fmt
5356
/packages/rapids_cpm_gbench
@@ -64,6 +67,28 @@ package uses :ref:`can be found here. <cpm_versions>`
6467
Cython
6568
******
6669

70+
The `rapids-cython-core` module allows projects to easily build cython modules using
71+
`scikit-build-core <https://scikit-build-core.readthedocs.io/en/latest/>`_.
72+
73+
.. note::
74+
Use of rapids-cython-core requires scikit-build-core. The behavior of the functions provided by
75+
this component is undefined if they are invoked outside of a build managed by scikit-build-core.
76+
77+
.. toctree::
78+
:titlesonly:
79+
80+
/command/rapids_cython_core_init
81+
/command/rapids_cython_core_create_modules
82+
/command/rapids_cython_core_add_rpath_entries
83+
84+
.. _`cython_legacy`:
85+
86+
Cython (legacy)
87+
***************
88+
89+
.. note::
90+
`rapids-cython` is deprecated. Please switch to `rapids-cython-core`.
91+
6792
The `rapids_cython` functions allow projects to easily build cython modules using
6893
`scikit-build <https://scikit-build.readthedocs.io/en/latest/>`_.
6994

0 commit comments

Comments
 (0)