Skip to content

Cleanup: remove redundant slot_is_filled definition #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PointKernel merged 2 commits into from
May 23, 2022
Merged

Cleanup: remove redundant slot_is_filled definition #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b722946
Cleanups: remove redundant functor definition
PointKernel May 22, 2022
4f851b3
Minor cleanups: use getters
PointKernel May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions include/cuco/detail/static_multimap/static_multimap.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/

#include <cuco/detail/utils.cuh>
#include <cuco/detail/utils.hpp>

#include <thrust/count.h>
Expand All @@ -22,18 +23,6 @@

#include <iterator>

namespace {
/**
* @brief Device functor used to determine if a slot is filled.
*/
template <typename Key>
struct slot_is_filled {
slot_is_filled(Key s) : empty_key_sentinel{s} {}
__device__ __forceinline__ bool operator()(Key const& k) { return k != empty_key_sentinel; }
Key empty_key_sentinel;
};
} // anonymous namespace

namespace cuco {

template <typename Key,
Expand Down Expand Up @@ -864,11 +853,10 @@ template <typename Key,
std::size_t static_multimap<Key, Value, Scope, Allocator, ProbeSequence>::get_size(
cudaStream_t stream) const noexcept
{
auto begin = thrust::make_transform_iterator(
raw_slots(), [] __device__(cuco::pair_type<Key, Value> const& pair) { return pair.first; });
slot_is_filled<Key> filled(empty_key_sentinel_);
auto begin = thrust::make_transform_iterator(raw_slots(), detail::slot_to_tuple<Key, Value>{});
auto filled = cuco::detail::slot_is_filled<Key>{get_empty_key_sentinel()};

return thrust::count_if(thrust::cuda::par.on(stream), begin, begin + capacity_, filled);
return thrust::count_if(thrust::cuda::par.on(stream), begin, begin + get_capacity(), filled);
}

template <typename Key,
Expand Down