From adee00aca95a749ecdf86975ae6d5b7fa1c01733 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:46:08 -0700 Subject: [PATCH] remove `cuco_noexcept.diff` (#16254) This PR removes the cuDF `cuco_noexcept.diff` patch since it no longer applies after https://github.com/rapidsai/rapids-cmake/pull/628. Authors: - Paul Taylor (https://github.com/trxcllnt) Approvers: - Robert Maynard (https://github.com/robertmaynard) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cudf/pull/16254 --- cpp/cmake/thirdparty/get_cucollections.cmake | 4 - .../thirdparty/patches/cuco_noexcept.diff | 227 ------------------ .../thirdparty/patches/cuco_override.json | 14 -- 3 files changed, 245 deletions(-) delete mode 100644 cpp/cmake/thirdparty/patches/cuco_noexcept.diff delete mode 100644 cpp/cmake/thirdparty/patches/cuco_override.json diff --git a/cpp/cmake/thirdparty/get_cucollections.cmake b/cpp/cmake/thirdparty/get_cucollections.cmake index 6ec35ddcaf1..fb82b0f5ff3 100644 --- a/cpp/cmake/thirdparty/get_cucollections.cmake +++ b/cpp/cmake/thirdparty/get_cucollections.cmake @@ -15,10 +15,6 @@ # This function finds cuCollections and performs any additional configuration. function(find_and_configure_cucollections) include(${rapids-cmake-dir}/cpm/cuco.cmake) - include(${rapids-cmake-dir}/cpm/package_override.cmake) - - set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches") - rapids_cpm_package_override("${cudf_patch_dir}/cuco_override.json") if(BUILD_SHARED_LIBS) rapids_cpm_cuco(BUILD_EXPORT_SET cudf-exports) diff --git a/cpp/cmake/thirdparty/patches/cuco_noexcept.diff b/cpp/cmake/thirdparty/patches/cuco_noexcept.diff deleted file mode 100644 index 0f334c0e81f..00000000000 --- a/cpp/cmake/thirdparty/patches/cuco_noexcept.diff +++ /dev/null @@ -1,227 +0,0 @@ -diff --git a/include/cuco/aow_storage.cuh b/include/cuco/aow_storage.cuh -index 7f9de01..5228193 100644 ---- a/include/cuco/aow_storage.cuh -+++ b/include/cuco/aow_storage.cuh -@@ -81,7 +81,7 @@ class aow_storage : public detail::aow_storage_base { - * @param size Number of windows to (de)allocate - * @param allocator Allocator used for (de)allocating device storage - */ -- explicit constexpr aow_storage(Extent size, Allocator const& allocator = {}) noexcept; -+ explicit constexpr aow_storage(Extent size, Allocator const& allocator = {}); - - aow_storage(aow_storage&&) = default; ///< Move constructor - /** -@@ -122,7 +122,7 @@ class aow_storage : public detail::aow_storage_base { - * @param key Key to which all keys in `slots` are initialized - * @param stream Stream used for executing the kernel - */ -- void initialize(value_type key, cuda_stream_ref stream = {}) noexcept; -+ void initialize(value_type key, cuda_stream_ref stream = {}); - - /** - * @brief Asynchronously initializes each slot in the AoW storage to contain `key`. -diff --git a/include/cuco/detail/open_addressing/open_addressing_impl.cuh b/include/cuco/detail/open_addressing/open_addressing_impl.cuh -index c2c9c14..8ac4236 100644 ---- a/include/cuco/detail/open_addressing/open_addressing_impl.cuh -+++ b/include/cuco/detail/open_addressing/open_addressing_impl.cuh -@@ -125,7 +125,7 @@ class open_addressing_impl { - KeyEqual const& pred, - ProbingScheme const& probing_scheme, - Allocator const& alloc, -- cuda_stream_ref stream) noexcept -+ cuda_stream_ref stream) - : empty_slot_sentinel_{empty_slot_sentinel}, - erased_key_sentinel_{this->extract_key(empty_slot_sentinel)}, - predicate_{pred}, -@@ -233,7 +233,7 @@ class open_addressing_impl { - * - * @param stream CUDA stream this operation is executed in - */ -- void clear(cuda_stream_ref stream) noexcept { storage_.initialize(empty_slot_sentinel_, stream); } -+ void clear(cuda_stream_ref stream) { storage_.initialize(empty_slot_sentinel_, stream); } - - /** - * @brief Asynchronously erases all elements from the container. After this call, `size()` returns -@@ -599,7 +599,7 @@ class open_addressing_impl { - * - * @return The number of elements in the container - */ -- [[nodiscard]] size_type size(cuda_stream_ref stream) const noexcept -+ [[nodiscard]] size_type size(cuda_stream_ref stream) const - { - auto counter = - detail::counter_storage{this->allocator()}; -diff --git a/include/cuco/detail/static_map/static_map.inl b/include/cuco/detail/static_map/static_map.inl -index e17a145..3fa1d02 100644 ---- a/include/cuco/detail/static_map/static_map.inl -+++ b/include/cuco/detail/static_map/static_map.inl -@@ -123,7 +123,7 @@ template - void static_map::clear( -- cuda_stream_ref stream) noexcept -+ cuda_stream_ref stream) - { - impl_->clear(stream); - } -@@ -215,7 +215,7 @@ template - template - void static_map:: -- insert_or_assign(InputIt first, InputIt last, cuda_stream_ref stream) noexcept -+ insert_or_assign(InputIt first, InputIt last, cuda_stream_ref stream) - { - return this->insert_or_assign_async(first, last, stream); - stream.synchronize(); -@@ -465,7 +465,7 @@ template - static_map::size_type - static_map::size( -- cuda_stream_ref stream) const noexcept -+ cuda_stream_ref stream) const - { - return impl_->size(stream); - } -diff --git a/include/cuco/detail/static_multiset/static_multiset.inl b/include/cuco/detail/static_multiset/static_multiset.inl -index 174f9bc..582926b 100644 ---- a/include/cuco/detail/static_multiset/static_multiset.inl -+++ b/include/cuco/detail/static_multiset/static_multiset.inl -@@ -97,7 +97,7 @@ template - void static_multiset::clear( -- cuda_stream_ref stream) noexcept -+ cuda_stream_ref stream) - { - impl_->clear(stream); - } -@@ -183,7 +183,7 @@ template - static_multiset::size_type - static_multiset::size( -- cuda_stream_ref stream) const noexcept -+ cuda_stream_ref stream) const - { - return impl_->size(stream); - } -diff --git a/include/cuco/detail/static_set/static_set.inl b/include/cuco/detail/static_set/static_set.inl -index 645013f..d3cece0 100644 ---- a/include/cuco/detail/static_set/static_set.inl -+++ b/include/cuco/detail/static_set/static_set.inl -@@ -98,7 +98,7 @@ template - void static_set::clear( -- cuda_stream_ref stream) noexcept -+ cuda_stream_ref stream) - { - impl_->clear(stream); - } -@@ -429,7 +429,7 @@ template - static_set::size_type - static_set::size( -- cuda_stream_ref stream) const noexcept -+ cuda_stream_ref stream) const - { - return impl_->size(stream); - } -diff --git a/include/cuco/detail/storage/aow_storage.inl b/include/cuco/detail/storage/aow_storage.inl -index 3547f4c..94b7f98 100644 ---- a/include/cuco/detail/storage/aow_storage.inl -+++ b/include/cuco/detail/storage/aow_storage.inl -@@ -32,8 +32,8 @@ - namespace cuco { - - template --constexpr aow_storage::aow_storage( -- Extent size, Allocator const& allocator) noexcept -+constexpr aow_storage::aow_storage(Extent size, -+ Allocator const& allocator) - : detail::aow_storage_base{size}, - allocator_{allocator}, - window_deleter_{capacity(), allocator_}, -@@ -64,7 +64,7 @@ aow_storage::ref() const noexcept - - template - void aow_storage::initialize(value_type key, -- cuda_stream_ref stream) noexcept -+ cuda_stream_ref stream) - { - this->initialize_async(key, stream); - stream.synchronize(); -diff --git a/include/cuco/static_map.cuh b/include/cuco/static_map.cuh -index c86e90c..95da423 100644 ---- a/include/cuco/static_map.cuh -+++ b/include/cuco/static_map.cuh -@@ -269,7 +269,7 @@ class static_map { - * - * @param stream CUDA stream this operation is executed in - */ -- void clear(cuda_stream_ref stream = {}) noexcept; -+ void clear(cuda_stream_ref stream = {}); - - /** - * @brief Asynchronously erases all elements from the container. After this call, `size()` returns -@@ -387,7 +387,7 @@ class static_map { - * @param stream CUDA stream used for insert - */ - template -- void insert_or_assign(InputIt first, InputIt last, cuda_stream_ref stream = {}) noexcept; -+ void insert_or_assign(InputIt first, InputIt last, cuda_stream_ref stream = {}); - - /** - * @brief For any key-value pair `{k, v}` in the range `[first, last)`, if a key equivalent to `k` -@@ -690,7 +690,7 @@ class static_map { - * @param stream CUDA stream used to get the number of inserted elements - * @return The number of elements in the container - */ -- [[nodiscard]] size_type size(cuda_stream_ref stream = {}) const noexcept; -+ [[nodiscard]] size_type size(cuda_stream_ref stream = {}) const; - - /** - * @brief Gets the maximum number of elements the hash map can hold. -diff --git a/include/cuco/static_multiset.cuh b/include/cuco/static_multiset.cuh -index 0daf103..fbcbc9c 100644 ---- a/include/cuco/static_multiset.cuh -+++ b/include/cuco/static_multiset.cuh -@@ -235,7 +235,7 @@ class static_multiset { - * - * @param stream CUDA stream this operation is executed in - */ -- void clear(cuda_stream_ref stream = {}) noexcept; -+ void clear(cuda_stream_ref stream = {}); - - /** - * @brief Asynchronously erases all elements from the container. After this call, `size()` returns -@@ -339,7 +339,7 @@ class static_multiset { - * @param stream CUDA stream used to get the number of inserted elements - * @return The number of elements in the container - */ -- [[nodiscard]] size_type size(cuda_stream_ref stream = {}) const noexcept; -+ [[nodiscard]] size_type size(cuda_stream_ref stream = {}) const; - - /** - * @brief Gets the maximum number of elements the multiset can hold. -diff --git a/include/cuco/static_set.cuh b/include/cuco/static_set.cuh -index a069939..3517f84 100644 ---- a/include/cuco/static_set.cuh -+++ b/include/cuco/static_set.cuh -@@ -240,7 +240,7 @@ class static_set { - * - * @param stream CUDA stream this operation is executed in - */ -- void clear(cuda_stream_ref stream = {}) noexcept; -+ void clear(cuda_stream_ref stream = {}); - - /** - * @brief Asynchronously erases all elements from the container. After this call, `size()` returns -@@ -687,7 +687,7 @@ class static_set { - * @param stream CUDA stream used to get the number of inserted elements - * @return The number of elements in the container - */ -- [[nodiscard]] size_type size(cuda_stream_ref stream = {}) const noexcept; -+ [[nodiscard]] size_type size(cuda_stream_ref stream = {}) const; - - /** - * @brief Gets the maximum number of elements the hash set can hold. diff --git a/cpp/cmake/thirdparty/patches/cuco_override.json b/cpp/cmake/thirdparty/patches/cuco_override.json deleted file mode 100644 index ae0a9a4b4f0..00000000000 --- a/cpp/cmake/thirdparty/patches/cuco_override.json +++ /dev/null @@ -1,14 +0,0 @@ - -{ - "packages" : { - "cuco" : { - "patches" : [ - { - "file" : "${current_json_dir}/cuco_noexcept.diff", - "issue" : "Remove erroneous noexcept clauses on cuco functions that may throw [https://github.com/rapidsai/cudf/issues/16059]", - "fixed_in" : "" - } - ] - } - } -}