From fe98d35297c3dea5c8dc8e387f38e930d656975b Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 8 Feb 2024 13:58:38 -0500 Subject: [PATCH 1/7] Add rapids_cuda_set_runtime to default includes of cuda (#538) The `rapids_cuda_set_runtime` is now part of the functions you get when including `rapids-cuda.cmake` Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/rapids-cmake/pull/538 --- rapids-cmake/rapids-cuda.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rapids-cmake/rapids-cuda.cmake b/rapids-cmake/rapids-cuda.cmake index 69690cac..e49b4de6 100644 --- a/rapids-cmake/rapids-cuda.cmake +++ b/rapids-cmake/rapids-cuda.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,3 +18,4 @@ include_guard(GLOBAL) include(${CMAKE_CURRENT_LIST_DIR}/cuda/init_architectures.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cuda/init_runtime.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cuda/set_architectures.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/cuda/set_runtime.cmake) From e521af02ad0dc23f40c4938c40f35a65cc6a9ed1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 9 Feb 2024 16:14:42 -0600 Subject: [PATCH 2/7] Support CUDA 12.2 (#521) * switches to CUDA 12.2.2 for building conda packages and wheels * adds new tests running against CUDA 12.2.2 * adds a `"12.*"` glob in `dependencies.yaml` missed in #517 ### Notes for Reviewers This is part of ongoing work to build and test packages against CUDA 12.2.2 across all of RAPIDS. For more details see: * https://github.com/rapidsai/build-planning/issues/7 * https://github.com/rapidsai/shared-workflows/pull/166 Planning a second round of PRs to revert these references back to a proper `branch-24.{nn}` release branch of `shared-workflows` once https://github.com/rapidsai/shared-workflows/pull/166 is merged. *(created with `rapids-reviser`)* Authors: - James Lamb (https://github.com/jameslamb) - Bradley Dice (https://github.com/bdice) Approvers: - Bradley Dice (https://github.com/bdice) - Jake Awe (https://github.com/AyodeAwe) URL: https://github.com/rapidsai/rapids-cmake/pull/521 --- .github/workflows/build.yaml | 6 +++--- .github/workflows/pr.yaml | 10 +++++----- .github/workflows/test.yaml | 2 +- conda/recipes/rapids_core_dependencies/meta.yaml | 4 +++- dependencies.yaml | 6 +++++- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b6ec6184..d70cf432 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: cpp-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: upload-conda: needs: [cpp-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@test-cuda-12.2 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -46,7 +46,7 @@ jobs: docs-build: if: github.ref_type == 'branch' secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: arch: "amd64" branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 533f1978..369c8942 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,26 +17,26 @@ jobs: - conda-cpp-tests - docs-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@test-cuda-12.2 checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@test-cuda-12.2 conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 with: build_type: pull-request conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2 with: build_type: pull-request docs-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 with: build_type: pull-request node_type: "cpu4" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8a01dd8b..b0c898ea 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: cpp-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2 with: build_type: nightly branch: ${{ inputs.branch }} diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index efa54215..9e8efa00 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, 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]) %} @@ -18,6 +18,8 @@ build: ignore_run_exports_from: {% if cuda_major == "11" %} - {{ compiler('cuda11') }} + {% else %} + - {{ compiler('cuda') }} {% endif %} requirements: diff --git a/dependencies.yaml b/dependencies.yaml index b8ae43d9..376b8e2d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -103,7 +103,7 @@ dependencies: packages: - nvcc_linux-aarch64=11.8 - matrix: - cuda: "12.0" + cuda: "12.*" packages: - cuda-nvcc cuda_version: @@ -134,6 +134,10 @@ dependencies: cuda: "12.0" packages: - cuda-version=12.0 + - matrix: + cuda: "12.2" + packages: + - cuda-version=12.2 cuda: specific: - output_types: conda From e8d2cbcb1561ae05e0fbeba62d51e443b76e5aa9 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Mon, 12 Feb 2024 15:45:09 -0500 Subject: [PATCH 3/7] Update Changelog [skip ci] --- CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7fe9cc5..c5fabf2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,52 @@ +# rapids-cmake 24.02.00 (12 Feb 2024) + +## 🚨 Breaking Changes + +- Drop Pascal architecture (60). ([#482](https://github.com/rapidsai/rapids-cmake/pull/482)) [@bdice](https://github.com/bdice) + +## 🐛 Bug Fixes + +- 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) +- 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) +- Always download repos when they are being patched ([#525](https://github.com/rapidsai/rapids-cmake/pull/525)) [@vyasr](https://github.com/vyasr) +- Mark all cccl and cuco kernels with hidden visibility ([#523](https://github.com/rapidsai/rapids-cmake/pull/523)) [@robertmaynard](https://github.com/robertmaynard) +- Fix message context ([#520](https://github.com/rapidsai/rapids-cmake/pull/520)) [@vyasr](https://github.com/vyasr) +- Generate template copyright year at build time. ([#325) (#519](https://github.com/rapidsai/rapids-cmake/pull/325) (#519)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA) +- Add link libraries to generate_resource_spec cmake ([#516](https://github.com/rapidsai/rapids-cmake/pull/516)) [@davidwendt](https://github.com/davidwendt) +- rapids_cpm_cccl preserve install location details from first invocation. ([#513](https://github.com/rapidsai/rapids-cmake/pull/513)) [@robertmaynard](https://github.com/robertmaynard) +- Only apply install rules for CCCL if we actually downloaded ([#507](https://github.com/rapidsai/rapids-cmake/pull/507)) [@bdice](https://github.com/bdice) +- Mark flaky test as serial ([#506](https://github.com/rapidsai/rapids-cmake/pull/506)) [@vyasr](https://github.com/vyasr) +- Manually invoke install rules for components ([#505](https://github.com/rapidsai/rapids-cmake/pull/505)) [@vyasr](https://github.com/vyasr) +- multiple entry overrides now sets FetchContent for all entries ([#494](https://github.com/rapidsai/rapids-cmake/pull/494)) [@robertmaynard](https://github.com/robertmaynard) +- Remove deprecated function usages ([#484](https://github.com/rapidsai/rapids-cmake/pull/484)) [@robertmaynard](https://github.com/robertmaynard) + +## 📖 Documentation + +- Fix docs references to API sections. ([#509](https://github.com/rapidsai/rapids-cmake/pull/509)) [@bdice](https://github.com/bdice) +- fix typo in README ([#501](https://github.com/rapidsai/rapids-cmake/pull/501)) [@jameslamb](https://github.com/jameslamb) +- Fix indentation typo ([#497](https://github.com/rapidsai/rapids-cmake/pull/497)) [@vyasr](https://github.com/vyasr) + +## 🚀 New Features + +- rapids cpm patches now support differences in white space. ([#515](https://github.com/rapidsai/rapids-cmake/pull/515)) [@robertmaynard](https://github.com/robertmaynard) +- Upgrade nvCOMP to 3.0.5 ([#498](https://github.com/rapidsai/rapids-cmake/pull/498)) [@davidwendt](https://github.com/davidwendt) +- Move to latest nvbench which has nvml+static support ([#488](https://github.com/rapidsai/rapids-cmake/pull/488)) [@robertmaynard](https://github.com/robertmaynard) +- Update to spdlog 1.12 and fmt 10.1.1 ([#473](https://github.com/rapidsai/rapids-cmake/pull/473)) [@kkraus14](https://github.com/kkraus14) +- Support scikit-build-core ([#433](https://github.com/rapidsai/rapids-cmake/pull/433)) [@vyasr](https://github.com/vyasr) + +## 🛠️ Improvements + +- Remove usages of rapids-env-update ([#524](https://github.com/rapidsai/rapids-cmake/pull/524)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA) +- refactor CUDA versions in dependencies.yaml ([#517](https://github.com/rapidsai/rapids-cmake/pull/517)) [@jameslamb](https://github.com/jameslamb) +- Remove scikit-build from dependency list ([#512](https://github.com/rapidsai/rapids-cmake/pull/512)) [@vyasr](https://github.com/vyasr) +- Add patch reverting CCCL PR 211. ([#511](https://github.com/rapidsai/rapids-cmake/pull/511)) [@bdice](https://github.com/bdice) +- Update cuCollections for CCCL 2.2.0 support. ([#510](https://github.com/rapidsai/rapids-cmake/pull/510)) [@bdice](https://github.com/bdice) +- Disable NVBench CUPTI support by default. ([#504](https://github.com/rapidsai/rapids-cmake/pull/504)) [@bdice](https://github.com/bdice) +- Remove CCCL::Thrust from GLOBAL_TARGETS. ([#500](https://github.com/rapidsai/rapids-cmake/pull/500)) [@bdice](https://github.com/bdice) +- Add missing nvcomp targets ([#496](https://github.com/rapidsai/rapids-cmake/pull/496)) [@vyasr](https://github.com/vyasr) +- Add rapids_cpm_cccl feature. ([#495](https://github.com/rapidsai/rapids-cmake/pull/495)) [@bdice](https://github.com/bdice) +- Drop Pascal architecture (60). ([#482](https://github.com/rapidsai/rapids-cmake/pull/482)) [@bdice](https://github.com/bdice) + # rapids-cmake 23.12.00 (6 Dec 2023) ## 🚨 Breaking Changes From e3d1dfcfca958c6dc15e5a5df991638746bc7f07 Mon Sep 17 00:00:00 2001 From: Yunsong Wang Date: Thu, 15 Feb 2024 09:00:16 -0800 Subject: [PATCH 4/7] Fetch the latest cuco and remove outdated patches (#526) This PR bumps to the latest cuco version which removes experimental namespace and includes multiple bug fixes. CI must pass on these PRs before we can merge this change: - [ ] https://github.com/rapidsai/cudf/pull/14849 - [ ] https://github.com/rapidsai/cugraph/pull/4111 - [ ] https://github.com/rapidsai/raft/pull/2118 Authors: - Yunsong Wang (https://github.com/PointKernel) - Robert Maynard (https://github.com/robertmaynard) Approvers: - Robert Maynard (https://github.com/robertmaynard) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/rapids-cmake/pull/526 --- .../cpm/patches/cuco/hide_kernels.diff | 558 ------------------ rapids-cmake/cpm/versions.json | 9 +- 2 files changed, 1 insertion(+), 566 deletions(-) delete mode 100644 rapids-cmake/cpm/patches/cuco/hide_kernels.diff diff --git a/rapids-cmake/cpm/patches/cuco/hide_kernels.diff b/rapids-cmake/cpm/patches/cuco/hide_kernels.diff deleted file mode 100644 index 22550b5f..00000000 --- a/rapids-cmake/cpm/patches/cuco/hide_kernels.diff +++ /dev/null @@ -1,558 +0,0 @@ -From 1ca31344345febc116c1eeaa553af8d2821d128c Mon Sep 17 00:00:00 2001 -From: Robert Maynard -Date: Thu, 11 Jan 2024 12:11:45 -0500 -Subject: [PATCH] Mark all cuco kernels as static so they have hidden - visibility - ---- - include/cuco/detail/dynamic_map_kernels.cuh | 20 +++++++++++------- - .../cuco/detail/open_addressing/kernels.cuh | 14 +++++++------ - include/cuco/detail/static_map/kernels.cuh | 6 ++++-- - include/cuco/detail/static_map_kernels.cuh | 21 ++++++++++--------- - .../cuco/detail/static_multimap/kernels.cuh | 18 +++++++++------- - include/cuco/detail/static_set/kernels.cuh | 4 ++-- - include/cuco/detail/storage/kernels.cuh | 4 +++- - .../detail/trie/dynamic_bitset/kernels.cuh | 19 +++++++++-------- - include/cuco/detail/utility/cuda.cuh | 19 +++++++++++++++++ - 9 files changed, 79 insertions(+), 46 deletions(-) - -diff --git a/include/cuco/detail/dynamic_map_kernels.cuh b/include/cuco/detail/dynamic_map_kernels.cuh -index 566576e..228aa2c 100644 ---- a/include/cuco/detail/dynamic_map_kernels.cuh -+++ b/include/cuco/detail/dynamic_map_kernels.cuh -@@ -14,6 +14,7 @@ - * limitations under the License. - */ - #pragma once -+#include - - #include - -@@ -25,6 +26,8 @@ namespace cuco { - namespace detail { - namespace cg = cooperative_groups; - -+CUCO_SUPPRESS_KERNEL_WARNINGS -+ - /** - * @brief Inserts all key/value pairs in the range `[first, last)`. - * -@@ -62,7 +65,7 @@ template --__global__ void insert(InputIt first, -+CUCO_KERNEL void insert(InputIt first, - InputIt last, - viewT* submap_views, - mutableViewT* submap_mutable_views, -@@ -147,7 +150,7 @@ template --__global__ void insert(InputIt first, -+CUCO_KERNEL void insert(InputIt first, - InputIt last, - viewT* submap_views, - mutableViewT* submap_mutable_views, -@@ -225,7 +228,7 @@ template --__global__ void erase(InputIt first, -+CUCO_KERNEL void erase(InputIt first, - InputIt last, - mutableViewT* submap_mutable_views, - atomicT** submap_num_successes, -@@ -296,7 +299,7 @@ template --__global__ void erase(InputIt first, -+CUCO_KERNEL void erase(InputIt first, - InputIt last, - mutableViewT* submap_mutable_views, - atomicT** submap_num_successes, -@@ -368,7 +371,7 @@ template --__global__ void find(InputIt first, -+CUCO_KERNEL void find(InputIt first, - InputIt last, - OutputIt output_begin, - viewT* submap_views, -@@ -443,7 +446,7 @@ template --__global__ void find(InputIt first, -+CUCO_KERNEL void find(InputIt first, - InputIt last, - OutputIt output_begin, - viewT* submap_views, -@@ -514,7 +517,7 @@ template --__global__ void contains(InputIt first, -+CUCO_KERNEL void contains(InputIt first, - InputIt last, - OutputIt output_begin, - viewT* submap_views, -@@ -582,7 +585,7 @@ template --__global__ void contains(InputIt first, -+CUCO_KERNEL void contains(InputIt first, - InputIt last, - OutputIt output_begin, - viewT* submap_views, -@@ -618,5 +621,6 @@ __global__ void contains(InputIt first, - key_idx += (gridDim.x * blockDim.x) / tile_size; - } - } -+ - } // namespace detail - } // namespace cuco -diff --git a/include/cuco/detail/open_addressing/kernels.cuh b/include/cuco/detail/open_addressing/kernels.cuh -index 51200b6..12463b9 100644 ---- a/include/cuco/detail/open_addressing/kernels.cuh -+++ b/include/cuco/detail/open_addressing/kernels.cuh -@@ -29,6 +29,8 @@ namespace cuco { - namespace experimental { - namespace detail { - -+CUCO_SUPPRESS_KERNEL_WARNINGS -+ - /** - * @brief Inserts all elements in the range `[first, first + n)` and returns the number of - * successful insertions if `pred` of the corresponding stencil returns true. -@@ -62,7 +64,7 @@ template --__global__ void insert_if_n(InputIt first, -+CUCO_KERNEL void insert_if_n(InputIt first, - cuco::detail::index_type n, - StencilIt stencil, - Predicate pred, -@@ -128,7 +130,7 @@ template --__global__ void insert_if_n( -+CUCO_KERNEL void insert_if_n( - InputIt first, cuco::detail::index_type n, StencilIt stencil, Predicate pred, Ref ref) - { - auto const loop_stride = cuco::detail::grid_stride() / CGSize; -@@ -163,7 +165,7 @@ __global__ void insert_if_n( - * @param ref Non-owning container device ref used to access the slot storage - */ - template --__global__ void erase(InputIt first, cuco::detail::index_type n, Ref ref) -+CUCO_KERNEL void erase(InputIt first, cuco::detail::index_type n, Ref ref) - { - auto const loop_stride = cuco::detail::grid_stride() / CGSize; - auto idx = cuco::detail::global_thread_id() / CGSize; -@@ -213,7 +215,7 @@ template --__global__ void contains_if_n(InputIt first, -+CUCO_KERNEL void contains_if_n(InputIt first, - cuco::detail::index_type n, - StencilIt stencil, - Predicate pred, -@@ -268,7 +270,7 @@ __global__ void contains_if_n(InputIt first, - * @param count Number of filled slots - */ - template --__global__ void size(StorageRef storage, Predicate is_filled, AtomicT* count) -+CUCO_KERNEL void size(StorageRef storage, Predicate is_filled, AtomicT* count) - { - using size_type = typename StorageRef::size_type; - -@@ -294,7 +296,7 @@ __global__ void size(StorageRef storage, Predicate is_filled, AtomicT* count) - } - - template --__global__ void rehash(typename ContainerRef::storage_ref_type storage_ref, -+CUCO_KERNEL void rehash(typename ContainerRef::storage_ref_type storage_ref, - ContainerRef container_ref, - Predicate is_filled) - { -diff --git a/include/cuco/detail/static_map/kernels.cuh b/include/cuco/detail/static_map/kernels.cuh -index f9171ef..4e9bfe1 100644 ---- a/include/cuco/detail/static_map/kernels.cuh -+++ b/include/cuco/detail/static_map/kernels.cuh -@@ -30,6 +30,8 @@ namespace experimental { - namespace static_map_ns { - namespace detail { - -+CUCO_SUPPRESS_KERNEL_WARNINGS -+ - /** - * @brief For any key-value pair `{k, v}` in the range `[first, first + n)`, if a key equivalent to - * `k` already exists in the container, assigns `v` to the mapped_type corresponding to the key `k`. -@@ -49,7 +51,7 @@ namespace detail { - * @param ref Non-owning container device ref used to access the slot storage - */ - template --__global__ void insert_or_assign(InputIt first, cuco::detail::index_type n, Ref ref) -+CUCO_KERNEL void insert_or_assign(InputIt first, cuco::detail::index_type n, Ref ref) - { - auto const loop_stride = cuco::detail::grid_stride() / CGSize; - auto idx = cuco::detail::global_thread_id() / CGSize; -@@ -88,7 +90,7 @@ __global__ void insert_or_assign(InputIt first, cuco::detail::index_type n, Ref - * @param ref Non-owning map device ref used to access the slot storage - */ - template --__global__ void find(InputIt first, cuco::detail::index_type n, OutputIt output_begin, Ref ref) -+CUCO_KERNEL void find(InputIt first, cuco::detail::index_type n, OutputIt output_begin, Ref ref) - { - namespace cg = cooperative_groups; - -diff --git a/include/cuco/detail/static_map_kernels.cuh b/include/cuco/detail/static_map_kernels.cuh -index 73c2299..33bec4a 100644 ---- a/include/cuco/detail/static_map_kernels.cuh -+++ b/include/cuco/detail/static_map_kernels.cuh -@@ -25,6 +25,7 @@ namespace cuco { - namespace detail { - namespace cg = cooperative_groups; - -+CUCO_SUPPRESS_KERNEL_WARNINGS - /** - * @brief Initializes each slot in the flat `slots` storage to contain `k` and `v`. - * -@@ -48,7 +49,7 @@ template --__global__ void initialize(pair_atomic_type* const slots, Key k, Value v, int64_t size) -+CUCO_KERNEL void initialize(pair_atomic_type* const slots, Key k, Value v, int64_t size) - { - int64_t const loop_stride = gridDim.x * block_size; - int64_t idx = block_size * blockIdx.x + threadIdx.x; -@@ -86,7 +87,7 @@ template --__global__ void insert( -+CUCO_KERNEL void insert( - InputIt first, int64_t n, atomicT* num_successes, viewT view, Hash hash, KeyEqual key_equal) - { - typedef cub::BlockReduce BlockReduce; -@@ -141,7 +142,7 @@ template --__global__ void insert( -+CUCO_KERNEL void insert( - InputIt first, int64_t n, atomicT* num_successes, viewT view, Hash hash, KeyEqual key_equal) - { - typedef cub::BlockReduce BlockReduce; -@@ -195,7 +196,7 @@ template --__global__ void erase( -+CUCO_KERNEL void erase( - InputIt first, int64_t n, atomicT* num_successes, viewT view, Hash hash, KeyEqual key_equal) - { - using BlockReduce = cub::BlockReduce; -@@ -248,7 +249,7 @@ template --__global__ void erase( -+CUCO_KERNEL void erase( - InputIt first, int64_t n, atomicT* num_successes, viewT view, Hash hash, KeyEqual key_equal) - { - typedef cub::BlockReduce BlockReduce; -@@ -312,7 +313,7 @@ template --__global__ void insert_if_n(InputIt first, -+CUCO_KERNEL void insert_if_n(InputIt first, - int64_t n, - atomicT* num_successes, - viewT view, -@@ -376,7 +377,7 @@ template --__global__ void find( -+CUCO_KERNEL void find( - InputIt first, int64_t n, OutputIt output_begin, viewT view, Hash hash, KeyEqual key_equal) - { - int64_t const loop_stride = gridDim.x * block_size; -@@ -438,7 +439,7 @@ template --__global__ void find( -+CUCO_KERNEL void find( - InputIt first, int64_t n, OutputIt output_begin, viewT view, Hash hash, KeyEqual key_equal) - { - auto tile = cg::tiled_partition(cg::this_thread_block()); -@@ -495,7 +496,7 @@ template --__global__ void contains( -+CUCO_KERNEL void contains( - InputIt first, int64_t n, OutputIt output_begin, viewT view, Hash hash, KeyEqual key_equal) - { - int64_t const loop_stride = gridDim.x * block_size; -@@ -552,7 +553,7 @@ template --__global__ void contains( -+CUCO_KERNEL void contains( - InputIt first, int64_t n, OutputIt output_begin, viewT view, Hash hash, KeyEqual key_equal) - { - auto tile = cg::tiled_partition(cg::this_thread_block()); -diff --git a/include/cuco/detail/static_multimap/kernels.cuh b/include/cuco/detail/static_multimap/kernels.cuh -index 67fb360..f21fbe9 100644 ---- a/include/cuco/detail/static_multimap/kernels.cuh -+++ b/include/cuco/detail/static_multimap/kernels.cuh -@@ -15,6 +15,7 @@ - */ - #pragma once - -+#include - #include - - #include -@@ -29,6 +30,7 @@ namespace cuco { - namespace detail { - namespace cg = cooperative_groups; - -+CUCO_SUPPRESS_KERNEL_WARNINGS - /** - * @brief Initializes each slot in the flat `slots` storage to contain `k` and `v`. - * -@@ -51,7 +53,7 @@ template --__global__ void initialize(pair_atomic_type* const slots, Key k, Value v, int64_t size) -+CUCO_KERNEL void initialize(pair_atomic_type* const slots, Key k, Value v, int64_t size) - { - int64_t const loop_stride = gridDim.x * blockDim.x; - int64_t idx = threadIdx.x + blockIdx.x * blockDim.x; -@@ -82,7 +84,7 @@ __global__ void initialize(pair_atomic_type* const slots, Key k, Value v, int64_ - * @param view Mutable device view used to access the hash map's slot storage - */ - template --__global__ void insert(InputIt first, int64_t n, viewT view) -+CUCO_KERNEL void insert(InputIt first, int64_t n, viewT view) - { - auto tile = cg::tiled_partition(cg::this_thread_block()); - int64_t const loop_stride = gridDim.x * block_size / tile_size; -@@ -130,7 +132,7 @@ template --__global__ void insert_if_n(InputIt first, StencilIt s, int64_t n, viewT view, Predicate pred) -+CUCO_KERNEL void insert_if_n(InputIt first, StencilIt s, int64_t n, viewT view, Predicate pred) - { - auto tile = cg::tiled_partition(cg::this_thread_block()); - int64_t const loop_stride = gridDim.x * block_size / tile_size; -@@ -177,7 +179,7 @@ template --__global__ void contains(InputIt first, int64_t n, OutputIt output_begin, viewT view, Equal equal) -+CUCO_KERNEL void contains(InputIt first, int64_t n, OutputIt output_begin, viewT view, Equal equal) - { - auto tile = cg::tiled_partition(cg::this_thread_block()); - int64_t const loop_stride = gridDim.x * block_size / tile_size; -@@ -235,7 +237,7 @@ template --__global__ void count( -+CUCO_KERNEL void count( - InputIt first, int64_t n, atomicT* num_matches, viewT view, KeyEqual key_equal) - { - auto tile = cg::tiled_partition(cg::this_thread_block()); -@@ -294,7 +296,7 @@ template --__global__ void pair_count( -+CUCO_KERNEL void pair_count( - InputIt first, int64_t n, atomicT* num_matches, viewT view, PairEqual pair_equal) - { - auto tile = cg::tiled_partition(cg::this_thread_block()); -@@ -363,7 +365,7 @@ template --__global__ void retrieve(InputIt first, -+CUCO_KERNEL void retrieve(InputIt first, - int64_t n, - OutputIt output_begin, - atomicT* num_matches, -@@ -476,7 +478,7 @@ template --__global__ void pair_retrieve(InputIt first, -+CUCO_KERNEL void pair_retrieve(InputIt first, - int64_t n, - OutputIt1 probe_output_begin, - OutputIt2 contained_output_begin, -diff --git a/include/cuco/detail/static_set/kernels.cuh b/include/cuco/detail/static_set/kernels.cuh -index 15d725f..537b7ce 100644 ---- a/include/cuco/detail/static_set/kernels.cuh -+++ b/include/cuco/detail/static_set/kernels.cuh -@@ -30,7 +30,7 @@ namespace cuco { - namespace experimental { - namespace static_set_ns { - namespace detail { -- -+CUCO_SUPPRESS_KERNEL_WARNINGS - /** - * @brief Finds the equivalent set elements of all keys in the range `[first, last)`. - * -@@ -51,7 +51,7 @@ namespace detail { - * @param ref Non-owning set device ref used to access the slot storage - */ - template --__global__ void find(InputIt first, cuco::detail::index_type n, OutputIt output_begin, Ref ref) -+CUCO_KERNEL void find(InputIt first, cuco::detail::index_type n, OutputIt output_begin, Ref ref) - { - namespace cg = cooperative_groups; - -diff --git a/include/cuco/detail/storage/kernels.cuh b/include/cuco/detail/storage/kernels.cuh -index 2a5868f..56951a6 100644 ---- a/include/cuco/detail/storage/kernels.cuh -+++ b/include/cuco/detail/storage/kernels.cuh -@@ -23,6 +23,8 @@ namespace cuco { - namespace experimental { - namespace detail { - -+CUCO_SUPPRESS_KERNEL_WARNINGS -+ - /** - * @brief Initializes each slot in the window storage to contain `value`. - * -@@ -33,7 +35,7 @@ namespace detail { - * @param value Value to which all values in `slots` are initialized - */ - template --__global__ void initialize(WindowT* windows, -+CUCO_KERNEL void initialize(WindowT* windows, - cuco::detail::index_type n, - typename WindowT::value_type value) - { -diff --git a/include/cuco/detail/trie/dynamic_bitset/kernels.cuh b/include/cuco/detail/trie/dynamic_bitset/kernels.cuh -index c92ab60..1756015 100644 ---- a/include/cuco/detail/trie/dynamic_bitset/kernels.cuh -+++ b/include/cuco/detail/trie/dynamic_bitset/kernels.cuh -@@ -26,6 +26,7 @@ namespace cuco { - namespace experimental { - namespace detail { - -+CUCO_SUPPRESS_KERNEL_WARNINGS - /* - * @brief Test bits for a range of keys - * -@@ -41,10 +42,10 @@ namespace detail { - * @param num_keys Number of input keys - */ - template --__global__ void bitset_test_kernel(BitsetRef ref, -- KeyIt keys, -- OutputIt outputs, -- cuco::detail::index_type num_keys) -+CUCO_KERNEL void bitset_test_kernel(BitsetRef ref, -+ KeyIt keys, -+ OutputIt outputs, -+ cuco::detail::index_type num_keys) - { - auto key_id = cuco::detail::global_thread_id(); - auto const stride = cuco::detail::grid_stride(); -@@ -70,7 +71,7 @@ __global__ void bitset_test_kernel(BitsetRef ref, - * @param num_keys Number of input keys - */ - template --__global__ void bitset_rank_kernel(BitsetRef ref, -+CUCO_KERNEL void bitset_rank_kernel(BitsetRef ref, - KeyIt keys, - OutputIt outputs, - cuco::detail::index_type num_keys) -@@ -99,7 +100,7 @@ __global__ void bitset_rank_kernel(BitsetRef ref, - * @param num_keys Number of input keys - */ - template --__global__ void bitset_select_kernel(BitsetRef ref, -+CUCO_KERNEL void bitset_select_kernel(BitsetRef ref, - KeyIt keys, - OutputIt outputs, - cuco::detail::index_type num_keys) -@@ -125,7 +126,7 @@ __global__ void bitset_select_kernel(BitsetRef ref, - * @param flip_bits Boolean to request negation of words before counting bits - */ - template --__global__ void bit_counts_kernel(WordType const* words, -+CUCO_KERNEL void bit_counts_kernel(WordType const* words, - SizeType* bit_counts, - cuco::detail::index_type num_words, - bool flip_bits) -@@ -157,7 +158,7 @@ __global__ void bit_counts_kernel(WordType const* words, - * @param words_per_block Number of words in each block - */ - template --__global__ void encode_ranks_from_prefix_bit_counts(const SizeType* prefix_bit_counts, -+CUCO_KERNEL void encode_ranks_from_prefix_bit_counts(const SizeType* prefix_bit_counts, - rank* ranks, - SizeType num_words, - SizeType num_blocks, -@@ -200,7 +201,7 @@ __global__ void encode_ranks_from_prefix_bit_counts(const SizeType* prefix_bit_c - * @param bits_per_block Number of bits in each block - */ - template --__global__ void mark_blocks_with_select_entries(SizeType const* prefix_bit_counts, -+CUCO_KERNEL void mark_blocks_with_select_entries(SizeType const* prefix_bit_counts, - SizeType* select_markers, - SizeType num_blocks, - SizeType words_per_block, -diff --git a/include/cuco/detail/utility/cuda.cuh b/include/cuco/detail/utility/cuda.cuh -index 6e5f13f..d251bdf 100644 ---- a/include/cuco/detail/utility/cuda.cuh -+++ b/include/cuco/detail/utility/cuda.cuh -@@ -17,6 +17,25 @@ - - #include - -+#if defined(CUCO_DISABLE_KERNEL_VISIBILITY_WARNING_SUPPRESSION) -+# define CUCO_SUPPRESS_KERNEL_WARNINGS -+#elif defined(__NVCC__) && (defined(__GNUC__) || defined(__clang__)) -+// handle when nvcc is the CUDA compiler and gcc or clang is host -+# define CUCO_SUPPRESS_KERNEL_WARNINGS \ -+ _Pragma("nv_diag_suppress 1407") -+ _Pragma("GCC diagnostic ignored \"-Wattributes\"") -+#elif defined(__clang__) -+// handle when clang is the CUDA compiler -+# define CUCO_SUPPRESS_KERNEL_WARNINGS \ -+ _Pragma("clang diagnostic ignored \"-Wattributes\"") -+#elif defined(__NVCOMPILER) -+# define CUCO_SUPPRESS_KERNEL_WARNINGS \ -+# pragma diag_suppress attribute_requires_external_linkage -+#endif -+ -+#ifndef CUCO_KERNEL -+# define CUCO_KERNEL __attribute__ ((visibility ("hidden"))) __global__ -+#endif - namespace cuco { - namespace detail { - --- -2.43.0 diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 155aa8c7..cda2e66e 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -31,14 +31,7 @@ "version" : "0.0.1", "git_shallow" : false, "git_url" : "https://github.com/NVIDIA/cuCollections.git", - "git_tag" : "f823d30d6b08a60383266db25821074dbdbe5822", - "patches" : [ - { - "file" : "cuco/hide_kernels.diff", - "issue" : "CUCO Mark all kernels with hidden visibility [https://github.com/NVIDIA/cuCollections/pull/422]", - "fixed_in" : "" - } - ] + "git_tag" : "56c53beb6fb0cafd265b7fcc3df78ae487811b22" }, "fmt" : { "version" : "10.1.1", From fc61a9ec1ae39dc9773870988e5a84168eae4dd1 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 15 Feb 2024 15:10:49 -0500 Subject: [PATCH 5/7] Officially support env var expansion in version.json (#540) Expand rapids-cmake to support env var expansion in the git_url, git_tag, version, and binary entries. This allows rapids-cmake to support users that need to override versions.json with url info that needs secure checkout data provided by the running container. This is commonly due to cloning from a private repo that has user and password setup in the running docker container. Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/rapids-cmake/pull/540 --- docs/packages/rapids_cpm_versions.rst | 12 ++++- rapids-cmake/cpm/detail/package_details.cmake | 3 +- testing/cpm/CMakeLists.txt | 2 +- ...cpm_package_override-env-var-support.cmake | 52 +++++++++++++++++++ 4 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 testing/cpm/cpm_package_override-env-var-support.cmake diff --git a/docs/packages/rapids_cpm_versions.rst b/docs/packages/rapids_cpm_versions.rst index 3fdb1fed..d07b2172 100644 --- a/docs/packages/rapids_cpm_versions.rst +++ b/docs/packages/rapids_cpm_versions.rst @@ -32,7 +32,8 @@ as needed. copy of the project. Supports the following placeholders: - - ``${rapids-cmake-version}`` will be evulated to 'major.minor' of the current rapids-cmake cal-ver value. + - ``${rapids-cmake-version}`` will be evaluated to 'major.minor' of the current rapids-cmake cal-ver value. + - ``$ENV{variable}`` will be evaluated to the contents of the listed environment variable ``git_url`` @@ -40,6 +41,11 @@ as needed. project locally by the :cmake:command:`rapids_cpm_find` when a locally installed copy of the project can't be found. + Supports the following placeholders: + - ``${rapids-cmake-version}`` will be evaluated to 'major.minor' of the current rapids-cmake cal-ver value. + - ``${version}`` will be evaluated to the contents of the ``version`` field. + - ``$ENV{variable}`` will be evaluated to the contents of the listed environment variable + ``git_tag`` A required string representing the git tag to be used when cloning the @@ -47,8 +53,9 @@ as needed. installed copy of the project can't be found. Supports the following placeholders: - - ``${rapids-cmake-version}`` will be evulated to 'major.minor' of the current rapids-cmake cal-ver value. + - ``${rapids-cmake-version}`` will be evaluated to 'major.minor' of the current rapids-cmake cal-ver value. - ``${version}`` will be evaluated to the contents of the ``version`` field. + - ``$ENV{variable}`` will be evaluated to the contents of the listed environment variable ``git_shallow`` @@ -135,6 +142,7 @@ as needed. - ``${version}`` will be evaluated to the contents of the ``version`` field. - ``${cuda-toolkit-version}`` will be evaluated to 'major.minor' of the current CUDA Toolkit version. - ``${cuda-toolkit-version-major}`` will be evaluated to 'major' of the current CUDA Toolkit version. + - ``$ENV{variable}`` will be evaluated to the contents of the listed environment variable If this field exists in the default package, the value will be ignored when an override file entry exists for the package. This ensures that the git url or `proprietary_binary` entry in the override will be used. diff --git a/rapids-cmake/cpm/detail/package_details.cmake b/rapids-cmake/cpm/detail/package_details.cmake index 8d3acc99..2920a676 100644 --- a/rapids-cmake/cpm/detail/package_details.cmake +++ b/rapids-cmake/cpm/detail/package_details.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021-2023, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -97,6 +97,7 @@ function(rapids_cpm_package_details package_name version_var url_var tag_var sha cmake_language(EVAL CODE "set(version ${version})") cmake_language(EVAL CODE "set(git_tag ${git_tag})") + cmake_language(EVAL CODE "set(git_url ${git_url})") set(${version_var} ${version} PARENT_SCOPE) set(${url_var} ${git_url} PARENT_SCOPE) diff --git a/testing/cpm/CMakeLists.txt b/testing/cpm/CMakeLists.txt index ec4c2e82..c0650096 100644 --- a/testing/cpm/CMakeLists.txt +++ b/testing/cpm/CMakeLists.txt @@ -34,12 +34,12 @@ add_cmake_config_test( cpm_init-override-simple.cmake ) add_cmake_config_test( cpm_package_override-bad-path.cmake SHOULD_FAIL "rapids_cpm_package_override can't load") add_cmake_config_test( cpm_package_override-before-init.cmake ) add_cmake_config_test( cpm_package_override-empty.cmake ) +add_cmake_config_test( cpm_package_override-env-var-support.cmake ) add_cmake_config_test( cpm_package_override-multiple.cmake ) add_cmake_config_test( cpm_package_override-obey-cpm-source-var.cmake ) add_cmake_config_test( cpm_package_override-patches.cmake ) add_cmake_config_test( cpm_package_override-simple.cmake ) - add_cmake_config_test( cpm_generate_patch_command-invalid.cmake ) add_cmake_config_test( cpm_generate_patch_command-override.cmake ) add_cmake_config_test( cpm_generate_patch_command-current_json_dir.cmake ) diff --git a/testing/cpm/cpm_package_override-env-var-support.cmake b/testing/cpm/cpm_package_override-env-var-support.cmake new file mode 100644 index 00000000..552994c5 --- /dev/null +++ b/testing/cpm/cpm_package_override-env-var-support.cmake @@ -0,0 +1,52 @@ +#============================================================================= +# Copyright (c) 2024, NVIDIA CORPORATION. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============================================================================= +include(${rapids-cmake-dir}/cpm/init.cmake) + +set(ENV{rapids_version} custom_env_version) +set(ENV{rapids_user} custom_env_user) + +# Need to write out an override file +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/override.json + [=[ +{ + "packages" : { + "nvbench" : { + "version" : "$ENV{rapids_version}", + "git_url" : "$ENV{rapids_user}@gitlab.private.com", + "git_tag" : "my_tag" + } + } +} + ]=]) + +rapids_cpm_init(OVERRIDE "${CMAKE_CURRENT_BINARY_DIR}/override.json") + +# Verify that the override works +include("${rapids-cmake-dir}/cpm/detail/package_details.cmake") +rapids_cpm_package_details(nvbench version repository tag shallow exclude) + +if(NOT version STREQUAL "custom_env_version") + message(FATAL_ERROR "custom version field was ignored. ${version} found instead of custom_env_version") +endif() +if(NOT repository STREQUAL "custom_env_user@gitlab.private.com") + message(FATAL_ERROR "custom git_url field was ignored. ${repository} found instead of custom_env_user@gitlab.private.com") +endif() +if(NOT DEFINED CPM_DOWNLOAD_ALL) + message(FATAL_ERROR "CPM_DOWNLOAD_ALL should be defined when an override exists") +endif() +if(NOT CPM_DOWNLOAD_ALL) + message(FATAL_ERROR "CPM_DOWNLOAD_ALL should be set to true when an override exists") +endif() From 7a3a1cd4ad0fd002d522f163ec47618ee7046b38 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 20 Feb 2024 13:13:26 -0600 Subject: [PATCH 6/7] target branch-24.04 for GitHub Actions workflows (#541) Follow-up to #521 For all GitHub Actions configs, replaces uses of the `test-cuda-12.2` branch on `shared-workflows` with `branch-24.04`, now that https://github.com/rapidsai/shared-workflows/pull/166 has been merged. ### Notes for Reviewers This is part of ongoing work to build and test packages against CUDA 12.2 across all of RAPIDS. For more details see: * https://github.com/rapidsai/build-planning/issues/7 *(created with `rapids-reviser`)* Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/rapids-cmake/pull/541 --- .github/workflows/build.yaml | 6 +++--- .github/workflows/pr.yaml | 10 +++++----- .github/workflows/test.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d70cf432..b6ec6184 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: cpp-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: upload-conda: needs: [cpp-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -46,7 +46,7 @@ jobs: docs-build: if: github.ref_type == 'branch' secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 with: arch: "amd64" branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 369c8942..533f1978 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,26 +17,26 @@ jobs: - conda-cpp-tests - docs-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.04 checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.04 conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04 with: build_type: pull-request conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04 with: build_type: pull-request docs-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 with: build_type: pull-request node_type: "cpu4" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b0c898ea..8a01dd8b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: cpp-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-cuda-12.2 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04 with: build_type: nightly branch: ${{ inputs.branch }} From 59827ff62c45c409ec63b5c37612054b208341b3 Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:06:19 -0600 Subject: [PATCH 7/7] updating ops-bot.yaml (#532) --- .github/ops-bot.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ops-bot.yaml b/.github/ops-bot.yaml index 0a52b679..6e341325 100644 --- a/.github/ops-bot.yaml +++ b/.github/ops-bot.yaml @@ -6,3 +6,4 @@ branch_checker: true label_checker: true release_drafter: true external_contributors: false +forward_merger: true