Skip to content

Commit

Permalink
Updates needed to work with jitify that leverages libcudacxx (#13383)
Browse files Browse the repository at this point in the history
This update libcudf with a version of jitify that leverages libcudacxx. This removes compiler issues when the pre-built defines in jitify and libcudacxx diverege due to updates in either package.

At the same time testing locally with CUDA 11.5, 11.8, 12.0, and 12.1 uncovered a couple of compile errors.

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Nghia Truong (https://github.com/ttnghia)
  - Vukasin Milovanovic (https://github.com/vuule)

URL: #13383
  • Loading branch information
robertmaynard authored May 24, 2023
1 parent 56150d9 commit 707a480
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
5 changes: 1 addition & 4 deletions cpp/include/cudf/fixed_point/fixed_point.hpp
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
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
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()
{
using element_transformer = typename Derived::transformer<ResultType>;
using OutputType = typename Derived::intermediate<ResultType>::IntermediateType;
Expand Down

0 comments on commit 707a480

Please sign in to comment.