Skip to content
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

Jump to bottom

Updates needed to work with jitify that leverages libcudacxx #13383

Merged
merged 3 commits into from
May 24, 2023
Merged

Updates needed to work with jitify that leverages libcudacxx #13383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc12452
Remove override from a non virtual function
robertmaynard May 18, 2023
5067e02
Remove unneeded includes since jitify now leverages libcudacxx
robertmaynard May 23, 2023
e6aa791
Merge branch 'branch-23.06' into bug/latest_libcudacxx_with_jitify_su…
robertmaynard May 23, 2023
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
5 changes: 1 addition & 4 deletions cpp/include/cudf/fixed_point/fixed_point.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@
#include <cudf/fixed_point/temporary.hpp>
#include <cudf/types.hpp>

// Note: The <cuda/std/*> versions are used in order for Jitify to work with our fixed_point type.
// Jitify is needed for several algorithms (binaryop, rolling, etc)
#include <cuda/std/climits>
#include <cuda/std/limits>
#include <cuda/std/type_traits> // add cuda namespace
#include <cuda/std/type_traits>

#include <algorithm>
#include <cassert>
Expand Down
5 changes: 1 addition & 4 deletions cpp/include/cudf/fixed_point/temporary.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
* Copyright (c) 2021-2023, 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 @@ -18,9 +18,6 @@

#include <cudf/types.hpp>

// Note: The <cuda/std/*> versions are used in order for Jitify to work with our fixed_point type.
// Jitify is needed for several algorithms (binaryop, rolling, etc)
#include <cuda/std/climits>
#include <cuda/std/limits>
#include <cuda/std/type_traits>

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/reduction/detail/reduction_operators.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ struct compound_op : public simple_op<Derived> {
* @copydoc simple_op<Derived>::template get_null_replacing_element_transformer<ResultType>()
*/
template <typename ResultType>
auto get_null_replacing_element_transformer() override
auto get_null_replacing_element_transformer()
robertmaynard marked this conversation as resolved.
Show resolved Hide resolved
{
using element_transformer = typename Derived::transformer<ResultType>;
using OutputType = typename Derived::intermediate<ResultType>::IntermediateType;
Expand Down