Skip to content

Commit 45a13cc

Browse files
authored
Remove some unneeded libcudf debug-specific code paths (rapidsai#21335)
Removes some debug-specific code paths in libcudf which were originally implemented to workaround some compiler issues which no longer appear on nvcc 13.1. Authors: - David Wendt (https://github.com/davidwendt) Approvers: - Bradley Dice (https://github.com/bdice) - Shruti Shivakumar (https://github.com/shrshi) URL: rapidsai#21335
1 parent 339982b commit 45a13cc

2 files changed

Lines changed: 1 addition & 20 deletions

File tree

cpp/src/dictionary/detail/concatenate.cu

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,28 +160,13 @@ struct dispatch_compute_indices {
160160
auto result_itr =
161161
cudf::detail::indexalator_factory::make_output_iterator(result->mutable_view());
162162
// new indices values are computed by matching the concatenated keys to the new key set
163-
164-
#ifdef NDEBUG
165163
thrust::lower_bound(rmm::exec_policy_nosync(stream),
166164
begin,
167165
end,
168166
all_itr,
169167
all_itr + all_indices.size(),
170168
result_itr,
171169
cuda::std::less<Element>());
172-
#else
173-
// There is a problem with thrust::lower_bound and the output_indexalator.
174-
// https://github.com/NVIDIA/thrust/issues/1452; thrust team created nvbug 3322776
175-
// This is a workaround.
176-
thrust::transform(rmm::exec_policy_nosync(stream),
177-
all_itr,
178-
all_itr + all_indices.size(),
179-
result_itr,
180-
[begin, end] __device__(auto key) {
181-
auto itr = thrust::lower_bound(thrust::seq, begin, end, key);
182-
return static_cast<size_type>(cuda::std::distance(begin, itr));
183-
});
184-
#endif
185170
return result;
186171
}
187172

cpp/tests/strings/fixed_point_tests.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2021-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

@@ -303,11 +303,7 @@ TEST_F(StringsConvertTest, IsFixedPoint)
303303
CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*results, expected64_scaled);
304304
}
305305

306-
#ifdef NDEBUG
307306
TEST_F(StringsConvertTest, FixedPointStringConversionOperator)
308-
#else
309-
TEST_F(StringsConvertTest, DISABLED_FixedPointStringConversionOperator)
310-
#endif
311307
{
312308
auto const max = cuda::std::numeric_limits<__int128_t>::max();
313309

0 commit comments

Comments
 (0)