Skip to content

Commit

Permalink
Fix includes for row_operators.cuh (#15194)
Browse files Browse the repository at this point in the history
Simple change removes the `cudf/sorting.hpp` include from `row_operators.cuh`.
Found this while waiting for recompiles to finish.
Changes to `sorting.hpp` seemed to cause more recompiling than expected. 
Also took the opportunity to change the `include <limits>` to `include <cuda/limits>`

Authors:
  - David Wendt (https://github.com/davidwendt)

Approvers:
  - Paul Mattione (https://github.com/pmattione-nvidia)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #15194
  • Loading branch information
davidwendt authored Mar 1, 2024
1 parent 3b228e2 commit d3e49f6
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions cpp/include/cudf/table/row_operators.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2023, NVIDIA CORPORATION.
* Copyright (c) 2019-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.
Expand All @@ -20,19 +20,16 @@
#include <cudf/detail/utilities/assert.cuh>
#include <cudf/hashing/detail/hash_functions.cuh>
#include <cudf/hashing/detail/hashing.hpp>
#include <cudf/sorting.hpp>
#include <cudf/table/table_device_view.cuh>
#include <cudf/utilities/traits.hpp>
#include <cudf/utilities/type_dispatcher.hpp>

#include <cuda/std/limits>
#include <thrust/equal.h>
#include <thrust/execution_policy.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/swap.h>
#include <thrust/transform_reduce.h>

#include <limits>

namespace cudf {

/**
Expand Down Expand Up @@ -470,7 +467,9 @@ class element_hasher {
template <typename T, CUDF_ENABLE_IF(column_device_view::has_element_accessor<T>())>
__device__ hash_value_type operator()(column_device_view col, size_type row_index) const
{
if (has_nulls && col.is_null(row_index)) { return std::numeric_limits<hash_value_type>::max(); }
if (has_nulls && col.is_null(row_index)) {
return cuda::std::numeric_limits<hash_value_type>::max();
}
return hash_function<T>{}(col.element<T>(row_index));
}

Expand Down Expand Up @@ -554,7 +553,7 @@ class element_hasher_with_seed {

private:
uint32_t _seed{DEFAULT_HASH_SEED};
hash_value_type _null_hash{std::numeric_limits<hash_value_type>::max()};
hash_value_type _null_hash{cuda::std::numeric_limits<hash_value_type>::max()};
Nullate _has_nulls;
};

Expand Down

0 comments on commit d3e49f6

Please sign in to comment.