From 707a48078470b3037a32b8c503bb4df1f682df52 Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Wed, 24 May 2023 08:53:47 -0400
Subject: [PATCH] Updates needed to work with jitify that leverages libcudacxx
 (#13383)

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: https://github.com/rapidsai/cudf/pull/13383
---
 cpp/include/cudf/fixed_point/fixed_point.hpp              | 5 +----
 cpp/include/cudf/fixed_point/temporary.hpp                | 5 +----
 cpp/include/cudf/reduction/detail/reduction_operators.cuh | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cpp/include/cudf/fixed_point/fixed_point.hpp b/cpp/include/cudf/fixed_point/fixed_point.hpp
index b178700cfc3..7c59c2f9194 100644
--- a/cpp/include/cudf/fixed_point/fixed_point.hpp
+++ b/cpp/include/cudf/fixed_point/fixed_point.hpp
@@ -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>
diff --git a/cpp/include/cudf/fixed_point/temporary.hpp b/cpp/include/cudf/fixed_point/temporary.hpp
index 8492916bb3c..03f97d67310 100644
--- a/cpp/include/cudf/fixed_point/temporary.hpp
+++ b/cpp/include/cudf/fixed_point/temporary.hpp
@@ -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.
@@ -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>
 
diff --git a/cpp/include/cudf/reduction/detail/reduction_operators.cuh b/cpp/include/cudf/reduction/detail/reduction_operators.cuh
index 0dba84a0b28..7f0f4b14dae 100644
--- a/cpp/include/cudf/reduction/detail/reduction_operators.cuh
+++ b/cpp/include/cudf/reduction/detail/reduction_operators.cuh
@@ -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;