From d3e49f644be2475bffe0ee779c4d171be938b3af Mon Sep 17 00:00:00 2001 From: David Wendt <45795991+davidwendt@users.noreply.github.com> Date: Fri, 1 Mar 2024 16:42:34 -0500 Subject: [PATCH] Fix includes for row_operators.cuh (#15194) 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 ` to `include ` Authors: - David Wendt (https://github.com/davidwendt) Approvers: - Paul Mattione (https://github.com/pmattione-nvidia) - Vyas Ramasubramani (https://github.com/vyasr) URL: https://github.com/rapidsai/cudf/pull/15194 --- cpp/include/cudf/table/row_operators.cuh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cpp/include/cudf/table/row_operators.cuh b/cpp/include/cudf/table/row_operators.cuh index 4806f96c934..0e57d24f4b3 100644 --- a/cpp/include/cudf/table/row_operators.cuh +++ b/cpp/include/cudf/table/row_operators.cuh @@ -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. @@ -20,19 +20,16 @@ #include #include #include -#include #include #include #include +#include #include #include #include -#include #include -#include - namespace cudf { /** @@ -470,7 +467,9 @@ class element_hasher { template ())> __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::max(); } + if (has_nulls && col.is_null(row_index)) { + return cuda::std::numeric_limits::max(); + } return hash_function{}(col.element(row_index)); } @@ -554,7 +553,7 @@ class element_hasher_with_seed { private: uint32_t _seed{DEFAULT_HASH_SEED}; - hash_value_type _null_hash{std::numeric_limits::max()}; + hash_value_type _null_hash{cuda::std::numeric_limits::max()}; Nullate _has_nulls; };