From 291c8f19f200352ea9340081660846c52f61a79e Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 14:23:17 -0400
Subject: [PATCH 01/48] feat(rocthrust): track CCCL 1c3c7ddee12 + 8ca3dc31e90
 in system/hip find/mismatch

Upstream: https://github.com/NVIDIA/cccl/commit/1c3c7ddee12 (NVIDIA/cccl#6019)
Upstream: https://github.com/NVIDIA/cccl/commit/8ca3dc31e9075e038d2ade5c2b90f79155e8ccca (NVIDIA/cccl#6018)

HIP previously took no change for these (performance-only). Bring system/hip closer to upstream:
- find.h: find_if_n unwraps contiguous iterators and builds the zip/counting iterator with auto +
  variadic thrust::make_zip_iterator. transform_input_iterator_t now calls op(*input) directly instead
  of materializing the value_type (same semantics as ::cuda::transform_iterator; avoids NVIDIA/cccl#3591);
  prefix operator++ returns self_t&. The dedicated iterator is kept because thrust::transform_iterator
  still converts to the value_type and ::cuda::transform_iterator needs libhipcxx.
- mismatch.h: drop transform_pair_of_input_iterators_t and enable the zip_iterator + zip_function
  implementation (thrust:: versions, so it also works without libhipcxx).
Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/system/hip/detail/find.h |  32 ++--
 .../thrust/system/hip/detail/mismatch.h       | 141 +-----------------
 2 files changed, 18 insertions(+), 155 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h
index 376aa5cac3c3..2364f6802ebb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h
@@ -44,6 +44,7 @@
 #  include <thrust/iterator/counting_iterator.h>
 #  include <thrust/iterator/transform_iterator.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
+#  include <thrust/type_traits/unwrap_contiguous_iterator.h>
 #  if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #    include <thrust/detail/algorithm_wrapper.h>
 
@@ -134,22 +135,23 @@ struct transform_input_iterator_t
     return retval;
   }
 
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++()
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator++()
   {
     ++input;
     return *this;
   }
 
+  // Pass the dereferenced value straight to op (like ::cuda::transform_iterator) instead of materializing the
+  // value_type first, so value types need not be constructible on the device. See:
+  // https://github.com/NVIDIA/cccl/issues/3591
   THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*() const
   {
-    thrust::detail::it_value_t<InputIt> x = *input;
-    return op(x);
+    return op(*input);
   }
 
   THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*()
   {
-    thrust::detail::it_value_t<InputIt> x = *input;
-    return op(x);
+    return op(*input);
   }
 
   THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator+(difference_type n) const
@@ -218,21 +220,17 @@ find_if_n(execution_policy<Derived>& policy, InputIt first, Size num_items, Pred
   const Size interval_threshold = 1 << 20;
   const Size interval_size      = (_THRUST_STD::min)(interval_threshold, num_items);
 
-  // FIXME(bgruber): we should also be able to use transform_iterator here, but it makes nvc++ hang. See:
-  // https://github.com/NVIDIA/cccl/issues/3594. The problem does not occur with nvcc, so we could not add a test :/
-  using XfrmIterator = __find_if::transform_input_iterator_t<bool, InputIt, Predicate>;
-  // using XfrmIterator  = transform_iterator<Predicate, InputIt>;
-  using IteratorTuple = thrust::tuple<XfrmIterator, counting_iterator<Size>>;
-  using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
+  // Upstream uses ::cuda::make_transform_iterator here. thrust::transform_iterator converts to the value_type before
+  // calling the functor (https://github.com/NVIDIA/cccl/issues/3591), so keep a dedicated iterator that does not.
+  auto unwrapped_first = thrust::try_unwrap_contiguous_iterator(first);
+  using XfrmIterator   = __find_if::transform_input_iterator_t<bool, decltype(unwrapped_first), Predicate>;
 
-  IteratorTuple iter_tuple = thrust::make_tuple(XfrmIterator(first, predicate), counting_iterator<Size>(0));
+  const auto begin = thrust::make_zip_iterator(XfrmIterator(unwrapped_first, predicate), counting_iterator<Size>(0));
+  const auto end = begin + num_items;
 
-  ZipIterator begin = thrust::make_zip_iterator(iter_tuple);
-  ZipIterator end   = begin + num_items;
-
-  for (ZipIterator interval_begin = begin; interval_begin < end; interval_begin += interval_size)
+  for (auto interval_begin = begin; interval_begin < end; interval_begin += interval_size)
   {
-    ZipIterator interval_end = interval_begin + interval_size;
+    auto interval_end = interval_begin + interval_size;
     if (end < interval_end)
     {
       interval_end = end;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
index 09def089f62b..5311541c1902 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
@@ -64,151 +64,16 @@ THRUST_NAMESPACE_END
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
-namespace detail
-{
-template <class ValueType, class InputIt1, class InputIt2, class BinaryOp>
-struct transform_pair_of_input_iterators_t
-{
-  using self_t            = transform_pair_of_input_iterators_t;
-  using difference_type   = thrust::detail::it_difference_t<InputIt1>;
-  using value_type        = ValueType;
-  using pointer           = void;
-  using reference         = value_type;
-  using iterator_category = std::random_access_iterator_tag;
-
-  InputIt1 input1;
-  InputIt2 input2;
-  mutable BinaryOp op;
-
-  transform_pair_of_input_iterators_t() = default;
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE
-  transform_pair_of_input_iterators_t(InputIt1 input1_, InputIt2 input2_, BinaryOp op_)
-      : input1(input1_)
-      , input2(input2_)
-      , op(op_)
-  {}
-
-  transform_pair_of_input_iterators_t(const self_t&) = default;
-
-  // BinaryOp might not be copy assignable, such as when it is a lambda.
-  // Define an explicit copy assignment operator that doesn't try to assign it.
-  THRUST_HOST_DEVICE self_t& operator=(const self_t& o)
-  {
-    input1 = o.input1;
-    input2 = o.input2;
-    return *this;
-  }
-
-  /// Postfix increment
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++(int)
-  {
-    self_t retval = *this;
-    ++input1;
-    ++input2;
-    return retval;
-  }
-
-  /// Prefix increment
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator++()
-  {
-    ++input1;
-    ++input2;
-    return *this;
-  }
-
-  /// Indirection
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*() const
-  {
-    return op(*input1, *input2);
-  }
-  /// Indirection
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*()
-  {
-    return op(*input1, *input2);
-  }
-
-  /// Addition
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator+(difference_type n) const
-  {
-    return self_t(input1 + n, input2 + n, op);
-  }
-
-  /// Addition assignment
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator+=(difference_type n)
-  {
-    input1 += n;
-    input2 += n;
-    return *this;
-  }
-
-  /// Subtraction
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator-(difference_type n) const
-  {
-    return self_t(input1 - n, input2 - n, op);
-  }
-
-  /// Subtraction assignment
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator-=(difference_type n)
-  {
-    input1 -= n;
-    input2 -= n;
-    return *this;
-  }
-
-  /// Distance
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE difference_type operator-(self_t other) const
-  {
-    return input1 - other.input1;
-  }
-
-  /// Array subscript
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator[](difference_type n) const
-  {
-    return op(input1[n], input2[n]);
-  }
-
-  /// Equal to
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator==(const self_t& rhs) const
-  {
-    return (input1 == rhs.input1) && (input2 == rhs.input2);
-  }
-
-  /// Not equal to
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator!=(const self_t& rhs) const
-  {
-    return (input1 != rhs.input1) || (input2 != rhs.input2);
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator<(const self_t& rhs) const
-  {
-    return input1 < rhs.input1;
-  }
-}; // struct transform_pair_of_input_iterators_t
-} // namespace detail
-
 template <class Derived, class InputIt1, class InputIt2, class BinaryPred>
 pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2, BinaryPred binary_pred)
 {
-  const auto transform_first =
-    detail::transform_pair_of_input_iterators_t<bool, InputIt1, InputIt2, BinaryPred>(first1, first2, binary_pred);
-  const auto result = hip_rocprim::find_if_not(
-    policy, transform_first, transform_first + _THRUST_STD::distance(first1, last1), _THRUST_STD::identity{});
-  return thrust::make_pair(first1 + _THRUST_STD::distance(transform_first, result),
-                           first2 + _THRUST_STD::distance(transform_first, result));
-
-  // FIXME(bgruber): the following code should be equivalent and not require a dedicated iterator. However, it
-  // additionally requires the value_type to constructible/destructible on the device, which should be fixed at some
-  // point. See also: https://github.com/NVIDIA/cccl/issues/3591
-#  if 0
   const auto n            = _THRUST_STD::distance(first1, last1);
-  const auto first        = make_zip_iterator(first1, first2);
-  const auto last         = make_zip_iterator(last1, first2 + n);
-  const auto mismatch_pos = hip_rocprim::find_if_not(policy, first, last, make_zip_function(binary_pred));
+  const auto first        = thrust::make_zip_iterator(first1, first2);
+  const auto last         = thrust::make_zip_iterator(last1, first2 + n);
+  const auto mismatch_pos = hip_rocprim::find_if_not(policy, first, last, thrust::make_zip_function(binary_pred));
   const auto dist         = _THRUST_STD::distance(first, mismatch_pos);
   return thrust::make_pair(first1 + dist, first2 + dist);
-#  endif
 }
 
 template <class Derived, class InputIt1, class InputIt2>

From 6197cedfac64e0ea623b2cfb4d01c070da6c2e41 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 14:44:05 -0400
Subject: [PATCH 02/48] feat(rocthrust): complete CCCL 5303f65de2d - Dropped
 duplicated math function from Thrust (NVIDIA/cccl#6188)

Upstream: https://github.com/NVIDIA/cccl/commit/5303f65de2d6d5a088e1a78defd0cd0c627e6c42

Completes the earlier partial port. libhipcxx is now mandatory (libcxx.h requires >= 3.4), so the
compatibility reason for keeping thrust::detail integer helpers no longer applies:
- delete thrust/detail/integer_math.h.
- execute_with_allocator.h: divide_ri -> _THRUST_LIBCXX::ceil_div.
- mr/{pool,disjoint_pool}.h: log2_ri -> _THRUST_LIBCXX::ceil_ilog2, is_power_of_2 -> _THRUST_LIBCXX::is_power_of_two.
- mr/pool_options.h: validate() uses is_power_of_two with the upstream explicit != 0 checks.
- system/cuda/detail/dispatch.h: take upstream (defines its own thrust::detail::is_negative).
- system/hip/detail/dispatch.h: same is_negative, spelled with _THRUST_STD/THRUST_HOST_DEVICE;
  hip scan.h/sort.h drop the integer_math.h include.
Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/detail/execute_with_allocator.h    |   7 +-
 .../rocthrust/thrust/detail/integer_math.h    | 113 ------------------
 .../rocthrust/thrust/mr/disjoint_pool.h       |  18 +--
 .../hipccl/hipccl3/rocthrust/thrust/mr/pool.h |  18 +--
 .../rocthrust/thrust/mr/pool_options.h        |   8 +-
 .../thrust/system/cuda/detail/dispatch.h      |  23 +++-
 .../thrust/system/hip/detail/dispatch.h       |  19 ++-
 .../rocthrust/thrust/system/hip/detail/scan.h |   1 -
 .../rocthrust/thrust/system/hip/detail/sort.h |   1 -
 9 files changed, 68 insertions(+), 140 deletions(-)
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/detail/integer_math.h

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
index 3d41533ae94d..4160c1a02881 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
@@ -28,11 +28,12 @@
 
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/execute_with_allocator_fwd.h>
-#include <thrust/detail/integer_math.h>
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/pair.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__cmath/ceil_div.h)
+
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
 #endif
@@ -53,7 +54,7 @@ get_temporary_buffer(thrust::detail::execute_with_allocator<Allocator, BaseSyste
 
   // How many elements of type value_type do we need to accommodate n elements
   // of type T?
-  size_type num_elements = divide_ri(sizeof(T) * n, sizeof(value_type));
+  const size_type num_elements = static_cast<size_type>(_THRUST_LIBCXX::ceil_div(sizeof(T) * n, sizeof(value_type)));
 
   void_pointer ptr = alloc_traits::allocate(system.get_allocator(), num_elements);
 
@@ -72,7 +73,7 @@ THRUST_HOST void return_temporary_buffer(
   using value_type      = typename alloc_traits::value_type;
   using T               = typename thrust::detail::pointer_traits<Pointer>::element_type;
 
-  size_type num_elements = divide_ri(sizeof(T) * n, sizeof(value_type));
+  size_type num_elements = _THRUST_LIBCXX::ceil_div(sizeof(T) * n, sizeof(value_type));
 
   pointer to_ptr = thrust::reinterpret_pointer_cast<pointer>(p);
   alloc_traits::deallocate(system.get_allocator(), to_ptr, num_elements);
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/integer_math.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/integer_math.h
deleted file mode 100644
index 8e088f018e47..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/integer_math.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2023-2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/type_deduction.h>
-
-#include _THRUST_STD_INCLUDE(bit)
-#include _THRUST_STD_INCLUDE(__type_traits/make_unsigned.h)
-#include _THRUST_STD_INCLUDE(limits)
-#include _THRUST_STD_INCLUDE(type_traits)
-
-THRUST_NAMESPACE_BEGIN
-namespace detail
-{
-
-template <typename Integer>
-THRUST_HOST_DEVICE THRUST_FORCEINLINE bool is_power_of_2(Integer x)
-{
-  return 0 == (x & (x - 1));
-}
-
-template <typename T>
-THRUST_HOST_DEVICE THRUST_FORCEINLINE typename std::enable_if<std::is_signed<T>::value, bool>::type is_negative(T x)
-{
-  return x < 0;
-}
-
-template <typename T>
-THRUST_HOST_DEVICE THRUST_FORCEINLINE typename std::enable_if<std::is_unsigned<T>::value, bool>::type is_negative(T)
-{
-  return false;
-}
-
-template <typename Integer>
-THRUST_HOST_DEVICE THRUST_FORCEINLINE bool is_odd(Integer x)
-{
-  return 1 & x;
-}
-
-template <typename Integer>
-THRUST_HOST_DEVICE THRUST_FORCEINLINE Integer log2(Integer x)
-{
-  Integer num_bits           = 8 * sizeof(Integer);
-  Integer num_bits_minus_one = num_bits - 1;
-
-  return num_bits_minus_one - _THRUST_STD::countl_zero(::cuda::std::__to_unsigned_like(x));
-}
-
-template <typename Integer>
-THRUST_HOST_DEVICE THRUST_FORCEINLINE Integer log2_ri(Integer x)
-{
-  Integer result = log2(x);
-
-  // This is where we round up to the nearest log.
-  if (!is_power_of_2(x))
-  {
-    ++result;
-  }
-
-  return result;
-}
-
-// x/y rounding towards +infinity for integers
-// Used to determine # of blocks/warps etc.
-template <typename Integer0, typename Integer1>
-THRUST_HOST_DEVICE THRUST_FORCEINLINE
-  // FIXME: Should use common_type.
-  auto
-  divide_ri(Integer0 const x, Integer1 const y) THRUST_DECLTYPE_RETURNS((x + (y - 1)) / y)
-
-  // x/y rounding towards zero for integers.
-  // Used to determine # of blocks/warps etc.
-  template <typename Integer0, typename Integer1>
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE auto divide_rz(Integer0 const x, Integer1 const y)
-    THRUST_DECLTYPE_RETURNS(x / y)
-
-  // Round x towards infinity to the next multiple of y.
-  template <typename Integer0, typename Integer1>
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE auto round_i(Integer0 const x, Integer1 const y)
-    THRUST_DECLTYPE_RETURNS(y* divide_ri(x, y))
-
-  // Round x towards 0 to the next multiple of y.
-  template <typename Integer0, typename Integer1>
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE auto round_z(Integer0 const x, Integer1 const y)
-    THRUST_DECLTYPE_RETURNS(y* divide_rz(x, y))
-
-} // namespace detail
-
-THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h b/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h
index e73537f803bd..f787cce50137 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h
@@ -42,6 +42,8 @@
 #include <thrust/mr/memory_resource.h>
 #include <thrust/mr/pool_options.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__cmath/ilog.h)
+#include _THRUST_LIBCXX_INCLUDE(__cmath/pow2.h)
 #include _THRUST_STD_INCLUDE(__algorithm/max.h)
 #include _THRUST_STD_INCLUDE(__algorithm/min.h)
 #include _THRUST_STD_INCLUDE(cassert)
@@ -122,7 +124,7 @@ class disjoint_unsynchronized_pool_resource final
       : m_upstream(upstream)
       , m_bookkeeper(bookkeeper)
       , m_options(options)
-      , m_smallest_block_log2(detail::log2_ri(m_options.smallest_block_size))
+      , m_smallest_block_log2(_THRUST_LIBCXX::ceil_ilog2(m_options.smallest_block_size))
       , m_pools(m_bookkeeper)
       , m_allocated(m_bookkeeper)
       , m_cached_oversized(m_bookkeeper)
@@ -132,7 +134,7 @@ class disjoint_unsynchronized_pool_resource final
 
     pointer_vector free(m_bookkeeper);
     pool p(free);
-    m_pools.resize(detail::log2_ri(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
+    m_pools.resize(_THRUST_LIBCXX::ceil_ilog2(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
   }
 
   // TODO: C++11: use delegating constructors
@@ -145,7 +147,7 @@ class disjoint_unsynchronized_pool_resource final
       : m_upstream(get_global_resource<Upstream>())
       , m_bookkeeper(get_global_resource<Bookkeeper>())
       , m_options(options)
-      , m_smallest_block_log2(detail::log2_ri(m_options.smallest_block_size))
+      , m_smallest_block_log2(_THRUST_LIBCXX::ceil_ilog2(m_options.smallest_block_size))
       , m_pools(m_bookkeeper)
       , m_allocated(m_bookkeeper)
       , m_cached_oversized(m_bookkeeper)
@@ -155,7 +157,7 @@ class disjoint_unsynchronized_pool_resource final
 
     pointer_vector free(m_bookkeeper);
     pool p(free);
-    m_pools.resize(detail::log2_ri(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
+    m_pools.resize(_THRUST_LIBCXX::ceil_ilog2(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
   }
 
   /*! Destructor. Releases all held memory to upstream.
@@ -369,7 +371,7 @@ class disjoint_unsynchronized_pool_resource final
   [[nodiscard]] void_ptr do_allocate_impl(std::size_t bytes, std::size_t alignment)
   {
     bytes = (std::max)(bytes, m_options.smallest_block_size);
-    assert(detail::is_power_of_2(alignment));
+    assert(_THRUST_LIBCXX::is_power_of_two(alignment));
 
     // an oversized and/or overaligned allocation requested; needs to be allocated separately
     if (bytes > m_options.largest_block_size || alignment > m_options.alignment)
@@ -429,7 +431,7 @@ class disjoint_unsynchronized_pool_resource final
 
     // the request is NOT for oversized and/or overaligned memory
     // allocate a block from an appropriate bucket
-    std::size_t bytes_log2 = thrust::detail::log2_ri(bytes);
+    std::size_t bytes_log2 = _THRUST_LIBCXX::ceil_ilog2(bytes);
     std::size_t pool_idx   = bytes_log2 - m_smallest_block_log2;
     pool& bucket           = m_pools[pool_idx];
 
@@ -481,7 +483,7 @@ class disjoint_unsynchronized_pool_resource final
   virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
   {
     n = (std::max)(n, m_options.smallest_block_size);
-    assert(detail::is_power_of_2(alignment));
+    assert(_THRUST_LIBCXX::is_power_of_two(alignment));
 
     // verify that the pointer is at least as aligned as claimed
     assert(reinterpret_cast<_THRUST_STD::intmax_t>(detail::pointer_traits<void_ptr>::get(p)) % alignment == 0);
@@ -510,7 +512,7 @@ class disjoint_unsynchronized_pool_resource final
     }
 
     // push the block to the front of the appropriate bucket's free list
-    std::size_t n_log2   = thrust::detail::log2_ri(n);
+    std::size_t n_log2   = _THRUST_LIBCXX::ceil_ilog2(n);
     std::size_t pool_idx = n_log2 - m_smallest_block_log2;
     pool& bucket         = m_pools[pool_idx];
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h b/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h
index 119b1aa38c41..a3dfe8cb3e33 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h
@@ -38,6 +38,8 @@
 #include <thrust/mr/memory_resource.h>
 #include <thrust/mr/pool_options.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__cmath/ilog.h)
+#include _THRUST_LIBCXX_INCLUDE(__cmath/pow2.h)
 #include _THRUST_STD_INCLUDE(cassert)
 #include _THRUST_STD_INCLUDE(cstdint)
 
@@ -111,7 +113,7 @@ class unsynchronized_pool_resource final
   unsynchronized_pool_resource(Upstream* upstream, pool_options options = get_default_options())
       : m_upstream(upstream)
       , m_options(options)
-      , m_smallest_block_log2(detail::log2_ri(m_options.smallest_block_size))
+      , m_smallest_block_log2(_THRUST_LIBCXX::ceil_ilog2(m_options.smallest_block_size))
       , m_pools(upstream)
       , m_allocated()
       , m_oversized()
@@ -120,7 +122,7 @@ class unsynchronized_pool_resource final
     assert(m_options.validate());
 
     pool p = {block_descriptor_ptr(), 0};
-    m_pools.resize(detail::log2_ri(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
+    m_pools.resize(_THRUST_LIBCXX::ceil_ilog2(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
   }
 
   // TODO: C++11: use delegating constructors
@@ -132,7 +134,7 @@ class unsynchronized_pool_resource final
   unsynchronized_pool_resource(pool_options options = get_default_options())
       : m_upstream(get_global_resource<Upstream>())
       , m_options(options)
-      , m_smallest_block_log2(detail::log2_ri(m_options.smallest_block_size))
+      , m_smallest_block_log2(_THRUST_LIBCXX::ceil_ilog2(m_options.smallest_block_size))
       , m_pools(get_global_resource<Upstream>())
       , m_allocated()
       , m_oversized()
@@ -141,7 +143,7 @@ class unsynchronized_pool_resource final
     assert(m_options.validate());
 
     pool p = {block_descriptor_ptr(), 0};
-    m_pools.resize(detail::log2_ri(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
+    m_pools.resize(_THRUST_LIBCXX::ceil_ilog2(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
   }
 
   /*! Destructor. Releases all held memory to upstream.
@@ -259,7 +261,7 @@ class unsynchronized_pool_resource final
   do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
   {
     bytes = (std::max)(bytes, m_options.smallest_block_size);
-    assert(detail::is_power_of_2(alignment));
+    assert(_THRUST_LIBCXX::is_power_of_two(alignment));
 
     // an oversized and/or overaligned allocation requested; needs to be allocated separately
     if (bytes > m_options.largest_block_size || alignment > m_options.alignment)
@@ -370,7 +372,7 @@ class unsynchronized_pool_resource final
 
     // the request is NOT for oversized and/or overaligned memory
     // allocate a block from an appropriate bucket
-    std::size_t bytes_log2 = thrust::detail::log2_ri(bytes);
+    std::size_t bytes_log2 = _THRUST_LIBCXX::ceil_ilog2(bytes);
     std::size_t bucket_idx = bytes_log2 - m_smallest_block_log2;
     pool& bucket           = thrust::raw_reference_cast(m_pools[bucket_idx]);
 
@@ -438,7 +440,7 @@ class unsynchronized_pool_resource final
   virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
   {
     n = (std::max)(n, m_options.smallest_block_size);
-    assert(detail::is_power_of_2(alignment));
+    assert(_THRUST_LIBCXX::is_power_of_two(alignment));
 
     // verify that the pointer is at least as aligned as claimed
     assert(reinterpret_cast<_THRUST_STD::intmax_t>(void_ptr_traits::get(p)) % alignment == 0);
@@ -503,7 +505,7 @@ class unsynchronized_pool_resource final
     }
 
     // push the block to the front of the appropriate bucket's free list
-    std::size_t n_log2     = thrust::detail::log2_ri(n);
+    std::size_t n_log2     = _THRUST_LIBCXX::ceil_ilog2(n);
     std::size_t bucket_idx = n_log2 - m_smallest_block_log2;
     pool& bucket           = thrust::raw_reference_cast(m_pools[bucket_idx]);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool_options.h b/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool_options.h
index 4d553bf3fdc0..3c0d7fdae5ee 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool_options.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool_options.h
@@ -32,8 +32,8 @@
 #endif // no system header
 
 #include <thrust/detail/config/memory_resource.h>
-#include <thrust/detail/integer_math.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__cmath/pow2.h)
 #include _THRUST_STD_INCLUDE(cstddef)
 
 THRUST_NAMESPACE_BEGIN
@@ -103,15 +103,15 @@ struct pool_options
    */
   bool validate() const
   {
-    if (!detail::is_power_of_2(smallest_block_size))
+    if (smallest_block_size != 0 && !_THRUST_LIBCXX::is_power_of_two(smallest_block_size))
     {
       return false;
     }
-    if (!detail::is_power_of_2(largest_block_size))
+    if (largest_block_size != 0 && !_THRUST_LIBCXX::is_power_of_two(largest_block_size))
     {
       return false;
     }
-    if (!detail::is_power_of_2(alignment))
+    if (alignment != 0 && !_THRUST_LIBCXX::is_power_of_two(alignment))
     {
       return false;
     }
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/dispatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/dispatch.h
index a47f244bf77e..f96f612a7ee4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/dispatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/dispatch.h
@@ -26,15 +26,36 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/integer_math.h>
 #include <thrust/detail/preprocessor.h>
 
+#include <cuda/std/__concepts/concept_macros.h>
 #include <cuda/std/__exception/throw_error.h>
+#include <cuda/std/__type_traits/is_arithmetic.h>
+#include <cuda/std/__type_traits/is_unsigned.h>
 #include <cuda/std/cstdint>
 #include <cuda/std/limits>
 
 #include <string>
 
+THRUST_NAMESPACE_BEGIN
+namespace detail
+{
+_CCCL_TEMPLATE(typename T)
+_CCCL_REQUIRES(::cuda::std::is_arithmetic_v<T>)
+[[nodiscard]] _CCCL_API constexpr bool is_negative([[maybe_unused]] T x) noexcept
+{
+  if constexpr (::cuda::std::is_unsigned_v<T>)
+  {
+    return false;
+  }
+  else
+  {
+    return x < 0;
+  }
+}
+} // namespace detail
+THRUST_NAMESPACE_END
+
 #if defined(THRUST_FORCE_32_BIT_OFFSET_TYPE) && defined(THRUST_FORCE_64_BIT_OFFSET_TYPE)
 #  error "Only THRUST_FORCE_32_BIT_OFFSET_TYPE or THRUST_FORCE_64_BIT_OFFSET_TYPE may be defined!"
 #endif // THRUST_FORCE_32_BIT_OFFSET_TYPE && THRUST_FORCE_64_BIT_OFFSET_TYPE
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h
index 15f2689be657..45f51267ecde 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h
@@ -27,7 +27,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/integer_math.h>
 #include <thrust/detail/preprocessor.h>
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
@@ -39,6 +38,24 @@
 
 #include <string>
 
+THRUST_NAMESPACE_BEGIN
+namespace detail
+{
+template <typename T, _THRUST_STD::enable_if_t<_THRUST_STD::is_arithmetic_v<T>, int> = 0>
+[[nodiscard]] THRUST_HOST_DEVICE constexpr bool is_negative([[maybe_unused]] T x) noexcept
+{
+  if constexpr (_THRUST_STD::is_unsigned_v<T>)
+  {
+    return false;
+  }
+  else
+  {
+    return x < 0;
+  }
+}
+} // namespace detail
+THRUST_NAMESPACE_END
+
 #if defined(THRUST_FORCE_32_BIT_OFFSET_TYPE) && defined(THRUST_FORCE_64_BIT_OFFSET_TYPE)
 #  error "Only THRUST_FORCE_32_BIT_OFFSET_TYPE or THRUST_FORCE_64_BIT_OFFSET_TYPE may be defined!"
 #endif // THRUST_FORCE_32_BIT_OFFSET_TYPE && THRUST_FORCE_64_BIT_OFFSET_TYPE
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h
index ebeec05b01cc..6c8c91706aa5 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h
@@ -41,7 +41,6 @@
 
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/detail/integer_math.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/detail/type_traits.h>
 #  include <thrust/distance.h>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
index abb23f503ce8..1b2728cdfa09 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
@@ -41,7 +41,6 @@
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/alignment.h>
-#  include <thrust/detail/integer_math.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/detail/trivial_sequence.h>
 #  include <thrust/distance.h>

From 8c983457b94fe397550bedd19df4cda898d44cb7 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:27:52 -0400
Subject: [PATCH 03/48] refactor(rocthrust): CCCL 6d3ffc900fb parity - unguard
 libcxx iterator includes

Related upstream commit: 6d3ffc900fb Port `thrust::transform_input_output_iterator` to `cuda` (NVIDIA/cccl#5113)
Related local port commit: 251fd4978d6

libhipcxx is now mandatory, so internal_functional.h includes
::cuda discard_iterator, tabulate_output_iterator and transform_input_output_iterator
unconditionally, as upstream does.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/thrust/detail/internal_functional.h   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
index 1cb23dee05eb..894f3e56ef31 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
@@ -41,10 +41,10 @@
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__iterator/discard_iterator.h)
+#include _THRUST_LIBCXX_INCLUDE(__iterator/tabulate_output_iterator.h)
+#include _THRUST_LIBCXX_INCLUDE(__iterator/transform_input_output_iterator.h)
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(__iterator/discard_iterator.h)
-#  include _THRUST_LIBCXX_INCLUDE(__iterator/tabulate_output_iterator.h)
-#  include _THRUST_LIBCXX_INCLUDE(__iterator/transform_input_output_iterator.h)
 #  include _THRUST_STD_INCLUDE(__new/device_new.h)
 #endif
 

From ac4d3997351ac454197ef3a83aa661cd156c1743 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:28:10 -0400
Subject: [PATCH 04/48] refactor(rocthrust): CCCL 30c02fd29dd parity - use
 _THRUST_STD::remove_cvref_t in pointer

Related upstream commit: 30c02fd29dd Refactor thrust::pointer (NVIDIA/cccl#5478)
Related local port commit: a3de4927b1e

libhipcxx is now mandatory, so thrust::pointer uses _THRUST_STD::remove_cvref_t
(upstream ::cuda::std::remove_cvref_t) instead of the ::internal fallback alias.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h
index fed5fa8df6e6..2e4701529a09 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h
@@ -72,7 +72,7 @@ struct pointer_base
 {
   // void pointers should have no element type
   // note that we remove_cv from the Element type to get the value_type
-  using value_type = typename eval_if<_THRUST_STD::is_void_v<::internal::remove_cvref_t<Element>>,
+  using value_type = typename eval_if<_THRUST_STD::is_void_v<_THRUST_STD::remove_cvref_t<Element>>,
                                       _THRUST_STD::type_identity<void>,
                                       _THRUST_STD::remove_cv<Element>>::type;
 
@@ -85,7 +85,7 @@ struct pointer_base
   // void pointers should have no reference type
   // if no Reference type is given, just use reference
   using reference_type =
-    typename eval_if<_THRUST_STD::is_void_v<::internal::remove_cvref_t<Element>>,
+    typename eval_if<_THRUST_STD::is_void_v<_THRUST_STD::remove_cvref_t<Element>>,
                      _THRUST_STD::type_identity<void>,
                      eval_if<_THRUST_STD::is_same_v<Reference, use_default>,
                              _THRUST_STD::type_identity<reference<Element, derived_type>>,

From 1c5ec9a63918f529123c9512f058160740f719cb Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:28:42 -0400
Subject: [PATCH 05/48] test(rocthrust): CCCL ca57b79824c parity - always run
 libcxx iterator type_traits checks

Related upstream commit: ca57b79824c Inherit `thrust::transform_iterator` traversal from base iterator traversal (NVIDIA/cccl#5883)
Related local port commit: 308ae2c9b5c

libhipcxx is now mandatory, so drop the _THRUST_HAS_DEVICE_SYSTEM_STD guards in
test/test_type_traits.cpp and testing/type_traits.cu: the libcxx_make_{counting,transform,zip}_iterator
propagation combinations and the thrust::pair/tuple relocatability checks always compile, as upstream.
The !_THRUST_HAS_DEVICE_SYSTEM_STD <type_traits> fallback include is removed.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/test/test_type_traits.cpp       | 22 +------------------
 .../hipccl3/rocthrust/testing/type_traits.cu  | 22 +------------------
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/test/test_type_traits.cpp b/projects/hipccl/hipccl3/rocthrust/test/test_type_traits.cpp
index bf588f577f0e..28973201d101 100644
--- a/projects/hipccl/hipccl3/rocthrust/test/test_type_traits.cpp
+++ b/projects/hipccl/hipccl3/rocthrust/test/test_type_traits.cpp
@@ -44,13 +44,7 @@
 
 #include <vector>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(iterator)
-#endif
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_LIBCXX_INCLUDE(iterator)
 
 TESTS_DEFINE(TypeTraitsTests, FullTestsParams);
 
@@ -229,12 +223,10 @@ TEST(TypeTraitsTests, TestTriviallyRelocatable)
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<int, _THRUST_STD::complex<float>, char>>::value,
                 "");
 #endif // THRUST_COMPILER(GCC, >=, 7)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<
                   _THRUST_STD::tuple<thrust::pair<int, thrust::tuple<int, _THRUST_STD::tuple<>>>,
                                      thrust::tuple<_THRUST_STD::pair<int, thrust::tuple<>>, int>>>::value,
                 "");
-#endif
 
   static_assert(!thrust::is_trivially_relocatable<thrust::pair<int, std::string>>::value, "");
   static_assert(!thrust::is_trivially_relocatable<_THRUST_STD::pair<int, std::string>>::value, "");
@@ -243,13 +235,9 @@ TEST(TypeTraitsTests, TestTriviallyRelocatable)
 
   // test propagation of relocatability through pair and tuple
   static_assert(thrust::is_trivially_relocatable<NonTriviallyCopyable>::value, "");
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<thrust::pair<NonTriviallyCopyable, int>>::value, "");
-#endif
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::pair<NonTriviallyCopyable, int>>::value, "");
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<thrust::tuple<NonTriviallyCopyable>>::value, "");
-#endif
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<NonTriviallyCopyable>>::value, "");
 }
 
@@ -317,7 +305,6 @@ struct thrust_make_zip_iterator
   }
 };
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 struct libcxx_make_counting_iterator
 {
   template <typename... Args>
@@ -344,7 +331,6 @@ struct libcxx_make_zip_iterator
     return _THRUST_LIBCXX::make_zip_iterator(_THRUST_STD::forward<Args>(args)...);
   }
 };
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 
 template <typename Iterator>
 inline constexpr bool has_random_access_traversal =
@@ -412,7 +398,6 @@ void check_vector_and_any_system_propagation()
 TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationAnySystem)
 {
   check_any_system_propagation<thrust_make_counting_iterator, thrust_make_transform_iterator, thrust_make_zip_iterator>();
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   check_any_system_propagation<thrust_make_counting_iterator, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_any_system_propagation<thrust_make_counting_iterator, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_any_system_propagation<thrust_make_counting_iterator, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
@@ -420,7 +405,6 @@ TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationAnySystem)
   check_any_system_propagation<libcxx_make_counting_iterator, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_any_system_propagation<libcxx_make_counting_iterator, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_any_system_propagation<libcxx_make_counting_iterator, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 }
 
 TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationVectors)
@@ -428,7 +412,6 @@ TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationVectors)
   check_vector_propagation<thrust::device_vector<int>, thrust_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<thrust::host_vector<int>, thrust_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<std::vector<int>, thrust_make_transform_iterator, thrust_make_zip_iterator>();
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   check_vector_propagation<thrust::device_vector<int>, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_vector_propagation<thrust::device_vector<int>, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<thrust::device_vector<int>, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
@@ -438,7 +421,6 @@ TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationVectors)
   check_vector_propagation<std::vector<int>, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_vector_propagation<std::vector<int>, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<std::vector<int>, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 }
 
 TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationVectorsAndAnySystem)
@@ -446,7 +428,6 @@ TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationVectorsAndAnySyst
   check_vector_and_any_system_propagation<thrust::device_vector<int>, thrust_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<thrust::host_vector<int>, thrust_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<std::vector<int>, thrust_make_counting_iterator, thrust_make_zip_iterator>();
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   check_vector_and_any_system_propagation<thrust::device_vector<int>, thrust_make_counting_iterator, libcxx_make_zip_iterator>();
   check_vector_and_any_system_propagation<thrust::device_vector<int>, libcxx_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<thrust::device_vector<int>, libcxx_make_counting_iterator, libcxx_make_zip_iterator>();
@@ -456,5 +437,4 @@ TEST(TypeTraitsTests, TestIteratorSystemAndTraversalPropagationVectorsAndAnySyst
   check_vector_and_any_system_propagation<std::vector<int>, thrust_make_counting_iterator, libcxx_make_zip_iterator>();
   check_vector_and_any_system_propagation<std::vector<int>, libcxx_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<std::vector<int>, libcxx_make_counting_iterator, libcxx_make_zip_iterator>();
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 }
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu b/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu
index 21492b3b49d1..97f64b35c07f 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu
@@ -43,13 +43,7 @@
 
 #include <vector>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(iterator)
-#endif
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_LIBCXX_INCLUDE(iterator)
 
 void TestIsContiguousIterator()
 {
@@ -222,12 +216,10 @@ void TestTriviallyRelocatable()
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<int, _THRUST_STD::complex<float>, char>>::value,
                 "");
 #endif // THRUST_COMPILER(GCC, >=, 7)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<
                   _THRUST_STD::tuple<thrust::pair<int, thrust::tuple<int, _THRUST_STD::tuple<>>>,
                                      thrust::tuple<_THRUST_STD::pair<int, thrust::tuple<>>, int>>>::value,
                 "");
-#endif
 
   static_assert(!thrust::is_trivially_relocatable<thrust::pair<int, std::string>>::value, "");
   static_assert(!thrust::is_trivially_relocatable<_THRUST_STD::pair<int, std::string>>::value, "");
@@ -236,13 +228,9 @@ void TestTriviallyRelocatable()
 
   // test propagation of relocatability through pair and tuple
   static_assert(thrust::is_trivially_relocatable<NonTriviallyCopyable>::value, "");
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<thrust::pair<NonTriviallyCopyable, int>>::value, "");
-#endif
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::pair<NonTriviallyCopyable, int>>::value, "");
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<thrust::tuple<NonTriviallyCopyable>>::value, "");
-#endif
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<NonTriviallyCopyable>>::value, "");
 };
 DECLARE_UNITTEST(TestTriviallyRelocatable);
@@ -313,7 +301,6 @@ struct thrust_make_zip_iterator
   }
 };
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 struct libcxx_make_counting_iterator
 {
   template <typename... Args>
@@ -340,7 +327,6 @@ struct libcxx_make_zip_iterator
     return _THRUST_LIBCXX::make_zip_iterator(_THRUST_STD::forward<Args>(args)...);
   }
 };
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 
 template <typename Iterator>
 inline constexpr bool has_random_access_traversal =
@@ -408,7 +394,6 @@ void check_vector_and_any_system_propagation()
 void TestIteratorSystemAndTraversalPropagationAnySystem()
 {
   check_any_system_propagation<thrust_make_counting_iterator, thrust_make_transform_iterator, thrust_make_zip_iterator>();
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   check_any_system_propagation<thrust_make_counting_iterator, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_any_system_propagation<thrust_make_counting_iterator, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_any_system_propagation<thrust_make_counting_iterator, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
@@ -416,7 +401,6 @@ void TestIteratorSystemAndTraversalPropagationAnySystem()
   check_any_system_propagation<libcxx_make_counting_iterator, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_any_system_propagation<libcxx_make_counting_iterator, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_any_system_propagation<libcxx_make_counting_iterator, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 };
 DECLARE_UNITTEST(TestIteratorSystemAndTraversalPropagationAnySystem);
 
@@ -425,7 +409,6 @@ void TestIteratorSystemAndTraversalPropagationVectors()
   check_vector_propagation<thrust::device_vector<int>, thrust_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<thrust::host_vector<int>, thrust_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<std::vector<int>, thrust_make_transform_iterator, thrust_make_zip_iterator>();
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   check_vector_propagation<thrust::device_vector<int>, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_vector_propagation<thrust::device_vector<int>, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<thrust::device_vector<int>, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
@@ -435,7 +418,6 @@ void TestIteratorSystemAndTraversalPropagationVectors()
   check_vector_propagation<std::vector<int>, thrust_make_transform_iterator, libcxx_make_zip_iterator>();
   check_vector_propagation<std::vector<int>, libcxx_make_transform_iterator, thrust_make_zip_iterator>();
   check_vector_propagation<std::vector<int>, libcxx_make_transform_iterator, libcxx_make_zip_iterator>();
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 };
 DECLARE_UNITTEST(TestIteratorSystemAndTraversalPropagationVectors);
 
@@ -444,7 +426,6 @@ void TestIteratorSystemAndTraversalPropagationVectorsAndAnySystem()
   check_vector_and_any_system_propagation<thrust::device_vector<int>, thrust_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<thrust::host_vector<int>, thrust_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<std::vector<int>, thrust_make_counting_iterator, thrust_make_zip_iterator>();
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   check_vector_and_any_system_propagation<thrust::device_vector<int>, thrust_make_counting_iterator, libcxx_make_zip_iterator>();
   check_vector_and_any_system_propagation<thrust::device_vector<int>, libcxx_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<thrust::device_vector<int>, libcxx_make_counting_iterator, libcxx_make_zip_iterator>();
@@ -454,6 +435,5 @@ void TestIteratorSystemAndTraversalPropagationVectorsAndAnySystem()
   check_vector_and_any_system_propagation<std::vector<int>, thrust_make_counting_iterator, libcxx_make_zip_iterator>();
   check_vector_and_any_system_propagation<std::vector<int>, libcxx_make_counting_iterator, thrust_make_zip_iterator>();
   check_vector_and_any_system_propagation<std::vector<int>, libcxx_make_counting_iterator, libcxx_make_zip_iterator>();
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 };
 DECLARE_UNITTEST(TestIteratorSystemAndTraversalPropagationVectorsAndAnySystem);

From cdf61a23a40de527f76ccaaacbb803c3427793bf Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:29:34 -0400
Subject: [PATCH 06/48] refactor(rocthrust): CCCL abcb70514b7 parity - use
 _THRUST_STD::_If in iterator_facade(_category)

Related upstream commit: abcb70514b7 Refactor thrust::iterator_facade_category (NVIDIA/cccl#5877)
Related local port commit: 42453aa3373

libhipcxx is now mandatory, so iterator_facade_category.h and iterator_facade.h use
_THRUST_STD::_If (upstream ::cuda::std::_If) instead of the ::internal::If fallback from
libcxx_wrapper/std/__type_traits/conditional.h, and iterator_facade.h drops its
!_THRUST_HAS_DEVICE_SYSTEM_STD <cstddef>/<type_traits> fallback includes.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../detail/iterator_facade_category.h         | 47 ++++++++++---------
 .../thrust/iterator/iterator_facade.h         | 12 ++---
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h
index b9664cdbbd06..3b122e711d08 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h
@@ -25,7 +25,6 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/any_system_tag.h>
 #include <thrust/iterator/detail/device_system_tag.h>
@@ -36,6 +35,7 @@
 #include <thrust/iterator/iterator_categories.h>
 #include <thrust/iterator/iterator_traversal_tags.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
 #include _THRUST_STD_INCLUDE(iterator)
 #include _THRUST_STD_INCLUDE(type_traits)
 
@@ -99,42 +99,42 @@ inline constexpr bool is_iterator_category = is_host_iterator_category<T> || is_
 
 // standard system iterators
 template <typename Traversal>
-using iterator_facade_default_category_std = ::internal::If<
+using iterator_facade_default_category_std = _THRUST_STD::_If<
   _THRUST_STD::is_convertible_v<Traversal, forward_traversal_tag>,
-  ::internal::If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
+  _THRUST_STD::_If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
                    _THRUST_STD::random_access_iterator_tag,
-                   ::internal::If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
+                   _THRUST_STD::_If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
                                     _THRUST_STD::bidirectional_iterator_tag,
                                     _THRUST_STD::forward_iterator_tag>>,
-  ::internal::If< // we differ from Boost here
+  _THRUST_STD::_If< // we differ from Boost here
     _THRUST_STD::is_convertible_v<Traversal, single_pass_traversal_tag>,
     _THRUST_STD::input_iterator_tag,
     Traversal>>;
 
 // host system iterators (basically same as standard system iterators)
 template <typename Traversal>
-using iterator_facade_default_category_host = ::internal::If<
+using iterator_facade_default_category_host = _THRUST_STD::_If<
   _THRUST_STD::is_convertible_v<Traversal, forward_traversal_tag>,
-  ::internal::If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
+  _THRUST_STD::_If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
                    random_access_host_iterator_tag,
-                   ::internal::If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
+                   _THRUST_STD::_If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
                                     bidirectional_host_iterator_tag,
                                     forward_host_iterator_tag>>,
-  ::internal::If< // we differ from Boost here
+  _THRUST_STD::_If< // we differ from Boost here
     _THRUST_STD::is_convertible_v<Traversal, single_pass_traversal_tag>,
     input_host_iterator_tag,
     Traversal>>;
 
 // device system iterators
 template <typename Traversal>
-using iterator_facade_default_category_device = ::internal::If<
+using iterator_facade_default_category_device = _THRUST_STD::_If<
   _THRUST_STD::is_convertible_v<Traversal, forward_traversal_tag>,
-  ::internal::If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
+  _THRUST_STD::_If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
                    random_access_device_iterator_tag,
-                   ::internal::If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
+                   _THRUST_STD::_If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
                                     bidirectional_device_iterator_tag,
                                     forward_device_iterator_tag>>,
-  ::internal::If<
+  _THRUST_STD::_If<
     // XXX note we differ from Boost here
     _THRUST_STD::is_convertible_v<Traversal, single_pass_traversal_tag>,
     input_device_iterator_tag,
@@ -146,15 +146,15 @@ using iterator_facade_default_category_any =
   iterator_category_with_system_and_traversal<iterator_facade_default_category_std<Traversal>, any_system_tag, Traversal>;
 
 template <typename System, typename Traversal>
-using iterator_facade_default_category = ::internal::If<
+using iterator_facade_default_category = _THRUST_STD::_If<
   _THRUST_STD::is_convertible_v<System, any_system_tag>,
   iterator_facade_default_category_any<Traversal>,
   // check for host system
-  ::internal::If<
+  _THRUST_STD::_If<
     _THRUST_STD::is_convertible_v<System, host_system_tag>,
     iterator_facade_default_category_host<Traversal>,
     // check for device system
-    ::internal::If<
+    _THRUST_STD::_If<
       _THRUST_STD::is_convertible_v<System, device_system_tag>,
       iterator_facade_default_category_device<Traversal>,
       // if we don't recognize the system, get a standard iterator category and combine it with System & Traversal
@@ -166,17 +166,18 @@ struct iterator_facade_category_impl
   using category = iterator_facade_default_category<System, Traversal>;
 
   // we must be able to deduce both Traversal & System from category, otherwise, munge them all together
-  using type = ::internal::If<_THRUST_STD::is_same_v<Traversal, typename iterator_category_to_traversal<category>::type>
-                                && _THRUST_STD::is_same_v<System, typename iterator_category_to_system<category>::type>,
-                              category,
-                              iterator_category_with_system_and_traversal<category, System, Traversal>>;
+  using type =
+    _THRUST_STD::_If<_THRUST_STD::is_same_v<Traversal, typename iterator_category_to_traversal<category>::type>
+                       && _THRUST_STD::is_same_v<System, typename iterator_category_to_system<category>::type>,
+                     category,
+                     iterator_category_with_system_and_traversal<category, System, Traversal>>;
 };
 
 template <typename CategoryOrSystem, typename CategoryOrTraversal>
 using iterator_facade_category_t =
-  typename ::internal::If<is_iterator_category<CategoryOrTraversal>,
-                          _THRUST_STD::type_identity<CategoryOrTraversal>,
-                          iterator_facade_category_impl<CategoryOrSystem, CategoryOrTraversal>>::type;
+  typename _THRUST_STD::_If<is_iterator_category<CategoryOrTraversal>,
+                            _THRUST_STD::type_identity<CategoryOrTraversal>,
+                            iterator_facade_category_impl<CategoryOrSystem, CategoryOrTraversal>>::type;
 
 } // namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_facade.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_facade.h
index 4e7f19b75827..da8d36d3883f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_facade.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_facade.h
@@ -40,15 +40,9 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/iterator_facade_category.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#  include <type_traits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 
 namespace detail
@@ -57,9 +51,9 @@ namespace detail
 // it's legal to access IteratorFacade2::difference_type
 template <typename IteratorFacade1, typename IteratorFacade2>
 using distance_from_result =
-  ::internal::If<_THRUST_STD::is_convertible_v<IteratorFacade2, IteratorFacade1>,
-                 typename IteratorFacade1::difference_type,
-                 typename IteratorFacade2::difference_type>;
+  _THRUST_STD::_If<_THRUST_STD::is_convertible_v<IteratorFacade2, IteratorFacade1>,
+                   typename IteratorFacade1::difference_type,
+                   typename IteratorFacade2::difference_type>;
 } // namespace detail
 
 /*! \addtogroup iterators

From 7ff15721ac59c274510917058921a2b813866bb6 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:29:57 -0400
Subject: [PATCH 07/48] refactor(rocthrust): CCCL da893945e45 parity - drop
 examples' non-libhipcxx include fallbacks

Related upstream commit: da893945e45 Modernize Thrust examples (NVIDIA/cccl#5670)
Related local port commit: ec8255968b5

libhipcxx is now mandatory, so remove the `#if !_THRUST_HAS_DEVICE_SYSTEM_STD` <iterator>
fallback includes from examples/{repeated,strided,tiled}_range.cu and the <functional>
fallback from examples/minimal_custom_backend.cu (pre-existing, same pattern); the include
lists now match upstream apart from the local include/host_device.h.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/examples/minimal_custom_backend.cu      | 3 ---
 projects/hipccl/hipccl3/rocthrust/examples/repeated_range.cu  | 4 ----
 projects/hipccl/hipccl3/rocthrust/examples/strided_range.cu   | 4 ----
 projects/hipccl/hipccl3/rocthrust/examples/tiled_range.cu     | 4 ----
 4 files changed, 15 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/examples/minimal_custom_backend.cu b/projects/hipccl/hipccl3/rocthrust/examples/minimal_custom_backend.cu
index 2c294d13ebdf..4e119aceae66 100644
--- a/projects/hipccl/hipccl3/rocthrust/examples/minimal_custom_backend.cu
+++ b/projects/hipccl/hipccl3/rocthrust/examples/minimal_custom_backend.cu
@@ -25,9 +25,6 @@
 #include <thrust/transform.h>
 
 #include <iostream>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <functional>
-#endif
 
 // This example demonstrates how to build a minimal custom
 // Thrust backend by intercepting for_each's dispatch.
diff --git a/projects/hipccl/hipccl3/rocthrust/examples/repeated_range.cu b/projects/hipccl/hipccl3/rocthrust/examples/repeated_range.cu
index cc72f8d3ed39..7586fb4f4acb 100644
--- a/projects/hipccl/hipccl3/rocthrust/examples/repeated_range.cu
+++ b/projects/hipccl/hipccl3/rocthrust/examples/repeated_range.cu
@@ -30,10 +30,6 @@
 
 #include "include/host_device.h"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 // this example illustrates how to make repeated access to a range of values
 // examples:
 //   repeated_range([0, 1, 2, 3], 1) -> [0, 1, 2, 3]
diff --git a/projects/hipccl/hipccl3/rocthrust/examples/strided_range.cu b/projects/hipccl/hipccl3/rocthrust/examples/strided_range.cu
index 484b0575d0d0..5c52a74fc20c 100644
--- a/projects/hipccl/hipccl3/rocthrust/examples/strided_range.cu
+++ b/projects/hipccl/hipccl3/rocthrust/examples/strided_range.cu
@@ -30,10 +30,6 @@
 
 #include "include/host_device.h"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 // this example illustrates how to make strided access to a range of values
 // examples:
 //   strided_range([0, 1, 2, 3, 4, 5, 6], 1) -> [0, 1, 2, 3, 4, 5, 6]
diff --git a/projects/hipccl/hipccl3/rocthrust/examples/tiled_range.cu b/projects/hipccl/hipccl3/rocthrust/examples/tiled_range.cu
index 6cd35c8b474a..ba5b707c7e30 100644
--- a/projects/hipccl/hipccl3/rocthrust/examples/tiled_range.cu
+++ b/projects/hipccl/hipccl3/rocthrust/examples/tiled_range.cu
@@ -30,10 +30,6 @@
 
 #include "include/host_device.h"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 // this example illustrates how to tile a range multiple times
 // examples:
 //   tiled_range([0, 1, 2, 3], 1) -> [0, 1, 2, 3]

From 915d0c3ac1a7f3af4cca54b4e20c3a2d36b4c005 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:30:20 -0400
Subject: [PATCH 08/48] refactor(rocthrust): CCCL bb718514624 parity - granular
 max/min includes in xor_combine_engine_max

Related upstream commit: bb718514624 Drop Thrust mpl math (NVIDIA/cccl#5897)
Related local port commit: 1a7094e7ee7

Include _THRUST_STD_INCLUDE(__algorithm/max.h) and __algorithm/min.h instead of the
<algorithm> and <type_traits> umbrella headers, as upstream (both granular headers exist in
libhipcxx, which is now mandatory). The host <cstddef> include is kept for the unqualified size_t.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/random/detail/xor_combine_engine_max.h   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h
index f324f569e73a..17c3671d060b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h
@@ -28,9 +28,9 @@
 
 #include <thrust/detail/type_traits.h>
 
-#include _THRUST_STD_INCLUDE(algorithm)
+#include _THRUST_STD_INCLUDE(__algorithm/max.h)
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
 #include _THRUST_STD_INCLUDE(limits)
-#include _THRUST_STD_INCLUDE(type_traits)
 
 #include <cstddef>
 

From abd50e5c3e3bcc628b3ca8515101cc737b119d9a Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:30:38 -0400
Subject: [PATCH 09/48] refactor(rocthrust): CCCL 1ceac3731d5 parity - libcxx
 address_stability in internal_functional

Related upstream commit: 1ceac3731d5 Improve `thrust::cuda_cub::replace` functor handling (NVIDIA/cccl#5949)
Related local port commit: 3adee1d8a8f

libhipcxx is now mandatory, so internal_functional.h includes
_THRUST_LIBCXX_INCLUDE(__functional/address_stability.h) directly (upstream
<cuda/__functional/address_stability.h>) instead of the libcxx_wrapper header, and the
proclaims_copyable_arguments specializations for predicate_to_integral, tuple_binary_predicate and
new_value_if_f are only declared in the libcxx namespace (the `namespace internal` fallback is removed).

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/detail/internal_functional.h     | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
index 894f3e56ef31..eac2e4730495 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
@@ -31,7 +31,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/__functional/address_stability.h>
 #include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 #include <thrust/detail/memory_wrapper.h> // for ::new
 #include <thrust/detail/raw_reference_cast.h>
@@ -41,6 +40,7 @@
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__functional/address_stability.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/discard_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/tabulate_output_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/transform_input_output_iterator.h)
@@ -315,12 +315,7 @@ struct compare_first
 } // end namespace detail
 THRUST_NAMESPACE_END
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_LIBCXX_NAMESPACE_BEGIN
-#else
-namespace internal
-{
-#endif
 template <typename Predicate, typename IntegralType>
 struct proclaims_copyable_arguments<THRUST_NS_QUALIFIER::detail::predicate_to_integral<Predicate, IntegralType>>
     : proclaims_copyable_arguments<Predicate>
@@ -335,8 +330,4 @@ template <class Predicate, class NewType, class OutputType>
 struct proclaims_copyable_arguments<THRUST_NS_QUALIFIER::detail::new_value_if_f<Predicate, NewType, OutputType>>
     : proclaims_copyable_arguments<Predicate>
 {};
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_LIBCXX_NAMESPACE_END
-#else
-} // namespace internal
-#endif

From f4f0b902e96c7f7f9f8d59682eb509e7df887379 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:31:09 -0400
Subject: [PATCH 10/48] refactor(rocthrust): CCCL 700f2a867a7 + fbb9479172c
 parity - drop allocator <type_traits> fallbacks

Related upstream commit: 700f2a867a7 Refactor Thrust `destroy_range` and `device_[new|delete|free]` (NVIDIA/cccl#6134)
Related upstream commit: fbb9479172c Refactor Thrust allocator internals (NVIDIA/cccl#6136)
Related local port commits: 63becda559e, 17ee2337617

libhipcxx is now mandatory, so remove the `#if !_THRUST_HAS_DEVICE_SYSTEM_STD` <type_traits>
fallbacks from detail/allocator/{destroy_range,value_initialize_range,fill_construct_range,
copy_construct_range}.h, detail/temporary_array.h and detail/execute_with_allocator.h, and add the
upstream granular _THRUST_STD_INCLUDE headers (__iterator/advance.h, __iterator/distance.h,
__type_traits/is_convertible.h, __type_traits/is_trivially_copy_constructible.h,
__type_traits/type_identity.h, __utility/pair.h).
thrust/detail/memory_wrapper.h stays: <cuda/std/__cccl/memory_wrapper.h> is not in libhipcxx.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/detail/allocator/copy_construct_range.h         | 7 ++++---
 .../rocthrust/thrust/detail/allocator/destroy_range.h      | 4 ----
 .../thrust/detail/allocator/fill_construct_range.h         | 4 ----
 .../thrust/detail/allocator/value_initialize_range.h       | 4 ----
 .../rocthrust/thrust/detail/execute_with_allocator.h       | 5 +----
 .../hipccl3/rocthrust/thrust/detail/temporary_array.h      | 5 ++---
 6 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
index 1113e18912e2..bcd9dbfd1f0f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
@@ -38,9 +38,10 @@
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/tuple.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_trivially_copy_constructible.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h
index 5e9d9714fec6..b18b57423bde 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h
@@ -32,10 +32,6 @@
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/for_each.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h
index 9f8714cfc84c..b86b2ae17193 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h
@@ -33,10 +33,6 @@
 #include <thrust/for_each.h>
 #include <thrust/uninitialized_fill.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h
index 3ce6a09b104a..ad475be802e3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h
@@ -32,10 +32,6 @@
 #include <thrust/for_each.h>
 #include <thrust/uninitialized_fill.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
index 4160c1a02881..e2b2e823fb29 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
@@ -33,10 +33,7 @@
 #include <thrust/pair.h>
 
 #include _THRUST_LIBCXX_INCLUDE(__cmath/ceil_div.h)
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
index a66f234f318c..e35324d6b2de 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
@@ -49,9 +49,8 @@ THRUST_NAMESPACE_END
 #include <thrust/iterator/detail/tagged_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail

From 2b88e3bda026fd50852d9fc666ba71982969cd06 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:31:49 -0400
Subject: [PATCH 11/48] refactor(rocthrust): CCCL 1238f287f4f parity - granular
 includes and ceil_div in omp/tbb scan

Related upstream commit: 1238f287f4f add parallel scan support for TBB and OMP (NVIDIA/cccl#6178)
Related upstream commit: e73cc82956a Move CPP, OMP and TBB exec policies to detail (NVIDIA/cccl#6361)
Related upstream commit: c22298179e0 Refactor Thrust OMP system headers (NVIDIA/cccl#6372)
Related local port commits: 6cb9dc423de, 43961eaecc2, e6c2a3e0f4f

libhipcxx is now mandatory, so:
- system/omp/detail/scan.h: replace the <algorithm>/<iterator>/<numeric>/<type_traits> umbrella
  includes and thrust/{advance,distance}.h with the upstream granular headers
  (__cmath/ceil_div.h, __functional/invoke.h, __iterator/{advance,distance}.h,
  __numeric/{exclusive_scan,inclusive_scan,reduce}.h, __type_traits/{conditional,is_same}.h; plus
  __algorithm/{max,min}.h for the max/min calls), and compute block_size with
  _THRUST_LIBCXX::ceil_div(n, num_threads) as upstream.
- system/tbb/detail/scan.h: thrust/{advance,distance}.h -> _THRUST_STD __iterator/{advance,distance}.h.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/system/omp/detail/scan.h | 21 ++++++++++++-------
 .../rocthrust/thrust/system/tbb/detail/scan.h |  4 ++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
index 8650550bb9b0..b6df35222431 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
@@ -15,18 +15,23 @@
 #endif // no system header
 
 // OMP parallel scan implementation
-#include <thrust/advance.h>
 #include <thrust/detail/function.h>
 #include <thrust/detail/temporary_array.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 #include <thrust/system/omp/detail/pragma_omp.h>
 
-#include _THRUST_STD_INCLUDE(algorithm)
-#include _THRUST_STD_INCLUDE(iterator)
-#include _THRUST_STD_INCLUDE(numeric)
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_LIBCXX_INCLUDE(__cmath/ceil_div.h)
+#include _THRUST_STD_INCLUDE(__algorithm/max.h)
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#include _THRUST_STD_INCLUDE(__functional/invoke.h)
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__numeric/exclusive_scan.h)
+#include _THRUST_STD_INCLUDE(__numeric/inclusive_scan.h)
+#include _THRUST_STD_INCLUDE(__numeric/reduce.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
 
 #include <omp.h>
 
@@ -101,7 +106,7 @@ OutputIterator scan_impl(
   THRUST_PRAGMA_OMP(parallel num_threads(num_threads))
   {
     const int tid         = omp_get_thread_num();
-    const Size block_size = (n + num_threads - 1) / num_threads;
+    const Size block_size = _THRUST_LIBCXX::ceil_div(n, num_threads);
     const Size start      = tid * block_size;
     const Size end        = _THRUST_STD::min(start + block_size, n);
 
@@ -130,7 +135,7 @@ OutputIterator scan_impl(
   THRUST_PRAGMA_OMP(parallel num_threads(num_threads))
   {
     const int tid         = omp_get_thread_num();
-    const Size block_size = (n + num_threads - 1) / num_threads;
+    const Size block_size = _THRUST_LIBCXX::ceil_div(n, num_threads);
     const Size start      = tid * block_size;
     const Size end        = _THRUST_STD::min(start + block_size, n);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/scan.h
index e64bb7027484..89d759b50d60 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/scan.h
@@ -16,14 +16,14 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/advance.h>
 #include <thrust/detail/function.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 #include _THRUST_STD_INCLUDE(__functional/invoke.h)
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_scan.h>

From 5bdd5a9dbef56fc3d03b85dbefe96a626d421784 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:31:56 -0400
Subject: [PATCH 12/48] fix(rocthrust): CCCL 26c79caf60e parity - restore
 _CCCL_ASSERT in omp scan

Related upstream commit: 26c79caf60e fix omp scan bug (#6560) (NVIDIA/cccl#6704)
Related local port commit: ffd4daf4f90

The port replaced `_CCCL_ASSERT(num_threads > 1, ...)` with a comment because the macro was
assumed unavailable. libhipcxx (now mandatory) provides _CCCL_ASSERT (cuda/std/__cccl/assert.h,
reached via thrust/detail/config.h), so restore the upstream assertion.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
index b6df35222431..e5bf833e65bf 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
@@ -98,7 +98,7 @@ OutputIterator scan_impl(
     }
   }
 
-  // Parallel scan requires multiple threads (num_threads > 1 is guaranteed above).
+  _CCCL_ASSERT(num_threads > 1, "Parallel scan requires multiple threads");
 
   temporary_array<accum_t, DerivedPolicy> block_sums(exec, num_threads);
 

From 50c1d6d0b67484539a21b357fc9a26596a862aec Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:32:19 -0400
Subject: [PATCH 13/48] refactor(rocthrust): CCCL 638c03d54f7 parity - use
 _THRUST_STD::popcount in hip set_operations

Related upstream commit: 638c03d54f7 Replace __popc with cude::std::popcounter (NVIDIA/cccl#6213)
Related local port commit: baac4061517

The port changed only system/cuda. libhipcxx is now mandatory, so system/hip/detail/set_operations.h
follows upstream: thread_output_count uses
_THRUST_STD::popcount(static_cast<unsigned>(active_mask)) instead of the __popc intrinsic,
includes _THRUST_STD_INCLUDE(__bit/popcount.h), and the max/min includes are no longer guarded
(the !_THRUST_HAS_DEVICE_SYSTEM_STD algorithm_wrapper.h fallback is removed).

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/hip/detail/set_operations.h        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
index 41a6935b22e2..baaea64ee2d0 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
@@ -50,14 +50,10 @@
 #  include <thrust/system/hip/detail/get_value.h>
 #  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
-#  if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#    include <thrust/detail/algorithm_wrapper.h>
-#  endif
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#    include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#  endif
+#  include _THRUST_STD_INCLUDE(__algorithm/max.h)
+#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#  include _THRUST_STD_INCLUDE(__bit/popcount.h)
 
 #  include <rocprim/rocprim.hpp>
 
@@ -460,7 +456,7 @@ struct SetOpAgent
     Size tile_output_count    = 0;
     Size thread_output_prefix = 0;
     Size tile_output_prefix   = 0;
-    Size thread_output_count  = static_cast<Size>(__popc(active_mask));
+    Size thread_output_count  = static_cast<Size>(_THRUST_STD::popcount(static_cast<unsigned>(active_mask)));
 
     if (tile_idx == 0) // first tile
     {

From 60de061637b999b98543891a66a21967a75ce850 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:32:50 -0400
Subject: [PATCH 14/48] refactor(rocthrust): CCCL c859e948453 parity - drop
 non-libhipcxx paths in detail/type_traits.h

Related upstream commit: c859e948453 Improve `invoke` machinery (NVIDIA/cccl#6227)
Related local port commit: 33e87b68197 (pre-rebase SHA; folded into the rebased history)

The port switched only the libhipcxx branch to _THRUST_STD::invoke_result and left the
"TODO(libhipcxx): remove this path" rocprim/std fallbacks. libhipcxx is now mandatory, so
thrust::detail::invoke_result is just _THRUST_STD::invoke_result as upstream, and the dead
rocprim/std fallbacks for the ::internal aliases (is_arithmetic, is_integral, make_unsigned,
decay_t, remove_cvref, ...), ::internal::detail::common_type and the
<rocprim/type_traits_functions.hpp> include are removed. The ::internal aliases themselves stay
for now (they still have users).

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/detail/type_traits.h     | 92 -------------------
 1 file changed, 92 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
index aa076167d44a..08072b58904a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
@@ -36,17 +36,9 @@
 
 #include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD && _THRUST_USE_ROCPRIM
-// #  include <rocprim/type_traits.hpp>
-#  include <rocprim/type_traits_functions.hpp>
-#endif // !_THRUST_HAS_DEVICE_SYSTEM_STD
-
 // TODO(libhipcxx): remove this namespace once libhipcxx gets ready
 namespace internal
 {
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
 using _THRUST_STD::is_arithmetic;
 using _THRUST_STD::is_integral;
 using _THRUST_STD::is_integral_v;
@@ -61,35 +53,6 @@ template <typename T>
 using remove_cvref = _THRUST_STD::remove_cvref<T>;
 template <typename T>
 using remove_cvref_t = _THRUST_STD::remove_cvref_t<T>;
-
-#else // !_THRUST_HAS_DEVICE_SYSTEM_STD
-
-// TODO: Use rocprim version of is_arithmetic, is_integral, make_unsigned and make_unsigned_t for consistency.
-// However, replacing with rocprim::is_arithmetic currently causes issues.
-// Keeping standard versions for now until compatibility is resolved.
-using ::std::is_arithmetic;
-using ::std::is_integral;
-using ::std::is_integral_v;
-using ::std::make_unsigned;
-
-template <typename T>
-using make_unsigned_t = typename ::std::make_unsigned<T>::type;
-
-template <typename T>
-// If we're not on Windows and we have libstdc++ >= 10, we can use the __decay_t
-// builtin to reduce compilation time.
-#  if defined(_WIN32) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 10)
-using decay_t = ::std::decay_t<T>;
-#  else
-using decay_t = ::std::__decay_t<T>;
-#  endif
-template <typename T>
-using remove_cvref = ::std::remove_cv<::std::remove_reference_t<T>>;
-template <typename T>
-using remove_cvref_t = ::std::remove_cv_t<::std::remove_reference_t<T>>;
-
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
-
 } // namespace internal
 
 THRUST_NAMESPACE_BEGIN
@@ -182,15 +145,7 @@ struct larger_type
 {};
 
 template <class F, class... Us>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 using invoke_result = _THRUST_STD::invoke_result<F, Us...>;
-#else // TODO(libhipcxx): remove this path of code once libhipcxx gets ready
-#  if _THRUST_USE_ROCPRIM
-using invoke_result = ::rocprim::invoke_result<F, Us...>;
-#  else
-using invoke_result = ::std::invoke_result<F, Us...>;
-#  endif
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 
 template <class F, class... Us>
 using invoke_result_t = typename invoke_result<F, Us...>::type;
@@ -229,53 +184,6 @@ THRUST_NAMESPACE_END
 // with _THRUST_STD::common_type_t in rocThrust once libhipcxx gets ready
 namespace internal
 {
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
 template <typename... Tp>
 using common_type_t = _THRUST_STD::common_type_t<Tp...>;
-
-#else // !_THRUST_HAS_DEVICE_SYSTEM_STD
-
-namespace detail
-{
-
-template <typename T1, typename T2, typename Enable = void>
-struct common_type;
-
-template <typename T1, typename T2>
-struct common_type<T1,
-                   T2,
-                   typename _THRUST_STD::enable_if<_And<typename _THRUST_STD::is_floating_point<T1>::type,
-                                                        typename _THRUST_STD::is_floating_point<T2>::type>::value>::type>
-{
-  using type = typename THRUST_NS_QUALIFIER::detail::larger_type<T1, T2>::type;
-};
-
-template <typename T1, typename T2>
-struct common_type<
-  T1,
-  T2,
-  typename _THRUST_STD::enable_if<
-    _And<typename is_integral<T1>::type, typename _THRUST_STD::is_floating_point<T2>::type>::value>::type>
-{
-  using type = T2;
-};
-
-template <typename T1, typename T2>
-struct common_type<T1,
-                   T2,
-                   typename _THRUST_STD::enable_if<_And<typename _THRUST_STD::is_floating_point<T1>::type,
-                                                        typename is_integral<T2>::type>::value>::type>
-{
-  using type = T1;
-};
-
-} // namespace detail
-
-template <typename... Tp>
-using common_type_t = typename detail::common_type<Tp...>::type;
-
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
-
 } // namespace internal

From 94645af4bd5419476e4b00fd4d63fbb6b990176b Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:33:30 -0400
Subject: [PATCH 15/48] refactor(rocthrust): CCCL 13886f72f16 parity - use
 _CCCL_HOST_STD_LIB in is_contiguous_iterator

Related upstream commit: 13886f72f16 Add host standard library detection (NVIDIA/cccl#6244)
Related local port commit: 1a0de38dff5

The port was N/A because _CCCL_HOST_STD_LIB was unavailable without libhipcxx. libhipcxx is now
mandatory and provides it (cuda/std/__cccl/host_std_lib.h, via the libcxx config headers), so
is_contiguous_iterator.h detects libc++, libstdc++ and the MSVC STL with
_CCCL_HOST_STD_LIB(LIBCXX/LIBSTDCXX/STL) instead of
defined(_LIBCPP_VERSION)/defined(__GLIBCXX__)/defined(_MSC_VER), as upstream.
Note: the old "Use defined(_MSC_VER) due to Windows CI failures" workaround is dropped; please
check Windows CI.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/type_traits/is_contiguous_iterator.h   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h
index 683abdc6edf4..96defbdb1c11 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h
@@ -83,7 +83,7 @@ namespace detail
 template <typename Iterator>
 inline constexpr bool is_libcxx_wrap_iter_v = false;
 
-#if defined(_LIBCPP_VERSION)
+#if _CCCL_HOST_STD_LIB(LIBCXX)
 template <typename Iterator>
 inline constexpr bool is_libcxx_wrap_iter_v<
 #  if _LIBCPP_VERSION < 14000
@@ -92,24 +92,23 @@ inline constexpr bool is_libcxx_wrap_iter_v<
   std::__wrap_iter<Iterator>
 #  endif
   > = true;
-#endif
+#endif // _CCCL_HOST_STD_LIB(LIBCXX)
 
 template <typename Iterator>
 inline constexpr bool is_libstdcxx_normal_iterator_v = false;
 
-#if defined(__GLIBCXX__)
+#if _CCCL_HOST_STD_LIB(LIBSTDCXX)
 template <typename Iterator, typename Container>
 inline constexpr bool is_libstdcxx_normal_iterator_v<::__gnu_cxx::__normal_iterator<Iterator, Container>> = true;
-#endif
+#endif // _CCCL_HOST_STD_LIB(LIBSTDCXX)
 
-// Use defined(_MSC_VER) due to Windows CI failures
-#if defined(_MSC_VER)
+#if _CCCL_HOST_STD_LIB(STL)
 template <typename Iterator>
 inline constexpr bool is_msvc_contiguous_iterator_v = _THRUST_STD::is_pointer_v<::std::_Unwrapped_t<Iterator>>;
-#else
+#else // ^^^ _CCCL_HOST_STD_LIB(STL) ^^^ / vvv !_CCCL_HOST_STD_LIB(STL) vvv
 template <typename Iterator>
 inline constexpr bool is_msvc_contiguous_iterator_v = false;
-#endif
+#endif // ^^^ !_CCCL_HOST_STD_LIB(STL) ^^^
 
 template <typename Iterator>
 inline constexpr bool is_contiguous_iterator_impl_v =

From c2dcaad1bab26035d9449dc46ecd9c889f1ec213 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:33:58 -0400
Subject: [PATCH 16/48] refactor(rocthrust): CCCL f1b4a17019b parity - always
 include __new/device_new.h

Related upstream commit: f1b4a17019b Always include `<new>` when we need operator new for clang-cuda (NVIDIA/cccl#6310)
Related local port commit: 5c1c329ec84

libhipcxx is now mandatory, so:
- detail/internal_functional.h and system/detail/generic/uninitialized_copy.inl include
  _THRUST_STD_INCLUDE(__new/device_new.h) unconditionally (the generic .inl also drops its
  !_THRUST_HAS_DEVICE_SYSTEM_STD <type_traits> fallback).
- system/hip/detail/uninitialized_{copy,fill}.h now include __new/device_new.h like their
  system/cuda counterparts, since they also use placement ::new in device code (clang-based HIP has
  the same need as clang-cuda).

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/thrust/detail/internal_functional.h   | 4 +---
 .../thrust/system/detail/generic/uninitialized_copy.inl     | 6 +-----
 .../rocthrust/thrust/system/hip/detail/uninitialized_copy.h | 2 ++
 .../rocthrust/thrust/system/hip/detail/uninitialized_fill.h | 2 ++
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
index eac2e4730495..f0f6682266c8 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
@@ -44,9 +44,7 @@
 #include _THRUST_LIBCXX_INCLUDE(__iterator/discard_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/tabulate_output_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/transform_input_output_iterator.h)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__new/device_new.h)
-#endif
+#include _THRUST_STD_INCLUDE(__new/device_new.h)
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl
index f389068fbf51..e5903b73c474 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl
@@ -32,11 +32,7 @@
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/uninitialized_copy.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__new/device_new.h)
-#else
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__new/device_new.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
index ac30f78eafa9..d63f2da79dbc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
@@ -43,6 +43,8 @@
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__new/device_new.h)
+
 #  include <iterator>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
index c7e8dcad34e6..a08ecddcb034 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
@@ -43,6 +43,8 @@
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__new/device_new.h)
+
 #  include <iterator>
 
 THRUST_NAMESPACE_BEGIN

From cbade59e1b348b9aa9dbbac81b7cf8a605b922cb Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:34:35 -0400
Subject: [PATCH 17/48] refactor(rocthrust): CCCL 52eb28883c4 parity - simplify
 zip_function with _THRUST_STD::apply

Related upstream commit: 52eb28883c4 Simplify thrust::zip_function (NVIDIA/cccl#6321)
Related local port commit: 0d3216d8a35
Also related: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538) (the namespace fallback removed below)

The port kept the local zip_detail::apply helper and the non-libhipcxx `namespace internal` path
for compatibility. libhipcxx is now mandatory, so zip_function.h now matches upstream:
- zip_function::operator() returns _THRUST_STD::apply(func, _THRUST_STD::forward<Tuple>(args));
  thrust::detail::zip_detail::{apply,apply_impl} are removed.
- include _THRUST_LIBCXX_INCLUDE(functional) and _THRUST_STD_INCLUDE(tuple) instead of
  thrust/tuple.h, thrust/type_traits/integer_sequence.h and the libcxx_wrapper fallback.
- the proclaims_copyable_arguments<zip_function<F>> specialization is only declared in the libcxx
  namespace (_THRUST_LIBCXX_NAMESPACE_BEGIN/END).
The leftover "C++11 decltype(auto) workaround" comments are removed as upstream did.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/thrust/zip_function.h   | 47 ++-----------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/zip_function.h b/projects/hipccl/hipccl3/rocthrust/thrust/zip_function.h
index a6fad4a0eaf7..06a89bbb6b59 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/zip_function.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/zip_function.h
@@ -37,14 +37,9 @@
 #endif // no system header
 
 #include <thrust/detail/type_deduction.h>
-#include <thrust/tuple.h>
-#include <thrust/type_traits/integer_sequence.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(functional)
-#else
-#  include <thrust/detail/libcxx_wrapper/__functional/address_stability.h>
-#endif
+#include _THRUST_LIBCXX_INCLUDE(functional)
+#include _THRUST_STD_INCLUDE(tuple)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -57,29 +52,6 @@ THRUST_NAMESPACE_BEGIN
  *  \{
  */
 
-namespace detail
-{
-namespace zip_detail
-{
-
-// Add workaround for decltype(auto) on C++11-only compilers:
-THRUST_EXEC_CHECK_DISABLE
-template <typename Function, typename Tuple, std::size_t... Is>
-THRUST_HOST_DEVICE decltype(auto) apply_impl(Function&& func, Tuple&& args, index_sequence<Is...>)
-{
-  return func(thrust::get<Is>(THRUST_FWD(args))...);
-}
-
-template <typename Function, typename Tuple>
-THRUST_HOST_DEVICE decltype(auto) apply(Function&& func, Tuple&& args)
-{
-  constexpr auto tuple_size = thrust::tuple_size<_THRUST_STD::decay_t<Tuple>>::value;
-  return apply_impl(THRUST_FWD(func), THRUST_FWD(args), make_index_sequence<tuple_size>{});
-}
-
-} // namespace zip_detail
-} // namespace detail
-
 /*! \p zip_function is a function object that allows the easy use of N-ary
  *  function objects with \p zip_iterators without redefining them to take a
  *  \p tuple instead of N arguments.
@@ -148,18 +120,14 @@ class zip_function
   //! Default constructs the contained function object.
   zip_function() = default;
 
-  /*! Constructs a \p zip_function with the provided function object \p func. */
   THRUST_HOST_DEVICE zip_function(Function func)
       : func(_THRUST_STD::move(func))
   {}
 
-  /*! Applies the N-ary function object to elements of the tuple \p args. */
-  // Add workaround for decltype(auto) on C++11-only compilers:
-
   template <typename Tuple>
   THRUST_HOST_DEVICE decltype(auto) operator()(Tuple&& args) const
   {
-    return detail::zip_detail::apply(func, THRUST_FWD(args));
+    return _THRUST_STD::apply(func, _THRUST_STD::forward<Tuple>(args));
   }
 
   //! Returns a reference to the underlying function.
@@ -194,17 +162,8 @@ THRUST_HOST_DEVICE zip_function<_THRUST_STD::decay_t<Function>> make_zip_functio
 
 THRUST_NAMESPACE_END
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_LIBCXX_NAMESPACE_BEGIN
-#else
-namespace internal
-{
-#endif
 template <typename F>
 struct proclaims_copyable_arguments<THRUST_NS_QUALIFIER::zip_function<F>> : proclaims_copyable_arguments<F>
 {};
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_LIBCXX_NAMESPACE_END
-#else
-} // namespace internal
-#endif

From 0cdce5c48fb227893256fd7c22835b57410fbe5f Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:35:48 -0400
Subject: [PATCH 18/48] refactor(rocthrust): CCCL 81b9aa5f1cc parity - remove
 the non-libhipcxx thrust::tuple/pair implementation

Related upstream commit: 81b9aa5f1cc Move the implementation of `tuple` into its own file (NVIDIA/cccl#6336)
Related local port commit: fe7ee5f965e

Upstream thrust::tuple/thrust::pair are only aliases of ::cuda::std::tuple/pair. rocThrust still
carried the old standalone implementation behind `#if !_THRUST_HAS_DEVICE_SYSTEM_STD`
("TODO(libhipcxx): remove this path"). libhipcxx is now mandatory, so:
- thrust/tuple.h and thrust/pair.h keep only the _THRUST_STD alias branch, as upstream.
- delete thrust/detail/tuple.inl and thrust/detail/pair.inl (only included by the removed branch).
- drop the fallback <cstddef>/<type_traits>/<utility> includes and the fallback explanation comment.
The local THRUST_DOXYGEN_INVOKED spelling and the _THRUST_STD_INCLUDE(utility) include in pair.h are kept.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/thrust/detail/pair.inl  |  232 ----
 .../hipccl3/rocthrust/thrust/detail/tuple.inl | 1042 -----------------
 .../hipccl/hipccl3/rocthrust/thrust/pair.h    |  271 +----
 .../hipccl/hipccl3/rocthrust/thrust/tuple.h   |  798 +------------
 4 files changed, 18 insertions(+), 2325 deletions(-)
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/detail/pair.inl
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/detail/tuple.inl

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/pair.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/pair.inl
deleted file mode 100644
index 9faa2e2429aa..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/pair.inl
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *  Copyright 2008-2021 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config.h>
-
-#include <thrust/pair.h>
-#include <thrust/tuple.h>
-
-THRUST_NAMESPACE_BEGIN
-
-template <typename T1, typename T2>
-  THRUST_HOST_DEVICE
-  pair<T1,T2>
-    ::pair(void)
-      :first(),second()
-{
-  ;
-} // end pair::pair()
-
-
-template <typename T1, typename T2>
-  THRUST_HOST_DEVICE
-  pair<T1,T2>
-    ::pair(const T1 &x, const T2 &y)
-      :first(x),second(y)
-{
-  ;
-} // end pair::pair()
-
-
-template <typename T1, typename T2>
-  template <typename U1, typename U2>
-    THRUST_HOST_DEVICE
-    pair<T1,T2>
-      ::pair(const pair<U1,U2> &p)
-        :first(p.first),second(p.second)
-{
-  ;
-} // end pair::pair()
-
-
-template <typename T1, typename T2>
-  template <typename U1, typename U2>
-    THRUST_HOST_DEVICE
-    pair<T1,T2>
-      ::pair(const std::pair<U1,U2> &p)
-        :first(p.first),second(p.second)
-{
-  ;
-} // end pair::pair()
-
-
-template<typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    void pair<T1,T2>
-      ::swap(thrust::pair<T1,T2> &p)
-{
-  using thrust::swap;
-
-  swap(first, p.first);
-  swap(second, p.second);
-} // end pair::swap()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    bool operator==(const pair<T1,T2> &x, const pair<T1,T2> &y)
-{
-  return x.first == y.first && x.second == y.second;
-} // end operator==()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    bool operator<(const pair<T1,T2> &x, const pair<T1,T2> &y)
-{
-  return x.first < y.first || (!(y.first < x.first) && x.second < y.second);
-} // end operator<()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    bool operator!=(const pair<T1,T2> &x, const pair<T1,T2> &y)
-{
-  return !(x == y);
-} // end operator==()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    bool operator>(const pair<T1,T2> &x, const pair<T1,T2> &y)
-{
-  return y < x;
-} // end operator<()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    bool operator<=(const pair<T1,T2> &x, const pair<T1,T2> &y)
-{
-  return !(y < x);
-} // end operator<=()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    bool operator>=(const pair<T1,T2> &x, const pair<T1,T2> &y)
-{
-  return !(x < y);
-} // end operator>=()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    void swap(pair<T1,T2> &x, pair<T1,T2> &y)
-{
-  return x.swap(y);
-} // end swap()
-
-
-template <typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    pair<T1,T2> make_pair(T1 x, T2 y)
-{
-  return pair<T1,T2>(x,y);
-} // end make_pair()
-
-
-// specializations of tuple_element for pair
-template<typename T1, typename T2>
-  struct tuple_element<0, pair<T1,T2>>
-{
-  using type = T1;
-}; // end tuple_element
-
-template<typename T1, typename T2>
-  struct tuple_element<1, pair<T1,T2>>
-{
-  using type = T2;
-}; // end tuple_element
-
-
-// specialization of tuple_size for pair
-template<typename T1, typename T2>
-  struct tuple_size<pair<T1,T2>>
-{
-  static const unsigned int value = 2;
-}; // end tuple_size
-
-
-
-namespace detail
-{
-
-
-template<int N, typename Pair> struct pair_get {};
-
-template<typename Pair>
-  struct pair_get<0, Pair>
-{
-  inline THRUST_HOST_DEVICE
-    const typename tuple_element<0, Pair>::type &
-      operator()(const Pair &p) const
-  {
-    return p.first;
-  } // end operator()()
-
-  inline THRUST_HOST_DEVICE
-    typename tuple_element<0, Pair>::type &
-      operator()(Pair &p) const
-  {
-    return p.first;
-  } // end operator()()
-}; // end pair_get
-
-
-template<typename Pair>
-  struct pair_get<1, Pair>
-{
-  inline THRUST_HOST_DEVICE
-    const typename tuple_element<1, Pair>::type &
-      operator()(const Pair &p) const
-  {
-    return p.second;
-  } // end operator()()
-
-  inline THRUST_HOST_DEVICE
-    typename tuple_element<1, Pair>::type &
-      operator()(Pair &p) const
-  {
-    return p.second;
-  } // end operator()()
-}; // end pair_get
-
-} // end detail
-
-
-
-template<unsigned int N, typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    typename tuple_element<N, pair<T1,T2> >::type &
-      get(pair<T1,T2> &p)
-{
-  return detail::pair_get<N, pair<T1,T2> >()(p);
-} // end get()
-
-template<unsigned int N, typename T1, typename T2>
-  inline THRUST_HOST_DEVICE
-    const typename tuple_element<N, pair<T1,T2> >::type &
-      get(const pair<T1,T2> &p)
-{
-  return detail::pair_get<N, pair<T1,T2> >()(p);
-} // end get()
-
-THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/tuple.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/tuple.inl
deleted file mode 100644
index 5a6e7eb83e2a..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/tuple.inl
+++ /dev/null
@@ -1,1042 +0,0 @@
-/*
- *  Copyright 2008-2021 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config.h>
-
-#include <thrust/detail/type_traits.h>
-
-THRUST_NAMESPACE_BEGIN
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Assignable1, typename Assignable2>
-THRUST_HOST_DEVICE inline void swap(Assignable1& a, Assignable2& b)
-{
-  Assignable1 temp = a;
-  a                = b;
-  b                = temp;
-} // end swap()
-
-// define null_type for backwards compatibility
-struct THRUST_DEPRECATED_BECAUSE("Please remove null_type from parameters to tuple<...>") null_type
-{};
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-// forward declaration for tuple
-template <
-  class T0 = null_type, class T1 = null_type, class T2 = null_type,
-  class T3 = null_type, class T4 = null_type, class T5 = null_type,
-  class T6 = null_type, class T7 = null_type, class T8 = null_type,
-  class T9 = null_type>
-class tuple;
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-template <size_t N, class T> struct tuple_element;
-
-template<size_t N, class T>
-  struct tuple_element_impl
-{
-  private:
-    using Next = typename T::tail_type;
-
-  public:
-    /*! The result of this metafunction is returned in \c type.
-     */
-    using type = typename tuple_element_impl<N-1, Next>::type;
-}; // end tuple_element
-
-template<class T>
-  struct tuple_element_impl<0,T>
-{
-  using type = typename T::head_type;
-};
-
-template <size_t N, class T>
-  struct tuple_element<N, T const>
-{
-    using type = typename std::add_const<typename tuple_element<N, T>::type>::type;
-};
-
-template <size_t N, class T>
-struct tuple_element<N, T volatile>
-{
-    using type = typename std::add_volatile<typename tuple_element<N, T>::type>::type;
-};
-
-template <size_t N, class T>
-  struct tuple_element<N, T const volatile>
-{
-    using type = typename std::add_cv<typename tuple_element<N, T>::type>::type;
-};
-
-template <size_t N, class T>
-struct tuple_element{
-    using type = typename tuple_element_impl<N,T>::type;
-};
-
-// forward declaration of tuple_size
-template<class T> struct tuple_size;
-
-template<class T>
-  struct tuple_size<T const> : public tuple_size<T> {};
-
-template<class T>
-  struct tuple_size<T volatile> : public tuple_size<T> {};
-
-template<class T>
-  struct tuple_size<T const volatile> : public tuple_size<T> {};
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-/*! This metafunction returns the number of elements
- *  of a \p tuple type of interest.
- *
- *  \tparam T A \c tuple type of interest.
- *
- *  \see pair
- *  \see tuple
- */
-template<class T>
-  struct tuple_size
-{
-  /*! The result of this metafunction is returned in \c value.
-   */
-  static const int value = 1 + tuple_size<typename T::tail_type>::value;
-}; // end tuple_size
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-// specializations for tuple_size
-template<>
-  struct tuple_size< tuple<> >
-{
-  static const int value = 0;
-}; // end tuple_size< tuple<> >
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template<>
-  struct tuple_size<null_type>
-{
-  static const int value = 0;
-}; // end tuple_size<null_type>
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-// forward declaration of detail::cons
-namespace detail
-{
-
-template <class HT, class TT> struct cons;
-
-} // end detail
-
-
-// -- some traits classes for get functions
-template <class T> struct access_traits
-{
-  using const_type = const T&;
-  using non_const_type = T&;
-
-  using parameter_type = const typename ::std::remove_cv<T>::type&;
-
-// used as the tuple constructors parameter types
-// Rationale: non-reference tuple element types can be cv-qualified.
-// It should be possible to initialize such types with temporaries,
-// and when binding temporaries to references, the reference must
-// be non-volatile and const. 8.5.3. (5)
-}; // end access_traits
-
-template <class T> struct access_traits<T&>
-{
-  using const_type = T&;
-  using non_const_type = T&;
-
-  using parameter_type = T&;
-}; // end access_traits<T&>
-
-// forward declarations of get()
-template<int N, class HT, class TT>
-THRUST_HOST_DEVICE
-inline typename access_traits<
-                  typename tuple_element<N, detail::cons<HT, TT> >::type
-                >::non_const_type
-// XXX we probably don't need to do this for any compiler we care about -jph
-//get(cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N));
-get(detail::cons<HT, TT>& c);
-
-template<int N, class HT, class TT>
-THRUST_HOST_DEVICE
-inline typename access_traits<
-                  typename tuple_element<N, detail::cons<HT, TT> >::type
-                >::const_type
-// XXX we probably don't need to do this for any compiler we care about -jph
-//get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N));
-get(const detail::cons<HT, TT>& c);
-
-namespace detail
-{
-
-// -- generate error template, referencing to non-existing members of this
-// template is used to produce compilation errors intentionally
-template<class T>
-class generate_error;
-
-// - cons getters --------------------------------------------------------
-// called: get_class<N>::get<RETURN_TYPE>(aTuple)
-
-template< int N >
-struct get_class
-{
-  template<class RET, class HT, class TT >
-  THRUST_HOST_DEVICE
-  inline static RET get(const cons<HT, TT>& t)
-  {
-    // XXX we may not need to deal with this for any compiler we care about -jph
-    //return get_class<N-1>::BOOST_NESTED_TEMPLATE get<RET>(t.tail);
-    return get_class<N-1>::template get<RET>(t.tail);
-
-    // gcc 4.3 couldn't compile this:
-    //return get_class<N-1>::get<RET>(t.tail);
-  }
-
-  template<class RET, class HT, class TT >
-  THRUST_HOST_DEVICE
-  inline static RET get(cons<HT, TT>& t)
-  {
-    // XXX we may not need to deal with this for any compiler we care about -jph
-    //return get_class<N-1>::BOOST_NESTED_TEMPLATE get<RET>(t.tail);
-    return get_class<N-1>::template get<RET>(t.tail);
-
-    // gcc 4.3 couldn't compile this:
-    //return get_class<N-1>::get<RET>(t.tail);
-  }
-}; // end get_class
-
-template<>
-struct get_class<0>
-{
-  template<class RET, class HT, class TT>
-  THRUST_HOST_DEVICE
-  inline static RET get(const cons<HT, TT>& t)
-  {
-    return t.head;
-  }
-
-  template<class RET, class HT, class TT>
-  THRUST_HOST_DEVICE
-  inline static RET get(cons<HT, TT>& t)
-  {
-    return t.head;
-  }
-}; // get get_class<0>
-
-
-template <bool If, class Then, class Else> struct IF
-{
-  using RET = Then;
-};
-
-template <class Then, class Else> struct IF<false, Then, Else>
-{
-  using RET = Else;
-};
-
-//  These helper templates wrap void types and plain function types.
-//  The rationale is to allow one to write tuple types with those types
-//  as elements, even though it is not possible to instantiate such object.
-//  E.g: using some_type = tuple<void>; // ok
-//  but: some_type x; // fails
-
-template <class T> class non_storeable_type
-{
-  THRUST_HOST_DEVICE
-  non_storeable_type();
-};
-
-template <class T> struct wrap_non_storeable_type
-{
-  // XXX is_function looks complicated; punt for now -jph
-  //typedef typename IF<
-  //  THRUST_NS_QUALIFIER::detail::is_function<T>::value, non_storeable_type<T>, T
-  //>::RET type;
-
-  using type = T;
-};
-
-template <> struct wrap_non_storeable_type<void>
-{
-  using type = non_storeable_type<void>;
-};
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template <class HT, class TT>
-  struct cons
-{
-  using head_type = HT;
-  using tail_type = TT;
-
-  using stored_head_type = typename
-                          wrap_non_storeable_type<head_type>::type;
-
-  stored_head_type head;
-  tail_type tail;
-
-  inline THRUST_HOST_DEVICE
-  typename access_traits<stored_head_type>::non_const_type
-  get_head() { return head; }
-
-  inline THRUST_HOST_DEVICE
-  typename access_traits<tail_type>::non_const_type
-  get_tail() { return tail; }
-
-  inline THRUST_HOST_DEVICE
-  typename access_traits<stored_head_type>::const_type
-  get_head() const { return head; }
-
-  inline THRUST_HOST_DEVICE
-  typename access_traits<tail_type>::const_type
-  get_tail() const { return tail; }
-
-  inline THRUST_HOST_DEVICE
-  cons(void) : head(), tail() {}
-  //  cons() : head(detail::default_arg<HT>::f()), tail() {}
-
-  // the argument for head is not strictly needed, but it prevents
-  // array type elements. This is good, since array type elements
-  // cannot be supported properly in any case (no assignment,
-  // copy works only if the tails are exactly the same type, ...)
-
-  inline THRUST_HOST_DEVICE
-  cons(typename access_traits<stored_head_type>::parameter_type h,
-       const tail_type& t)
-    : head (h), tail(t) {}
-
-  template <class T1, class T2, class T3, class T4, class T5,
-            class T6, class T7, class T8, class T9, class T10>
-  inline THRUST_HOST_DEVICE
-  cons( T1& t1, T2& t2, T3& t3, T4& t4, T5& t5,
-        T6& t6, T7& t7, T8& t8, T9& t9, T10& t10 )
-    : head (t1),
-      tail (t2, t3, t4, t5, t6, t7, t8, t9, t10, static_cast<const null_type&>(null_type()))
-      {}
-
-  template <class T2, class T3, class T4, class T5,
-            class T6, class T7, class T8, class T9, class T10>
-  inline THRUST_HOST_DEVICE
-  cons( const null_type& /*t1*/, T2& t2, T3& t3, T4& t4, T5& t5,
-        T6& t6, T7& t7, T8& t8, T9& t9, T10& t10 )
-    : head (),
-      tail (t2, t3, t4, t5, t6, t7, t8, t9, t10, static_cast<const null_type&>(null_type()))
-      {}
-
-
-  template <class HT2, class TT2>
-  inline THRUST_HOST_DEVICE
-  cons( const cons<HT2, TT2>& u ) : head(u.head), tail(u.tail) {}
-
-  template <class HT2>
-  inline THRUST_HOST_DEVICE
-  cons( const cons<HT2, null_type>& u ) : head(u.head), tail() {}
-
-  cons(const cons &) = default;
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <class HT2>
-  inline THRUST_HOST_DEVICE
-  cons& operator=( const cons<HT2, null_type>& u ) {
-    head = u.head;
-    tail = thrust::null_type();
-    return *this;
-  }
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <class HT2, class TT2>
-  inline THRUST_HOST_DEVICE
-  cons& operator=( const cons<HT2, TT2>& u ) {
-    head=u.head; tail=u.tail; return *this;
-  }
-
-  // must define assignment operator explicitly, implicit version is
-  // illformed if HT is a reference (12.8. (12))
-  THRUST_EXEC_CHECK_DISABLE
-  inline THRUST_HOST_DEVICE
-  cons& operator=(const cons& u) {
-    head = u.head; tail = u.tail;  return *this;
-  }
-
-  // XXX enable when we support std::pair -jph
-  //template <class T1, class T2>
-  //THRUST_HOST_DEVICE
-  //cons& operator=( const std::pair<T1, T2>& u ) {
-  //  //BOOST_STATIC_ASSERT(length<cons>::value == 2); // check length = 2
-  //  head = u.first; tail.head = u.second; return *this;
-  //}
-
-  // get member functions (non-const and const)
-  template <int N>
-  THRUST_HOST_DEVICE
-  typename access_traits<
-             typename tuple_element<N, cons<HT, TT> >::type
-           >::non_const_type
-  get() {
-    return thrust::get<N>(*this); // delegate to non-member get
-  }
-
-  template <int N>
-  THRUST_HOST_DEVICE
-  typename access_traits<
-             typename tuple_element<N, cons<HT, TT> >::type
-           >::const_type
-  get() const {
-    return thrust::get<N>(*this); // delegate to non-member get
-  }
-
-  inline THRUST_HOST_DEVICE
-  void swap(cons &c)
-  {
-    using thrust::swap;
-
-    swap(head, c.head);
-    tail.swap(c.tail);
-  }
-};
-
-template <class HT>
-  struct cons<HT, null_type>
-{
-  using head_type = HT;
-  using tail_type = null_type;
-  using self_type = cons<HT, null_type>;
-
-  using stored_head_type = typename
-                          wrap_non_storeable_type<head_type>::type;
-  stored_head_type head;
-
-  typename access_traits<stored_head_type>::non_const_type
-  inline THRUST_HOST_DEVICE
-  get_head() { return head; }
-
-  inline THRUST_HOST_DEVICE
-  null_type get_tail() { return null_type(); }
-
-  inline THRUST_HOST_DEVICE
-  typename access_traits<stored_head_type>::const_type
-  get_head() const { return head; }
-
-  inline THRUST_HOST_DEVICE
-  null_type get_tail() const { return null_type(); }
-
-  inline THRUST_HOST_DEVICE
-  cons() : head() {}
-
-  inline THRUST_HOST_DEVICE
-  cons(typename access_traits<stored_head_type>::parameter_type h,
-       const null_type& = null_type())
-    : head (h) {}
-
-  template<class T1>
-  inline THRUST_HOST_DEVICE
-  cons(T1& t1, const null_type&, const null_type&, const null_type&,
-       const null_type&, const null_type&, const null_type&,
-       const null_type&, const null_type&, const null_type&)
-  : head (t1) {}
-
-  inline THRUST_HOST_DEVICE
-  cons(const null_type&,
-       const null_type&, const null_type&, const null_type&,
-       const null_type&, const null_type&, const null_type&,
-       const null_type&, const null_type&, const null_type&)
-  : head () {}
-
-  template <class HT2>
-  inline THRUST_HOST_DEVICE
-  cons( const cons<HT2, null_type>& u ) : head(u.head) {}
-
-  cons(const cons &) = default;
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <class HT2>
-  inline THRUST_HOST_DEVICE
-  cons& operator=(const cons<HT2, null_type>& u )
-  {
-    head = u.head;
-    return *this;
-  }
-
-  // must define assignment operator explicitly, implicit version
-  // is illformed if HT is a reference
-  inline THRUST_HOST_DEVICE
-  cons& operator=(const cons& u) { head = u.head; return *this; }
-
-  template <int N>
-  inline THRUST_HOST_DEVICE
-  typename access_traits<
-             typename tuple_element<N, self_type>::type
-            >::non_const_type
-  // XXX we probably don't need this for the compilers we care about -jph
-  //get(BOOST_EXPLICIT_TEMPLATE_NON_TYPE(int, N))
-  get(void)
-  {
-    return thrust::get<N>(*this);
-  }
-
-  template <int N>
-  inline THRUST_HOST_DEVICE
-  typename access_traits<
-             typename tuple_element<N, self_type>::type
-           >::const_type
-  // XXX we probably don't need this for the compilers we care about -jph
-  //get(BOOST_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) const
-  get(void) const
-  {
-    return thrust::get<N>(*this);
-  }
-
-  inline THRUST_HOST_DEVICE
-  void swap(cons &c)
-  {
-    using thrust::swap;
-
-    swap(head, c.head);
-  }
-}; // end cons
-
-template <class T0, class T1, class T2, class T3, class T4,
-          class T5, class T6, class T7, class T8, class T9>
-  struct map_tuple_to_cons
-{
-  using type = cons<T0,
-               typename map_tuple_to_cons<T1, T2, T3, T4, T5,
-                                          T6, T7, T8, T9, null_type>::type>;
-}; // end map_tuple_to_cons
-
-// The empty tuple is a null_type
-template <>
-  struct map_tuple_to_cons<null_type, null_type, null_type, null_type, null_type, null_type, null_type, null_type, null_type, null_type>
-{
-  using type = null_type;
-}; // end map_tuple_to_cons<...>
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-// ---------------------------------------------------------------------------
-// The call_traits for make_tuple
-
-// Must be instantiated with plain or const plain types (not with references)
-
-// from template<class T> foo(const T& t) : make_tuple_traits<const T>::type
-// from template<class T> foo(T& t) : make_tuple_traits<T>::type
-
-// Conversions:
-// T -> T,
-// references -> compile_time_error
-// array -> const ref array
-
-
-template<class T>
-struct make_tuple_traits {
-  using type = T;
-
-  // commented away, see below  (JJ)
-  //  typedef typename IF<
-  //  boost::is_function<T>::value,
-  //  T&,
-  //  T>::RET type;
-
-};
-
-// The is_function test was there originally for plain function types,
-// which can't be stored as such (we must either store them as references or
-// pointers). Such a type could be formed if make_tuple was called with a
-// reference to a function.
-// But this would mean that a const qualified function type was formed in
-// the make_tuple function and hence make_tuple can't take a function
-// reference as a parameter, and thus T can't be a function type.
-// So is_function test was removed.
-// (14.8.3. says that type deduction fails if a cv-qualified function type
-// is created. (It only applies for the case of explicitly specifying template
-// args, though?)) (JJ)
-
-template<class T>
-struct make_tuple_traits<T&> {
-  using error = typename detail::generate_error<T&>::do_not_use_with_reference_type;
-};
-
-// Arrays can't be stored as plain types; convert them to references.
-// All arrays are converted to const. This is because make_tuple takes its
-// parameters as const T& and thus the knowledge of the potential
-// non-constness of actual argument is lost.
-template<class T, int n>  struct make_tuple_traits <T[n]> {
-  using type = const T (&)[n];
-};
-
-template<class T, int n>
-struct make_tuple_traits<const T[n]> {
-  using type = const T (&)[n];
-};
-
-template<class T, int n>  struct make_tuple_traits<volatile T[n]> {
-  using type = const volatile T (&)[n];
-};
-
-template<class T, int n>
-struct make_tuple_traits<const volatile T[n]> {
-  using type = const volatile T (&)[n];
-};
-
-// XXX enable these if we ever care about reference_wrapper -jph
-//template<class T>
-//struct make_tuple_traits<reference_wrapper<T> >{
-//  using type = T&;
-//};
-//
-//template<class T>
-//struct make_tuple_traits<const reference_wrapper<T> >{
-//  using type = T&;
-//};
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-// a helper traits to make the make_tuple functions shorter (Vesa Karvonen's
-// suggestion)
-template <
-  class T0 = null_type, class T1 = null_type, class T2 = null_type,
-  class T3 = null_type, class T4 = null_type, class T5 = null_type,
-  class T6 = null_type, class T7 = null_type, class T8 = null_type,
-  class T9 = null_type
->
-struct make_tuple_mapper {
-  using type = tuple<typename make_tuple_traits<T0>::type,
-                     typename make_tuple_traits<T1>::type,
-                     typename make_tuple_traits<T2>::type,
-                     typename make_tuple_traits<T3>::type,
-                     typename make_tuple_traits<T4>::type,
-                     typename make_tuple_traits<T5>::type,
-                     typename make_tuple_traits<T6>::type,
-                     typename make_tuple_traits<T7>::type,
-                     typename make_tuple_traits<T8>::type,
-                     typename make_tuple_traits<T9>::type>;
-};
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-} // end detail
-
-
-template<int N, class HT, class TT>
-THRUST_HOST_DEVICE
-inline typename access_traits<
-                  typename tuple_element<N, detail::cons<HT, TT> >::type
-                >::non_const_type
-get(detail::cons<HT, TT>& c)
-{
-  //return detail::get_class<N>::BOOST_NESTED_TEMPLATE
-
-  // gcc 4.3 couldn't compile this:
-  //return detail::get_class<N>::
-
-  return detail::get_class<N>::template
-         get<
-           typename access_traits<
-             typename tuple_element<N, detail::cons<HT, TT> >::type
-           >::non_const_type,
-           HT,TT
-         >(c);
-}
-
-
-// get function for const cons-lists, returns a const reference to
-// the element. If the element is a reference, returns the reference
-// as such (that is, can return a non-const reference)
-template<int N, class HT, class TT>
-THRUST_HOST_DEVICE
-inline typename access_traits<
-                  typename tuple_element<N, detail::cons<HT, TT> >::type
-                >::const_type
-get(const detail::cons<HT, TT>& c)
-{
-  //return detail::get_class<N>::BOOST_NESTED_TEMPLATE
-
-  // gcc 4.3 couldn't compile this:
-  //return detail::get_class<N>::
-
-  return detail::get_class<N>::template
-         get<
-           typename access_traits<
-             typename tuple_element<N, detail::cons<HT, TT> >::type
-           >::const_type,
-           HT,TT
-         >(c);
-}
-
-
-template<class T0>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0>::type
-    make_tuple(const T0& t0)
-{
-  using t = typename detail::make_tuple_mapper<T0>::type;
-  return t(t0);
-} // end make_tuple()
-
-template<class T0, class T1>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1>::type
-    make_tuple(const T0& t0, const T1& t1)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1>::type;
-  return t(t0,t1);
-} // end make_tuple()
-
-template<class T0, class T1, class T2>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2>::type;
-  return t(t0,t1,t2);
-} // end make_tuple()
-
-template<class T0, class T1, class T2, class T3>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2, T3>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2,T3>::type;
-  return t(t0,t1,t2,t3);
-} // end make_tuple()
-
-template<class T0, class T1, class T2, class T3, class T4>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2, T3, T4>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2,T3,T4>::type;
-  return t(t0,t1,t2,t3,t4);
-} // end make_tuple()
-
-template<class T0, class T1, class T2, class T3, class T4, class T5>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2,T3,T4,T5>::type;
-  return t(t0,t1,t2,t3,t4,t5);
-} // end make_tuple()
-
-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2,T3,T4,T5,T6>::type;
-  return t(t0,t1,t2,t3,t4,t5,t6);
-} // end make_tuple()
-
-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6, T7>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2,T3,T4,T5,T6,T7>::type;
-  return t(t0,t1,t2,t3,t4,t5,t6,t7);
-} // end make_tuple()
-
-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6, T7, T8>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2,T3,T4,T5,T6,T7,T8>::type;
-  return t(t0,t1,t2,t3,t4,t5,t6,t7,t8);
-} // end make_tuple()
-
-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9>
-THRUST_HOST_DEVICE inline
-  typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>::type
-    make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9)
-{
-  using t = typename detail::make_tuple_mapper<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>::type;
-  return t(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9);
-} // end make_tuple()
-
-
-template<typename T0>
-THRUST_HOST_DEVICE inline
-tuple<T0&> tie(T0 &t0)
-{
-  return tuple<T0&>(t0);
-}
-
-template<typename T0,typename T1>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&> tie(T0 &t0, T1 &t1)
-{
-  return tuple<T0&,T1&>(t0,t1);
-}
-
-template<typename T0,typename T1, typename T2>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&> tie(T0 &t0, T1 &t1, T2 &t2)
-{
-  return tuple<T0&,T1&,T2&>(t0,t1,t2);
-}
-
-template<typename T0,typename T1, typename T2, typename T3>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&,T3&> tie(T0 &t0, T1 &t1, T2 &t2, T3 &t3)
-{
-  return tuple<T0&,T1&,T2&,T3&>(t0,t1,t2,t3);
-}
-
-template<typename T0,typename T1, typename T2, typename T3, typename T4>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&,T3&,T4&> tie(T0 &t0, T1 &t1, T2 &t2, T3 &t3, T4 &t4)
-{
-  return tuple<T0&,T1&,T2&,T3&,T4&>(t0,t1,t2,t3,t4);
-}
-
-template<typename T0,typename T1, typename T2, typename T3, typename T4, typename T5>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&,T3&,T4&,T5&> tie(T0 &t0, T1 &t1, T2 &t2, T3 &t3, T4 &t4, T5 &t5)
-{
-  return tuple<T0&,T1&,T2&,T3&,T4&,T5&>(t0,t1,t2,t3,t4,t5);
-}
-
-template<typename T0,typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&> tie(T0 &t0, T1 &t1, T2 &t2, T3 &t3, T4 &t4, T5 &t5, T6 &t6)
-{
-  return tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&>(t0,t1,t2,t3,t4,t5,t6);
-}
-
-template<typename T0,typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&,T7&> tie(T0 &t0, T1 &t1, T2 &t2, T3 &t3, T4 &t4, T5 &t5, T6 &t6, T7 &t7)
-{
-  return tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&,T7&>(t0,t1,t2,t3,t4,t5,t6,t7);
-}
-
-template<typename T0,typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&,T7&,T8&> tie(T0 &t0, T1 &t1, T2 &t2, T3 &t3, T4 &t4, T5 &t5, T6 &t6, T7 &t7, T8 &t8)
-{
-  return tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&,T7&,T8&>(t0,t1,t2,t3,t4,t5,t6,t7,t8);
-}
-
-template<typename T0,typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
-THRUST_HOST_DEVICE inline
-tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&,T7&,T8&,T9&> tie(T0 &t0, T1 &t1, T2 &t2, T3 &t3, T4 &t4, T5 &t5, T6 &t6, T7 &t7, T8 &t8, T9 &t9)
-{
-  return tuple<T0&,T1&,T2&,T3&,T4&,T5&,T6&,T7&,T8&,T9&>(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9);
-}
-
-template<
-  typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9,
-  typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9
->
-THRUST_HOST_DEVICE inline
-void swap(thrust::tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> &x,
-          thrust::tuple<U0,U1,U2,U3,U4,U5,U6,U7,U8,U9> &y)
-{
-  return x.swap(y);
-}
-
-
-
-namespace detail
-{
-
-template<class T1, class T2>
-THRUST_HOST_DEVICE
-inline bool eq(const T1& lhs, const T2& rhs) {
-  return lhs.get_head() == rhs.get_head() &&
-         eq(lhs.get_tail(), rhs.get_tail());
-}
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template<>
-THRUST_HOST_DEVICE
-inline bool eq<null_type,null_type>(const null_type&, const null_type&) { return true; }
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-template<class T1, class T2>
-THRUST_HOST_DEVICE
-inline bool neq(const T1& lhs, const T2& rhs) {
-  return lhs.get_head() != rhs.get_head()  ||
-         neq(lhs.get_tail(), rhs.get_tail());
-}
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template<>
-THRUST_HOST_DEVICE
-inline bool neq<null_type,null_type>(const null_type&, const null_type&) { return false; }
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-template<class T1, class T2>
-THRUST_HOST_DEVICE
-inline bool lt(const T1& lhs, const T2& rhs) {
-  return (lhs.get_head() < rhs.get_head())  ||
-            (!(rhs.get_head() < lhs.get_head()) &&
-             lt(lhs.get_tail(), rhs.get_tail()));
-}
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template<>
-THRUST_HOST_DEVICE
-inline bool lt<null_type,null_type>(const null_type&, const null_type&) { return false; }
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-template<class T1, class T2>
-THRUST_HOST_DEVICE
-inline bool gt(const T1& lhs, const T2& rhs) {
-  return (lhs.get_head() > rhs.get_head())  ||
-            (!(rhs.get_head() > lhs.get_head()) &&
-             gt(lhs.get_tail(), rhs.get_tail()));
-}
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template<>
-THRUST_HOST_DEVICE
-inline bool gt<null_type,null_type>(const null_type&, const null_type&) { return false; }
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-template<class T1, class T2>
-THRUST_HOST_DEVICE
-inline bool lte(const T1& lhs, const T2& rhs) {
-  return lhs.get_head() <= rhs.get_head()  &&
-          ( !(rhs.get_head() <= lhs.get_head()) ||
-            lte(lhs.get_tail(), rhs.get_tail()));
-}
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template<>
-THRUST_HOST_DEVICE
-inline bool lte<null_type,null_type>(const null_type&, const null_type&) { return true; }
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-template<class T1, class T2>
-THRUST_HOST_DEVICE
-inline bool gte(const T1& lhs, const T2& rhs) {
-  return lhs.get_head() >= rhs.get_head()  &&
-          ( !(rhs.get_head() >= lhs.get_head()) ||
-            gte(lhs.get_tail(), rhs.get_tail()));
-}
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template<>
-THRUST_HOST_DEVICE
-inline bool gte<null_type,null_type>(const null_type&, const null_type&) { return true; }
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-} // end detail
-
-
-
-// equal ----
-
-template<class T1, class T2, class S1, class S2>
-THRUST_HOST_DEVICE
-inline bool operator==(const detail::cons<T1, T2>& lhs, const detail::cons<S1, S2>& rhs)
-{
-  // XXX support this eventually -jph
-  //// check that tuple lengths are equal
-  //BOOST_STATIC_ASSERT(tuple_size<T2>::value == tuple_size<S2>::value);
-
-  return  detail::eq(lhs, rhs);
-} // end operator==()
-
-// not equal -----
-
-template<class T1, class T2, class S1, class S2>
-THRUST_HOST_DEVICE
-inline bool operator!=(const detail::cons<T1, T2>& lhs, const detail::cons<S1, S2>& rhs)
-{
-  // XXX support this eventually -jph
-  //// check that tuple lengths are equal
-  //BOOST_STATIC_ASSERT(tuple_size<T2>::value == tuple_size<S2>::value);
-
-  return detail::neq(lhs, rhs);
-} // end operator!=()
-
-// <
-template<class T1, class T2, class S1, class S2>
-THRUST_HOST_DEVICE
-inline bool operator<(const detail::cons<T1, T2>& lhs, const detail::cons<S1, S2>& rhs)
-{
-  // XXX support this eventually -jph
-  //// check that tuple lengths are equal
-  //BOOST_STATIC_ASSERT(tuple_size<T2>::value == tuple_size<S2>::value);
-
-  return detail::lt(lhs, rhs);
-} // end operator<()
-
-// >
-template<class T1, class T2, class S1, class S2>
-THRUST_HOST_DEVICE
-inline bool operator>(const detail::cons<T1, T2>& lhs, const detail::cons<S1, S2>& rhs)
-{
-  // XXX support this eventually -jph
-  //// check that tuple lengths are equal
-  //BOOST_STATIC_ASSERT(tuple_size<T2>::value == tuple_size<S2>::value);
-
-  return detail::gt(lhs, rhs);
-} // end operator>()
-
-// <=
-template<class T1, class T2, class S1, class S2>
-THRUST_HOST_DEVICE
-inline bool operator<=(const detail::cons<T1, T2>& lhs, const detail::cons<S1, S2>& rhs)
-{
-  // XXX support this eventually -jph
-  //// check that tuple lengths are equal
-  //BOOST_STATIC_ASSERT(tuple_size<T2>::value == tuple_size<S2>::value);
-
-  return detail::lte(lhs, rhs);
-} // end operator<=()
-
-// >=
-template<class T1, class T2, class S1, class S2>
-THRUST_HOST_DEVICE
-inline bool operator>=(const detail::cons<T1, T2>& lhs, const detail::cons<S1, S2>& rhs)
-{
-  // XXX support this eventually -jph
-  //// check that tuple lengths are equal
-  //BOOST_STATIC_ASSERT(tuple_size<T2>::value == tuple_size<S2>::value);
-
-  return detail::gte(lhs, rhs);
-} // end operator>=()
-
-THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/pair.h b/projects/hipccl/hipccl3/rocthrust/thrust/pair.h
index 712d2857c2c2..400fddf58263 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/pair.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/pair.h
@@ -33,8 +33,6 @@
 
 #include _THRUST_STD_INCLUDE(utility)
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
 THRUST_NAMESPACE_BEGIN
 
 /*! \addtogroup utility
@@ -52,12 +50,12 @@ THRUST_NAMESPACE_BEGIN
  *  \tparam N This parameter selects the member of interest.
  *  \tparam T A \c pair type of interest.
  */
-#  ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
+#ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
 template <size_t N, class T>
 using tuple_element = _THRUST_STD::tuple_element<N, T>;
-#  else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
+#else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
 using _THRUST_STD::tuple_element;
-#  endif // THRUST_DOXYGEN_INVOKED
+#endif // THRUST_DOXYGEN_INVOKED
 
 /*! This convenience metafunction is included for compatibility with
  *  \p tuple. It returns \c 2, the number of elements of a \p pair,
@@ -65,12 +63,12 @@ using _THRUST_STD::tuple_element;
  *
  *  \tparam Pair A \c pair type of interest.
  */
-#  ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
+#ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
 template <class T>
 using tuple_size = _THRUST_STD::tuple_size<T>;
-#  else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
+#else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
 using _THRUST_STD::tuple_size;
-#  endif // THRUST_DOXYGEN_INVOKED
+#endif // THRUST_DOXYGEN_INVOKED
 
 /*! \p pair is a generic data structure encapsulating a heterogeneous
  *  pair of values.
@@ -83,12 +81,12 @@ using _THRUST_STD::tuple_size;
  *          requirements on the type of \p T2. <tt>T2</tt>'s type is
  *          provided by <tt>pair::second_type</tt>.
  */
-#  ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
+#ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
 template <class T, class U>
 using pair = _THRUST_STD::pair<T, U>;
-#  else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
+#else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
 using _THRUST_STD::pair;
-#  endif // THRUST_DOXYGEN_INVOKED
+#endif // THRUST_DOXYGEN_INVOKED
 
 using _THRUST_STD::get;
 using _THRUST_STD::make_pair;
@@ -100,254 +98,3 @@ using _THRUST_STD::make_pair;
  */
 
 THRUST_NAMESPACE_END
-
-#else // TODO(libhipcxx): remove this path of code once libhipcxx gets ready
-
-THRUST_NAMESPACE_BEGIN
-
-/*! \addtogroup utility
- *  \{
- */
-
-/*! \addtogroup pair
- *  \{
- */
-
-/*! \p pair is a generic data structure encapsulating a heterogeneous
- *  pair of values.
- *
- *  \tparam T1 The type of \p pair's first object type.  There are no
- *          requirements on the type of \p T1. <tt>T1</tt>'s type is
- *          provided by <tt>pair::first_type</tt>.
- *
- *  \tparam T2 The type of \p pair's second object type.  There are no
- *          requirements on the type of \p T2. <tt>T2</tt>'s type is
- *          provided by <tt>pair::second_type</tt>.
- */
-template <typename T1, typename T2>
-struct pair
-{
-  /*! \p first_type is the type of \p pair's first object type.
-   */
-  using first_type = T1;
-
-  /*! \p second_type is the type of \p pair's second object type.
-   */
-  using second_type = T2;
-
-  /*! The \p pair's first object.
-   */
-  first_type first;
-
-  /*! The \p pair's second object.
-   */
-  second_type second;
-
-  /*! \p pair's default constructor constructs \p first
-   *  and \p second using \c first_type & \c second_type's
-   *  default constructors, respectively.
-   */
-  THRUST_HOST_DEVICE pair(void);
-
-  /*! This constructor accepts two objects to copy into this \p pair.
-   *
-   *  \param x The object to copy into \p first.
-   *  \param y The object to copy into \p second.
-   */
-  inline THRUST_HOST_DEVICE pair(const T1& x, const T2& y);
-
-  /*! This copy constructor copies from a \p pair whose types are
-   *  convertible to this \p pair's \c first_type and \c second_type,
-   *  respectively.
-   *
-   *  \param p The \p pair to copy from.
-   *
-   *  \tparam U1 is convertible to \c first_type.
-   *  \tparam U2 is convertible to \c second_type.
-   */
-  template <typename U1, typename U2>
-  inline THRUST_HOST_DEVICE pair(const pair<U1, U2>& p);
-
-  /*! This copy constructor copies from a <tt>std::pair</tt> whose types are
-   *  convertible to this \p pair's \c first_type and \c second_type,
-   *  respectively.
-   *
-   *  \param p The <tt>std::pair</tt> to copy from.
-   *
-   *  \tparam U1 is convertible to \c first_type.
-   *  \tparam U2 is convertible to \c second_type.
-   */
-  template <typename U1, typename U2>
-  inline THRUST_HOST_DEVICE pair(const std::pair<U1, U2>& p);
-
-  /*! \p swap swaps the elements of two <tt>pair</tt>s.
-   *
-   *  \param p The other <tt>pair</tt> with which to swap.
-   */
-  inline THRUST_HOST_DEVICE void swap(pair& p);
-}; // end pair
-
-/*! This operator tests two \p pairs for equality.
- *
- *  \param x The first \p pair to compare.
- *  \param y The second \p pair to compare.
- *  \return \c true if and only if <tt>x.first == y.first && x.second == y.second</tt>.
- *
- *  \tparam T1 is a model of <a href="https://en.cppreference.com/w/cpp/concepts/equality_comparable">Equality
- * Comparable</a>. \tparam T2 is a model of <a
- * href="https://en.cppreference.com/w/cpp/concepts/equality_comparable">Equality Comparable</a>.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE bool operator==(const pair<T1, T2>& x, const pair<T1, T2>& y);
-
-/*! This operator tests two pairs for ascending ordering.
- *
- *  \param x The first \p pair to compare.
- *  \param y The second \p pair to compare.
- *  \return \c true if and only if <tt>x.first < y.first || (!(y.first < x.first) && x.second < y.second)</tt>.
- *
- *  \tparam T1 is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
- * Comparable</a>. \tparam T2 is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan Comparable</a>.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE bool operator<(const pair<T1, T2>& x, const pair<T1, T2>& y);
-
-/*! This operator tests two pairs for inequality.
- *
- *  \param x The first \p pair to compare.
- *  \param y The second \p pair to compare.
- *  \return \c true if and only if <tt>!(x == y)</tt>.
- *
- *  \tparam T1 is a model of <a href="https://en.cppreference.com/w/cpp/concepts/equality_comparable">Equality
- * Comparable</a>. \tparam T2 is a model of <a
- * href="https://en.cppreference.com/w/cpp/concepts/equality_comparable">Equality Comparable</a>.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE bool operator!=(const pair<T1, T2>& x, const pair<T1, T2>& y);
-
-/*! This operator tests two pairs for descending ordering.
- *
- *  \param x The first \p pair to compare.
- *  \param y The second \p pair to compare.
- *  \return \c true if and only if <tt>y < x</tt>.
- *
- *  \tparam T1 is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
- * Comparable</a>. \tparam T2 is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan Comparable</a>.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE bool operator>(const pair<T1, T2>& x, const pair<T1, T2>& y);
-
-/*! This operator tests two pairs for ascending ordering or equivalence.
- *
- *  \param x The first \p pair to compare.
- *  \param y The second \p pair to compare.
- *  \return \c true if and only if <tt>!(y < x)</tt>.
- *
- *  \tparam T1 is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
- * Comparable</a>. \tparam T2 is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan Comparable</a>.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE bool operator<=(const pair<T1, T2>& x, const pair<T1, T2>& y);
-
-/*! This operator tests two pairs for descending ordering or equivalence.
- *
- *  \param x The first \p pair to compare.
- *  \param y The second \p pair to compare.
- *  \return \c true if and only if <tt>!(x < y)</tt>.
- *
- *  \tparam T1 is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
- * Comparable</a>. \tparam T2 is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan Comparable</a>.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE bool operator>=(const pair<T1, T2>& x, const pair<T1, T2>& y);
-
-/*! \p swap swaps the contents of two <tt>pair</tt>s.
- *
- *  \param x The first \p pair to swap.
- *  \param y The second \p pair to swap.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE void swap(pair<T1, T2>& x, pair<T1, T2>& y);
-
-/*! This convenience function creates a \p pair from two objects.
- *
- *  \param x The first object to copy from.
- *  \param y The second object to copy from.
- *  \return A newly-constructed \p pair copied from \p a and \p b.
- *
- *  \tparam T1 There are no requirements on the type of \p T1.
- *  \tparam T2 There are no requirements on the type of \p T2.
- */
-template <typename T1, typename T2>
-inline THRUST_HOST_DEVICE pair<T1, T2> make_pair(T1 x, T2 y);
-
-/*! \cond
- */
-
-/*! This convenience metafunction is included for compatibility with
- *  \p tuple. It returns either the type of a \p pair's
- *  \c first_type or \c second_type in its nested type, \c type.
- *
- *  \tparam N This parameter selects the member of interest.
- *  \tparam T A \c pair type of interest.
- */
-template <::std::size_t N, class T>
-struct tuple_element;
-
-/*! This convenience metafunction is included for compatibility with
- *  \p tuple. It returns \c 2, the number of elements of a \p pair,
- *  in its nested data member, \c value.
- *
- *  \tparam Pair A \c pair type of interest.
- */
-template <typename Pair>
-struct tuple_size;
-
-/*! \endcond
- */
-
-/*! This convenience function returns a reference to either the first or
- *  second member of a \p pair.
- *
- *  \param p The \p pair of interest.
- *  \return \c p.first or \c p.second, depending on the template
- *          parameter.
- *
- *  \tparam N This parameter selects the member of interest.
- */
-// XXX comment out these prototypes as a WAR to a problem on MSVC 2005
-// template<unsigned int N, typename T1, typename T2>
-//  inline __host__ __device__
-//    typename tuple_element<N, pair<T1,T2> >::type &
-//      get(pair<T1,T2> &p);
-
-/*! This convenience function returns a const reference to either the
- *  first or second member of a \p pair.
- *
- *  \param p The \p pair of interest.
- *  \return \c p.first or \c p.second, depending on the template
- *          parameter.
- *
- *  \tparam i This parameter selects the member of interest.
- */
-// XXX comment out these prototypes as a WAR to a problem on MSVC 2005
-// template<int N, typename T1, typename T2>
-//  inline __host__ __device__
-//    const typename tuple_element<N, pair<T1,T2> >::type &
-//      get(const pair<T1,T2> &p);
-
-/*! \} // pair
- */
-
-/*! \} // utility
- */
-
-THRUST_NAMESPACE_END
-
-#  include <thrust/detail/pair.inl>
-
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/tuple.h b/projects/hipccl/hipccl3/rocthrust/thrust/tuple.h
index 597f8c80868e..7e74427db885 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/tuple.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/tuple.h
@@ -42,17 +42,6 @@
 
 #include _THRUST_STD_INCLUDE(tuple)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#  include <type_traits>
-#  include <utility>
-#endif
-
-// If 'libcudacxx' or 'libhipcxx' is available (_THRUST_HAS_DEVICE_SYSTEM_STD), we will
-// use the implementations provided there. Otherwise we will fall back to an older
-// implementation of thrust::tuple.
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
 THRUST_NAMESPACE_BEGIN
 
 /*! \addtogroup utility
@@ -72,12 +61,12 @@ THRUST_NAMESPACE_BEGIN
  *  \see pair
  *  \see tuple
  */
-#  ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
+#ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
 template <size_t N, class T>
 using tuple_element = _THRUST_STD::tuple_element<N, T>;
-#  else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
+#else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
 using _THRUST_STD::tuple_element;
-#  endif // THRUST_DOXYGEN_INVOKED
+#endif // THRUST_DOXYGEN_INVOKED
 
 /*! This metafunction returns the number of elements
  *  of a \p tuple type of interest.
@@ -87,12 +76,12 @@ using _THRUST_STD::tuple_element;
  *  \see pair
  *  \see tuple
  */
-#  ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
+#ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
 template <class T>
 using tuple_size = _THRUST_STD::tuple_size<T>;
-#  else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
+#else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
 using _THRUST_STD::tuple_size;
-#  endif // THRUST_DOXYGEN_INVOKED
+#endif // THRUST_DOXYGEN_INVOKED
 
 /*! \brief \p tuple is a heterogeneous, fixed-size collection of values.
  *  An instantiation of \p tuple with two arguments is similar to an
@@ -131,12 +120,12 @@ using _THRUST_STD::tuple_size;
  *  \see tuple_size
  *  \see tie
  */
-#  ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
+#ifdef THRUST_DOXYGEN_INVOKED // Provide a fake alias for doxygen
 template <class... Ts>
 using tuple = _THRUST_STD::tuple<T...>;
-#  else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
+#else // ^^^ THRUST_DOXYGEN_INVOKED ^^^ / vvv !THRUST_DOXYGEN_INVOKED vvv
 using _THRUST_STD::tuple;
-#  endif // THRUST_DOXYGEN_INVOKED
+#endif // THRUST_DOXYGEN_INVOKED
 
 using _THRUST_STD::get;
 using _THRUST_STD::make_tuple;
@@ -149,772 +138,3 @@ using _THRUST_STD::tie;
  */
 
 THRUST_NAMESPACE_END
-
-#else // TODO(libhipcxx): remove this path of code once libhipcxx gets ready
-
-#  include <thrust/detail/tuple.inl>
-#  include <thrust/pair.h>
-
-THRUST_NAMESPACE_BEGIN
-
-/*! \addtogroup utility
- *  \{
- */
-
-/*! \addtogroup tuple
- *  \{
- */
-
-/*! This metafunction returns the type of a
- *  \p tuple's <tt>N</tt>th element.
- *
- *  \tparam N This parameter selects the element of interest.
- *  \tparam T A \c tuple type of interest.
- *
- *  \see pair
- *  \see tuple
- */
-template <size_t N, class T>
-struct tuple_element;
-
-/*! This metafunction returns the number of elements
- *  of a \p tuple type of interest.
- *
- *  \tparam T A \c tuple type of interest.
- *
- *  \see pair
- *  \see tuple
- */
-template <class T>
-struct tuple_size;
-
-// get function for non-const cons-lists, returns a reference to the element
-
-/*! The \p get function returns a reference to a \p tuple element of
- *  interest.
- *
- *  \param t A reference to a \p tuple of interest.
- *  \return A reference to \p t's <tt>N</tt>th element.
- *
- *  \tparam N The index of the element of interest.
- *
- *  The following code snippet demonstrates how to use \p get to print
- *  the value of a \p tuple element.
- *
- *  \code
- *  #include <thrust/tuple.h>
- *  #include <iostream>
- *  ...
- *  thrust::tuple<int, const char *> t(13, "thrust");
- *
- *  std::cout << "The 1st value of t is " << thrust::get<0>(t) << std::endl;
- *  \endcode
- *
- *  \see pair
- *  \see tuple
- */
-template <int N, class HT, class TT>
-THRUST_HOST_DEVICE inline typename access_traits<typename tuple_element<N, detail::cons<HT, TT>>::type>::non_const_type
-get(detail::cons<HT, TT>& t);
-
-/*! The \p get function returns a \c const reference to a \p tuple element of
- *  interest.
- *
- *  \param t A reference to a \p tuple of interest.
- *  \return A \c const reference to \p t's <tt>N</tt>th element.
- *
- *  \tparam N The index of the element of interest.
- *
- *  The following code snippet demonstrates how to use \p get to print
- *  the value of a \p tuple element.
- *
- *  \code
- *  #include <thrust/tuple.h>
- *  #include <iostream>
- *  ...
- *  thrust::tuple<int, const char *> t(13, "thrust");
- *
- *  std::cout << "The 1st value of t is " << thrust::get<0>(t) << std::endl;
- *  \endcode
- *
- *  \see pair
- *  \see tuple
- */
-template <int N, class HT, class TT>
-THRUST_HOST_DEVICE inline typename access_traits<typename tuple_element<N, detail::cons<HT, TT>>::type>::const_type
-get(const detail::cons<HT, TT>& t);
-
-/*! Constructs a \p tuple from a variadic list of types \p Ts, allowing the \p tuple to deduce
- *  its type as \p tuple<Ts...> based on the types of the provided arguments.
- *
- *  \tparam Ts... The parameter pack of types that will determine the tuple's type.
- *  \note This deduction guide enables automatic type deduction for variadic arguments
- *        when constructing a \p tuple.
- *  \see tuple
- */
-template <class... Ts>
-tuple(Ts...) -> tuple<Ts...>;
-
-/*! \cond
- */
-
-/*! A \p pair is a structure template holding two elements of types \p T1 and \p T2.
- *
- *  \tparam T1 The type of the first element in the \p pair.
- *  \tparam T2 The type of the second element in the \p pair.
- *  \note \p pair is used to store two heterogeneous values and can be converted to a \p tuple.
- *  \see tuple
- */
-template <class T1, class T2>
-struct pair;
-
-/*! \endcond
- */
-
-/*! Constructs a \p tuple from a \p pair<T1,T2>, unpacking its elements to initialize
- *  the tuple as \p tuple<T1,T2>.
- *
- *  \tparam T1 The type of the first element in the \p pair.
- *  \tparam T2 The type of the second element in the \p pair.
- *  \note This deduction guide allows a \p tuple to be created directly from a \p pair,
- *        simplifying the type conversion.
- *  \see pair
- *  \see tuple
- */
-template <class T1, class T2>
-tuple(pair<T1, T2>) -> tuple<T1, T2>;
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-/*! \brief \p tuple is a class template that can be instantiated with up to ten
- *  arguments. Each template argument specifies the type of element in the \p
- *  tuple. Consequently, tuples are heterogeneous, fixed-size collections of
- *  values. An instantiation of \p tuple with two arguments is similar to an
- *  instantiation of \p pair with the same two arguments. Individual elements
- *  of a \p tuple may be accessed with the \p get function.
- *
- *  \tparam TN The type of the <tt>N</tt> \c tuple element. Thrust's \p tuple
- *          type currently supports up to ten elements.
- *
- *  The following code snippet demonstrates how to create a new \p tuple object
- *  and inspect and modify the value of its elements.
- *
- *  \code
- *  #include <thrust/tuple.h>
- *  #include <iostream>
- *
- *  int main() {
- *    // Create a tuple containing an `int`, a `float`, and a string.
- *    thrust::tuple<int, float, const char*> t(13, 0.1f, "thrust");
- *
- *    // Individual members are accessed with the free function `get`.
- *    std::cout << "The first element's value is " << thrust::get<0>(t) << std::endl;
- *
- *    // ... or the member function `get`.
- *    std::cout << "The second element's value is " << t.get<1>() << std::endl;
- *
- *    // We can also modify elements with the same function.
- *    thrust::get<0>(t) += 10;
- *  }
- *  \endcode
- *
- *  \see pair
- *  \see get
- *  \see make_tuple
- *  \see tuple_element
- *  \see tuple_size
- *  \see tie
- */
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9>
-class tuple
-    /*! \cond
-     */
-    : public detail::map_tuple_to_cons<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>::type
-/*! \endcond
- */
-{
-  /*! \cond
-   */
-
-private:
-  using inherited = typename detail::map_tuple_to_cons<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>::type;
-
-  /*! \endcond
-   */
-
-public:
-  /*! \p tuple's no-argument constructor initializes each element.
-   */
-  inline THRUST_HOST_DEVICE tuple(void) {}
-
-  /*! \p tuple's one-argument constructor copy constructs the first element from the given parameter
-   *     and intializes all other elements.
-   *  \param t0 The value to assign to this \p tuple's first element.
-   */
-  inline THRUST_HOST_DEVICE tuple(typename access_traits<T0>::parameter_type t0)
-      : inherited(
-        t0,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  /*! \p tuple's one-argument constructor copy constructs the first two elements from the given parameters
-   *     and intializes all other elements.
-   *  \param t0 The value to assign to this \p tuple's first element.
-   *  \param t1 The value to assign to this \p tuple's second element.
-   *  \note \p tuple's constructor has ten variants of this form, the rest of which are ommitted here for brevity.
-   */
-  inline THRUST_HOST_DEVICE
-  tuple(typename access_traits<T0>::parameter_type t0, typename access_traits<T1>::parameter_type t1)
-      : inherited(
-        t0,
-        t1,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  /*! \cond
-   */
-
-  inline THRUST_HOST_DEVICE tuple(typename access_traits<T0>::parameter_type t0,
-                                  typename access_traits<T1>::parameter_type t1,
-                                  typename access_traits<T2>::parameter_type t2)
-      : inherited(
-        t0,
-        t1,
-        t2,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  inline THRUST_HOST_DEVICE
-  tuple(typename access_traits<T0>::parameter_type t0,
-        typename access_traits<T1>::parameter_type t1,
-        typename access_traits<T2>::parameter_type t2,
-        typename access_traits<T3>::parameter_type t3)
-      : inherited(
-        t0,
-        t1,
-        t2,
-        t3,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  inline THRUST_HOST_DEVICE
-  tuple(typename access_traits<T0>::parameter_type t0,
-        typename access_traits<T1>::parameter_type t1,
-        typename access_traits<T2>::parameter_type t2,
-        typename access_traits<T3>::parameter_type t3,
-        typename access_traits<T4>::parameter_type t4)
-      : inherited(
-        t0,
-        t1,
-        t2,
-        t3,
-        t4,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  inline THRUST_HOST_DEVICE
-  tuple(typename access_traits<T0>::parameter_type t0,
-        typename access_traits<T1>::parameter_type t1,
-        typename access_traits<T2>::parameter_type t2,
-        typename access_traits<T3>::parameter_type t3,
-        typename access_traits<T4>::parameter_type t4,
-        typename access_traits<T5>::parameter_type t5)
-      : inherited(
-        t0,
-        t1,
-        t2,
-        t3,
-        t4,
-        t5,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  inline THRUST_HOST_DEVICE
-  tuple(typename access_traits<T0>::parameter_type t0,
-        typename access_traits<T1>::parameter_type t1,
-        typename access_traits<T2>::parameter_type t2,
-        typename access_traits<T3>::parameter_type t3,
-        typename access_traits<T4>::parameter_type t4,
-        typename access_traits<T5>::parameter_type t5,
-        typename access_traits<T6>::parameter_type t6)
-      : inherited(
-        t0,
-        t1,
-        t2,
-        t3,
-        t4,
-        t5,
-        t6,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  inline THRUST_HOST_DEVICE tuple(
-    typename access_traits<T0>::parameter_type t0,
-    typename access_traits<T1>::parameter_type t1,
-    typename access_traits<T2>::parameter_type t2,
-    typename access_traits<T3>::parameter_type t3,
-    typename access_traits<T4>::parameter_type t4,
-    typename access_traits<T5>::parameter_type t5,
-    typename access_traits<T6>::parameter_type t6,
-    typename access_traits<T7>::parameter_type t7)
-      : inherited(
-        t0,
-        t1,
-        t2,
-        t3,
-        t4,
-        t5,
-        t6,
-        t7,
-        static_cast<const null_type&>(null_type()),
-        static_cast<const null_type&>(null_type()))
-  {}
-
-  inline THRUST_HOST_DEVICE tuple(
-    typename access_traits<T0>::parameter_type t0,
-    typename access_traits<T1>::parameter_type t1,
-    typename access_traits<T2>::parameter_type t2,
-    typename access_traits<T3>::parameter_type t3,
-    typename access_traits<T4>::parameter_type t4,
-    typename access_traits<T5>::parameter_type t5,
-    typename access_traits<T6>::parameter_type t6,
-    typename access_traits<T7>::parameter_type t7,
-    typename access_traits<T8>::parameter_type t8)
-      : inherited(t0, t1, t2, t3, t4, t5, t6, t7, t8, static_cast<const null_type&>(null_type()))
-  {}
-
-  inline THRUST_HOST_DEVICE tuple(
-    typename access_traits<T0>::parameter_type t0,
-    typename access_traits<T1>::parameter_type t1,
-    typename access_traits<T2>::parameter_type t2,
-    typename access_traits<T3>::parameter_type t3,
-    typename access_traits<T4>::parameter_type t4,
-    typename access_traits<T5>::parameter_type t5,
-    typename access_traits<T6>::parameter_type t6,
-    typename access_traits<T7>::parameter_type t7,
-    typename access_traits<T8>::parameter_type t8,
-    typename access_traits<T9>::parameter_type t9)
-      : inherited(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9)
-  {}
-
-  template <class U1, class U2>
-  inline THRUST_HOST_DEVICE tuple(const detail::cons<U1, U2>& p)
-      : inherited(p)
-  {}
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <class U1, class U2>
-  inline THRUST_HOST_DEVICE tuple& operator=(const detail::cons<U1, U2>& k)
-  {
-    inherited::operator=(k);
-    return *this;
-  }
-
-  /*! \endcond
-   */
-
-  /*! This assignment operator allows assigning the first two elements of this \p tuple from a \p pair.
-   *  \param k A \p pair to assign from.
-   */
-  THRUST_EXEC_CHECK_DISABLE
-  template <class U1, class U2>
-  THRUST_HOST_DEVICE inline tuple& operator=(const thrust::pair<U1, U2>& k)
-  {
-    // BOOST_STATIC_ASSERT(length<tuple>::value == 2);// check_length = 2
-    this->head      = k.first;
-    this->tail.head = k.second;
-    return *this;
-  }
-
-  /*! \p swap swaps the elements of two <tt>tuple</tt>s.
-   *
-   *  \param t The other <tt>tuple</tt> with which to swap.
-   */
-  inline THRUST_HOST_DEVICE void swap(tuple& t)
-  {
-    inherited::swap(t);
-  }
-};
-
-/*! \cond
- */
-
-template <>
-class tuple<null_type, null_type, null_type, null_type, null_type, null_type, null_type, null_type, null_type, null_type>
-    : public null_type
-{
-public:
-  using inherited = null_type;
-};
-
-/*! \endcond
- */
-
-THRUST_SUPPRESS_DEPRECATED_POP
-
-/*! This version of \p make_tuple creates a new \c tuple object from a
- *  single object.
- *
- *  \param t0 The object to copy from.
- *  \return A \p tuple object with a single member which is a copy of \p t0.
- */
-template <class T0>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0>::type make_tuple(const T0& t0);
-
-/*! This version of \p make_tuple creates a new \c tuple object from two
- *  objects.
- *
- *  \param t0 The first object to copy from.
- *  \param t1 The second object to copy from.
- *  \return A \p tuple object with two members which are copies of \p t0
- *          and \p t1.
- *
- *  \note \p make_tuple has ten variants, the rest of which are omitted here
- *        for brevity.
- */
-template <class T0, class T1>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1>::type make_tuple(const T0& t0, const T1& t1);
-
-/*! This version of \p tie creates a new \c tuple whose single element is
- *  a reference which refers to this function's argument.
- *
- *  \param t0 The object to reference.
- *  \return A \p tuple object with one member which is a reference to \p t0.
- */
-template <typename T0>
-THRUST_HOST_DEVICE inline tuple<T0&> tie(T0& t0);
-
-/*! This version of \p tie creates a new \c tuple of references object which
- *  refers to this function's arguments.
- *
- *  \param t0 The first object to reference.
- *  \param t1 The second object to reference.
- *  \return A \p tuple object with two members which are references to \p t0
- *          and \p t1.
- *
- *  \note \p tie has ten variants, the rest of which are omitted here for
- *           brevity.
- */
-template <typename T0, typename T1>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&> tie(T0& t0, T1& t1);
-
-/*! \p swap swaps the contents of two <tt>tuple</tt>s.
- *
- *  \param x The first \p tuple to swap.
- *  \param y The second \p tuple to swap.
- */
-template <typename T0,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4,
-          typename T5,
-          typename T6,
-          typename T7,
-          typename T8,
-          typename T9,
-          typename U0,
-          typename U1,
-          typename U2,
-          typename U3,
-          typename U4,
-          typename U5,
-          typename U6,
-          typename U7,
-          typename U8,
-          typename U9>
-inline THRUST_HOST_DEVICE void
-swap(tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& x, tuple<U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>& y);
-
-/*! \cond
- */
-
-template <class T0, class T1, class T2>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2>::type
-make_tuple(const T0& t0, const T1& t1, const T2& t2);
-
-template <class T0, class T1, class T2, class T3>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2, T3>::type
-make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3);
-
-template <class T0, class T1, class T2, class T3, class T4>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2, T3, T4>::type
-make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4);
-
-template <class T0, class T1, class T2, class T3, class T4, class T5>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5>::type
-make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5);
-
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6>::type
-make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6);
-
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6, T7>::type make_tuple(
-  const T0& t0, const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7);
-
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6, T7, T8>::type make_tuple(
-  const T0& t0,
-  const T1& t1,
-  const T2& t2,
-  const T3& t3,
-  const T4& t4,
-  const T5& t5,
-  const T6& t6,
-  const T7& t7,
-  const T8& t8);
-
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9>
-THRUST_HOST_DEVICE inline typename detail::make_tuple_mapper<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>::type make_tuple(
-  const T0& t0,
-  const T1& t1,
-  const T2& t2,
-  const T3& t3,
-  const T4& t4,
-  const T5& t5,
-  const T6& t6,
-  const T7& t7,
-  const T8& t8,
-  const T9& t9);
-
-template <typename T0, typename T1, typename T2>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&> tie(T0& t0, T1& t1, T2& t2);
-
-template <typename T0, typename T1, typename T2, typename T3>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&, T3&> tie(T0& t0, T1& t1, T2& t2, T3& t3);
-
-template <typename T0, typename T1, typename T2, typename T3, typename T4>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&, T3&, T4&> tie(T0& t0, T1& t1, T2& t2, T3& t3, T4& t4);
-
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&, T3&, T4&, T5&> tie(T0& t0, T1& t1, T2& t2, T3& t3, T4& t4, T5& t5);
-
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&, T3&, T4&, T5&, T6&>
-tie(T0& t0, T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6);
-
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&, T3&, T4&, T5&, T6&, T7&>
-tie(T0& t0, T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7);
-
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&>
-tie(T0& t0, T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7, T8& t8);
-
-template <typename T0,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4,
-          typename T5,
-          typename T6,
-          typename T7,
-          typename T8,
-          typename T9>
-THRUST_HOST_DEVICE inline tuple<T0&, T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&, T9&>
-tie(T0& t0, T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7, T8& t8, T9& t9);
-
-/*! \endcond
- */
-
-/*! \} // tuple
- */
-
-/*! \} // utility
- */
-
-#  ifndef THRUST_DOXYGEN_INVOKED
-namespace internal
-{
-template <typename F, typename Tuple, size_t... Is>
-constexpr auto apply_tuple_impl(F&& f, Tuple&& t, ::std::index_sequence<Is...>)
-{
-  return f(get<Is>(::std::forward<Tuple>(t))...);
-}
-} // namespace internal
-
-template <typename F, typename Tuple>
-constexpr auto apply(F&& f, Tuple&& t)
-{
-  constexpr ::std::size_t N = tuple_size<::std::remove_reference_t<Tuple>>::value;
-  return internal::apply_tuple_impl(::std::forward<F>(f), ::std::forward<Tuple>(t), ::std::make_index_sequence<N>{});
-}
-#  endif
-
-THRUST_NAMESPACE_END
-
-_THRUST_STD_NAMESPACE_BEGIN
-
-template <class... Ts>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<Ts...>> : std::tuple_size<std::tuple<Ts...>>
-{};
-
-template <size_t Id, class... Ts>
-struct tuple_element<Id, THRUST_NS_QUALIFIER::tuple<Ts...>> : std::tuple_element<Id, std::tuple<Ts...>>
-{};
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-template <>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 0>
-{};
-
-template <class T0>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  T0,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 1>
-{};
-
-template <class T0, class T1>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  T0,
-  T1,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 2>
-{};
-
-template <class T0, class T1, class T2>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  T0,
-  T1,
-  T2,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 3>
-{};
-
-template <class T0, class T1, class T2, class T3>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  T0,
-  T1,
-  T2,
-  T3,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 4>
-{};
-
-template <class T0, class T1, class T2, class T3, class T4>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  T0,
-  T1,
-  T2,
-  T3,
-  T4,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 5>
-{};
-
-template <class T0, class T1, class T2, class T3, class T4, class T5>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  T0,
-  T1,
-  T2,
-  T3,
-  T4,
-  T5,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 6>
-{};
-
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<
-  T0,
-  T1,
-  T2,
-  T3,
-  T4,
-  T5,
-  T6,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type,
-  THRUST_NS_QUALIFIER::null_type>> : std::integral_constant<std::size_t, 7>
-{};
-
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-struct tuple_size<THRUST_NS_QUALIFIER::
-                    tuple<T0, T1, T2, T3, T4, T5, T6, T7, THRUST_NS_QUALIFIER::null_type, THRUST_NS_QUALIFIER::null_type>>
-    : std::integral_constant<std::size_t, 8>
-{};
-
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-struct tuple_size<THRUST_NS_QUALIFIER::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, THRUST_NS_QUALIFIER::null_type>>
-    : std::integral_constant<std::size_t, 9>
-{};
-
-THRUST_SUPPRESS_DEPRECATED_POP
-_THRUST_STD_NAMESPACE_END
-
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD

From 708b65b35c49da768cab7f45a50b84b3fbc7ae23 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:36:25 -0400
Subject: [PATCH 19/48] refactor(rocthrust): CCCL 85bf1b00c4d parity - include
 libcxx <functional> in generic scan

Related upstream commit: 85bf1b00c4d Refactor generic thrust scan dispatch (NVIDIA/cccl#6360)
Related local port commit: fc66966f56f

system/detail/generic/scan.h uses _THRUST_STD::plus<>; include _THRUST_LIBCXX_INCLUDE(functional)
(upstream <cuda/functional>) instead of <thrust/functional.h>, now that libhipcxx is mandatory.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/thrust/system/detail/generic/scan.h      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scan.h
index 93fb1a7da803..cf20e4c1f2d1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scan.h
@@ -26,11 +26,12 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/scan.h>
 #include <thrust/system/detail/generic/scan.h>
 
+#include _THRUST_LIBCXX_INCLUDE(functional)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {

From b0828f17c8891747b60ba7006ceac8b0fd39327f Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:37:08 -0400
Subject: [PATCH 20/48] refactor(rocthrust): CCCL 865e3d6429f parity - drop
 seq/tbb backend fallbacks, granular includes

Related upstream commit: 865e3d6429f Inline remaining `*.inl` files in tbb and seq backends (NVIDIA/cccl#6437)
Related local port commit: cd4d3034fbb

libhipcxx is now mandatory, so the inlined seq/tbb backend headers follow upstream's includes:
- sequential/sort.h: drop the unused libcxx_wrapper conjunction.h include and the
  !_THRUST_HAS_DEVICE_SYSTEM_STD <type_traits> fallback.
- sequential/stable_merge_sort.h: include only _THRUST_STD_INCLUDE(__algorithm/min.h), unguarded
  (algorithm_wrapper.h fallback and the <iterator> umbrella removed).
- sequential/stable_primitive_sort.h: drop the <type_traits> fallback.
- tbb/detail/reduce_by_key.h: unguarded __algorithm/{max,min}.h and __type_traits/void_t.h, plus
  upstream's __iterator/reverse_iterator.h and __utility/pair.h instead of the <iterator> umbrella;
  algorithm_wrapper.h/<type_traits> fallback removed. (thrust::pair -> _THRUST_STD::pair is done
  separately for CCCL 91434d76ab3.)
The local _THRUST_IF_TARGET/THRUST_COMPILER spellings in sequential/sort.h are kept.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/detail/sequential/sort.h        |  5 -----
 .../system/detail/sequential/stable_merge_sort.h  |  9 +--------
 .../detail/sequential/stable_primitive_sort.h     |  4 ----
 .../thrust/system/tbb/detail/reduce_by_key.h      | 15 +++++----------
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/sort.h
index 30ac2dbff468..511e78e14fec 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/sort.h
@@ -31,7 +31,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/reverse.h>
@@ -39,10 +38,6 @@
 #include <thrust/system/detail/sequential/stable_merge_sort.h>
 #include <thrust/system/detail/sequential/stable_primitive_sort.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
index ba3589a6d229..e080d564d885 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
@@ -33,14 +33,7 @@
 #include <thrust/system/detail/sequential/execution_policy.h>
 #include <thrust/system/detail/sequential/insertion_sort.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#  include _THRUST_STD_INCLUDE(iterator)
-#endif
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h
index fecf33321265..7bfdb06c7ef9 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h
@@ -32,10 +32,6 @@
 #include <thrust/system/detail/sequential/partition.h>
 #include <thrust/system/detail/sequential/stable_radix_sort.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
index e0027679f63c..1f462c9bfe9b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
@@ -20,17 +20,12 @@
 #include <thrust/system/tbb/detail/execution_policy.h>
 #include <thrust/system/tbb/detail/reduce_intervals.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#  include _THRUST_STD_INCLUDE(__type_traits/void_t.h)
-#else
-#  include <thrust/detail/algorithm_wrapper.h>
-
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__algorithm/max.h)
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#include _THRUST_STD_INCLUDE(__iterator/reverse_iterator.h)
+#include _THRUST_STD_INCLUDE(__type_traits/void_t.h)
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 #include _THRUST_STD_INCLUDE(cassert)
-#include _THRUST_STD_INCLUDE(iterator)
 
 #include <thread>
 

From 4f7491babb8b0ff4b77baae803340d644e7c9150 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:39:47 -0400
Subject: [PATCH 21/48] refactor(rocthrust): CCCL 24deb145aec/369f2f72eca
 parity - complex math includes

Related upstream commit: 24deb145aec Cleanup `thrust::complex` math includes and functions (NVIDIA/cccl#6546)
Related upstream commit: 369f2f72eca Fix merge conflicts from dropping headers (NVIDIA/cccl#6563)
Related local port commits: f58e51061b6, 556bd2a6c38

libhipcxx is now mandatory, so the thrust::complex headers can use the
same granular libhipcxx includes as upstream instead of the <cmath>
umbrella:
- thrust/detail/complex/*.h include the upstream __cmath/* headers
  (plus limits / __type_traits/common_type.h where upstream does).
  arithmetic.h keeps cfloat for FLT_MIN/DBL_MIN.
- thrust/complex.h includes __type_traits/{common_type,remove_reference}.h
  as upstream and drops the dead !_THRUST_HAS_DEVICE_SYSTEM_STD
  <type_traits> fallback.
- ::internal::common_type_t is replaced by _THRUST_STD::common_type_t
  (as upstream) in complex.h, arithmetic.h, cpow.h and test_complex.cpp,
  and the ::internal::common_type_t alias (TODO(libhipcxx)) is removed
  from thrust/detail/type_traits.h.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/test/test_complex.cpp   | 12 ++--
 .../hipccl/hipccl3/rocthrust/thrust/complex.h | 39 ++++++------
 .../thrust/detail/complex/arithmetic.h        | 59 ++++++++++---------
 .../rocthrust/thrust/detail/complex/catrig.h  | 11 +++-
 .../rocthrust/thrust/detail/complex/catrigf.h | 11 +++-
 .../rocthrust/thrust/detail/complex/ccosh.h   |  6 +-
 .../rocthrust/thrust/detail/complex/ccoshf.h  |  6 +-
 .../rocthrust/thrust/detail/complex/cexp.h    |  3 +-
 .../rocthrust/thrust/detail/complex/cexpf.h   |  3 +-
 .../rocthrust/thrust/detail/complex/clog.h    |  5 +-
 .../rocthrust/thrust/detail/complex/clogf.h   |  5 +-
 .../rocthrust/thrust/detail/complex/cpow.h    | 16 ++---
 .../rocthrust/thrust/detail/complex/cproj.h   |  3 +-
 .../rocthrust/thrust/detail/complex/csinh.h   |  6 +-
 .../rocthrust/thrust/detail/complex/csinhf.h  |  6 +-
 .../rocthrust/thrust/detail/complex/csqrt.h   |  8 ++-
 .../rocthrust/thrust/detail/complex/csqrtf.h  |  8 ++-
 .../rocthrust/thrust/detail/complex/ctanh.h   | 10 +++-
 .../rocthrust/thrust/detail/complex/ctanhf.h  |  9 ++-
 .../rocthrust/thrust/detail/type_traits.h     |  8 ---
 20 files changed, 150 insertions(+), 84 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/test/test_complex.cpp b/projects/hipccl/hipccl3/rocthrust/test/test_complex.cpp
index 8bfa087b22b3..923436f1df90 100644
--- a/projects/hipccl/hipccl3/rocthrust/test/test_complex.cpp
+++ b/projects/hipccl/hipccl3/rocthrust/test/test_complex.cpp
@@ -971,11 +971,11 @@ TYPED_TEST(ComplexPairsTests, TestCompoundPlusOperator)
 
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = _THRUST_STD::common_type_t<T, U>;
       lhs        = std::complex<type>(lhs.real() + rhs.real(), lhs.imag() + rhs.imag());
     },
     [=](std::complex<T>& lhs, const U& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = _THRUST_STD::common_type_t<T, U>;
       lhs        = std::complex<type>(lhs.real() + rhs, lhs.imag());
     },
     [=](thrust::complex<T>& lhs, const thrust::complex<U>& rhs) {
@@ -995,11 +995,11 @@ TYPED_TEST(ComplexPairsTests, TestCompoundMinusOperator)
 
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = _THRUST_STD::common_type_t<T, U>;
       lhs        = std::complex<type>(lhs.real() - rhs.real(), lhs.imag() - rhs.imag());
     },
     [=](std::complex<T>& lhs, const U& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = _THRUST_STD::common_type_t<T, U>;
       lhs        = std::complex<type>(lhs.real() - rhs, lhs.imag());
     },
     [=](thrust::complex<T>& lhs, const thrust::complex<U>& rhs) {
@@ -1020,7 +1020,7 @@ TYPED_TEST(ComplexPairsTests, TestCompoundMultiplyOperator)
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
       // (a + bi)(c + di) = ac + i(ad + bc) - bd
-      using type = ::internal::common_type_t<T, U>;
+      using type = _THRUST_STD::common_type_t<T, U>;
 
       type a = static_cast<type>(lhs.real());
       type b = static_cast<type>(lhs.imag());
@@ -1054,7 +1054,7 @@ TYPED_TEST(ComplexPairsTests, TestCompoundDivisionOperator)
 
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = _THRUST_STD::common_type_t<T, U>;
 
       // (a + bi) / (c + di) = ((ac + bd) + (bc -ad)i) / (c^2 + d^2)
       type a = static_cast<type>(lhs.real());
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/complex.h b/projects/hipccl/hipccl3/rocthrust/thrust/complex.h
index 13584b345570..d11882c350b3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/complex.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/complex.h
@@ -35,16 +35,13 @@
 #include <thrust/detail/type_traits.h>
 #include <thrust/type_traits/is_trivially_relocatable.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__type_traits/common_type.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_reference.h)
 #if !THRUST_COMPILER(NVRTC)
 #  include <complex>
 #  include <sstream>
 #endif // !THRUST_COMPILER(NVRTC)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
 #define THRUST_STD_COMPLEX_REAL(z) \
   reinterpret_cast<const typename _THRUST_STD::remove_reference_t<decltype(z)>::value_type(&)[2]>(z)[0]
 #define THRUST_STD_COMPLEX_IMAG(z) \
@@ -396,7 +393,7 @@ THRUST_HOST_DEVICE complex<T> conj(const complex<T>& z);
  *  \param theta The phase of the returned \p complex in radians.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> polar(const T0& m, const T1& theta = T1());
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> polar(const T0& m, const T1& theta = T1());
 
 /*! Returns the projection of a \p complex on the Riemann sphere.
  *  For all finite \p complex it returns the argument. For \p complexs
@@ -419,7 +416,7 @@ THRUST_HOST_DEVICE complex<T> proj(const T& z);
  *  \param y The second \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator+(const complex<T0>& x, const complex<T1>& y);
 
 /*! Adds a scalar to a \p complex number.
  *
@@ -430,7 +427,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const co
  *  \param y The scalar.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator+(const complex<T0>& x, const T1& y);
 
 /*! Adds a \p complex number to a scalar.
  *
@@ -441,7 +438,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const co
  *  \param y The \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator+(const T0& x, const complex<T1>& y);
 
 /*! Subtracts two \p complex numbers.
  *
@@ -452,7 +449,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const T0
  *  \param y The second \p complex (subtrahend).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator-(const complex<T0>& x, const complex<T1>& y);
 
 /*! Subtracts a scalar from a \p complex number.
  *
@@ -463,7 +460,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const co
  *  \param y The scalar (subtrahend).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator-(const complex<T0>& x, const T1& y);
 
 /*! Subtracts a \p complex number from a scalar.
  *
@@ -474,7 +471,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const co
  *  \param y The \p complex (subtrahend).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator-(const T0& x, const complex<T1>& y);
 
 /*! Multiplies two \p complex numbers.
  *
@@ -485,7 +482,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const T0
  *  \param y The second \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator*(const complex<T0>& x, const complex<T1>& y);
 
 /*! Multiplies a \p complex number by a scalar.
  *
@@ -493,7 +490,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const co
  *  \param y The scalar.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator*(const complex<T0>& x, const T1& y);
 
 /*! Multiplies a scalar by a \p complex number.
  *
@@ -504,7 +501,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const co
  *  \param y The \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator*(const T0& x, const complex<T1>& y);
 
 /*! Divides two \p complex numbers.
  *
@@ -515,7 +512,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const T0
  *  \param y The denomimator (divisor).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator/(const complex<T0>& x, const complex<T1>& y);
 
 /*! Divides a \p complex number by a scalar.
  *
@@ -526,7 +523,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const co
  *  \param y The scalar denomimator (divisor).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator/(const complex<T0>& x, const T1& y);
 
 /*! Divides a scalar by a \p complex number.
  *
@@ -537,7 +534,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const co
  *  \param y The complex denomimator (divisor).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator/(const T0& x, const complex<T1>& y);
 
 /* --- Unary Arithmetic operators --- */
 
@@ -590,7 +587,7 @@ THRUST_HOST_DEVICE complex<T> log10(const complex<T>& z);
  *  \param y The exponent.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> pow(const complex<T0>& x, const complex<T1>& y);
 
 /*! Returns a \p complex number raised to a scalar.
  *
@@ -601,7 +598,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<
  *  \param y The exponent.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> pow(const complex<T0>& x, const T1& y);
 
 /*! Returns a scalar raised to a \p complex number.
  *
@@ -612,7 +609,7 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<
  *  \param y The exponent.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> pow(const T0& x, const complex<T1>& y);
 
 /*! Returns the complex square root of a \p complex number.
  *
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/arithmetic.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/arithmetic.h
index a3e346b37923..b011e9db20f1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/arithmetic.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/arithmetic.h
@@ -24,79 +24,84 @@
 #include <thrust/detail/type_traits.h>
 
 #include _THRUST_STD_INCLUDE(cfloat)
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/hypot.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__type_traits/common_type.h)
 
 THRUST_NAMESPACE_BEGIN
 
 /* --- Binary Arithmetic Operators --- */
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator+(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x.real() + y.real(), x.imag() + y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator+(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x.real() + y, x.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator+(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x + y.real(), y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator-(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x.real() - y.real(), x.imag() - y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator-(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x.real() - y, x.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator-(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x - y.real(), -y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator*(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x.real() * y.real() - x.imag() * y.imag(), x.real() * y.imag() + x.imag() * y.real());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator*(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x.real() * y, x.imag() * y);
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator*(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x * y.real(), x * y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator/(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   T s     = _THRUST_STD::abs(y.real()) + _THRUST_STD::abs(y.imag());
 
   T oos = T(1.0) / s;
@@ -115,16 +120,16 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const co
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator/(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x.real() / y, x.imag() / y);
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> operator/(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(x) / y;
 }
 
@@ -199,9 +204,9 @@ THRUST_HOST_DEVICE inline double norm(const complex<double>& z)
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> polar(const T0& m, const T1& theta)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> polar(const T0& m, const T1& theta)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return complex<T>(m * _THRUST_STD::cos(theta), m * _THRUST_STD::sin(theta));
 }
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrig.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrig.h
index 9f56d1c723db..92289af389d6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrig.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrig.h
@@ -53,7 +53,16 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/hypot.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/isinf.h)
+#include _THRUST_STD_INCLUDE(__cmath/isnan.h)
+#include _THRUST_STD_INCLUDE(__cmath/logarithms.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/signbit.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrigf.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrigf.h
index eb25b6c26f34..b8b7222dc1f2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrigf.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/catrigf.h
@@ -53,7 +53,16 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/hypot.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/isinf.h)
+#include _THRUST_STD_INCLUDE(__cmath/isnan.h)
+#include _THRUST_STD_INCLUDE(__cmath/logarithms.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/signbit.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccosh.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccosh.h
index 47bc17a9658a..fd06e168949e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccosh.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccosh.h
@@ -53,7 +53,11 @@
 #include <thrust/detail/complex/cexp.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccoshf.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccoshf.h
index c889ae3b9cab..bf70c8f988fe 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccoshf.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ccoshf.h
@@ -54,7 +54,11 @@
 #include <thrust/detail/complex/cexpf.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexp.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexp.h
index 5eca70b07d44..2486d1c0de84 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexp.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexp.h
@@ -55,7 +55,8 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexpf.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexpf.h
index 71c19a3a751f..17ed0217f6e1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexpf.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cexpf.h
@@ -55,7 +55,8 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clog.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clog.h
index a02ac302826b..ce5f3430710f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clog.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clog.h
@@ -51,7 +51,10 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/hypot.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/logarithms.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clogf.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clogf.h
index 1444dd5a6ab8..0e14e0bce28c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clogf.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/clogf.h
@@ -51,7 +51,10 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/hypot.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/logarithms.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cpow.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cpow.h
index 6155f4a4c577..5f80cd28c2a2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cpow.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cpow.h
@@ -25,14 +25,16 @@
 #include <thrust/detail/complex/clog.h>
 #include <thrust/detail/type_traits.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/logarithms.h)
+#include _THRUST_STD_INCLUDE(__type_traits/common_type.h)
 
 THRUST_NAMESPACE_BEGIN
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> pow(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return exp(log(complex<T>(x)) * complex<T>(y));
 }
 
@@ -68,16 +70,16 @@ THRUST_HOST_DEVICE inline complex<float> pow(const complex<float>& x, const comp
 #endif
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> pow(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return exp(log(complex<T>(x)) * T(y));
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<_THRUST_STD::common_type_t<T0, T1>> pow(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = _THRUST_STD::common_type_t<T0, T1>;
   return exp(_THRUST_STD::log(T(x)) * complex<T>(y));
 }
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cproj.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cproj.h
index 0f3afdb40140..6b3626a9574d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cproj.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/cproj.h
@@ -22,7 +22,8 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/isinf.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinh.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinh.h
index a0af5d0b5c71..0656a5b648b4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinh.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinh.h
@@ -53,7 +53,11 @@
 #include <thrust/detail/complex/cexp.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinhf.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinhf.h
index 033d4217dc20..8ad17db03749 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinhf.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csinhf.h
@@ -54,7 +54,11 @@
 #include <thrust/detail/complex/cexpf.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrt.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrt.h
index 646c45c72e53..dc745c1a9816 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrt.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrt.h
@@ -53,7 +53,13 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/hypot.h)
+#include _THRUST_STD_INCLUDE(__cmath/isinf.h)
+#include _THRUST_STD_INCLUDE(__cmath/isnan.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/signbit.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrtf.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrtf.h
index 0e6c7efa96f7..ac277fdf771e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrtf.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/csqrtf.h
@@ -53,7 +53,13 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/hypot.h)
+#include _THRUST_STD_INCLUDE(__cmath/isinf.h)
+#include _THRUST_STD_INCLUDE(__cmath/isnan.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/signbit.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanh.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanh.h
index 975091459a9a..a48b1a50a597 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanh.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanh.h
@@ -92,7 +92,15 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/abs.h)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/isfinite.h)
+#include _THRUST_STD_INCLUDE(__cmath/isinf.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanhf.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanhf.h
index 08e288451748..2cc7d2ebde86 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanhf.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/complex/ctanhf.h
@@ -57,7 +57,14 @@
 #include <thrust/complex.h>
 #include <thrust/detail/complex/math_private.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/copysign.h)
+#include _THRUST_STD_INCLUDE(__cmath/exponential_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/hyperbolic_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/inverse_trigonometric_functions.h)
+#include _THRUST_STD_INCLUDE(__cmath/isfinite.h)
+#include _THRUST_STD_INCLUDE(__cmath/isinf.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::complex
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
index 08072b58904a..14f8c30ae3fc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
@@ -179,11 +179,3 @@ using detail::integral_constant;
 using detail::true_type;
 
 THRUST_NAMESPACE_END
-
-// TODO(libhipcxx): remove this namespace and replace ::internal::common_type_t
-// with _THRUST_STD::common_type_t in rocThrust once libhipcxx gets ready
-namespace internal
-{
-template <typename... Tp>
-using common_type_t = _THRUST_STD::common_type_t<Tp...>;
-} // namespace internal

From ff61ab2ab2f75d451933323b4f4e4af16415b870 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:41:50 -0400
Subject: [PATCH 22/48] refactor(rocthrust): CCCL 4b10fd26255 parity -
 is_integral/_If and includes

Related upstream commit: 4b10fd26255 Cleanup includes in thrust (NVIDIA/cccl#6547)
Related local port commit: ed712243cf1

The port kept the ::internal::is_integral / ::internal::If wrappers, the
local umbrella include blocks and the dual less/greater list in cuda
sort.h because of non-libhipcxx builds. libhipcxx is now mandatory, so:
- ::internal::is_integral(_v) -> _THRUST_STD::is_integral(_v) in
  detail/type_traits.h, detail/vector_base.inl and counting_iterator.h
  (is_integral_v in distance_to, as upstream); the now-unused
  ::internal::is_integral/is_integral_v aliases are removed.
- ::internal::If -> _THRUST_STD::_If (as upstream) in counting_iterator.h,
  iterator_adaptor_base.h, iterator_category_to_traversal.h,
  generic/reduce_by_key.inl and hip/detail/reduce_by_key.h; the
  libcxx_wrapper conditional.h includes are replaced by
  _THRUST_STD_INCLUDE(__type_traits/conditional.h). (The wrapper file
  itself stays because the dead fallback branch of the construct_at
  wrapper still includes it.)
- counting_iterator.h and iterator_adaptor_base.h take the upstream
  granular __type_traits includes (drops the rocprim/type_traits.hpp
  fallback); minimum_system.h and iterator_category_to_traversal.h drop
  the type_traits includes as upstream.
- cuda sort.h: can_use_primitive_sort uses the upstream is_same_v list
  without the duplicated _THRUST_STD:: comparators (_THRUST_STD is
  ::cuda::std there).

thrust/detail/type_traits.h keeps its _THRUST_STD_INCLUDE(type_traits)
umbrella; switching it to upstream's granular list would require the
upstream include fixups in ~100 other headers.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/detail/type_traits.h       |  4 +---
 .../rocthrust/thrust/detail/vector_base.inl     |  2 +-
 .../thrust/iterator/counting_iterator.h         | 17 +++++++----------
 .../iterator/detail/iterator_adaptor_base.h     | 16 +++++++++-------
 .../detail/iterator_category_to_traversal.h     | 11 +++--------
 .../thrust/iterator/detail/minimum_system.h     |  4 +---
 .../rocthrust/thrust/system/cuda/detail/sort.h  | 13 ++++---------
 .../system/detail/generic/reduce_by_key.inl     |  6 ++----
 .../thrust/system/hip/detail/reduce_by_key.h    |  8 ++++----
 9 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
index 14f8c30ae3fc..8cfe07629aeb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
@@ -40,8 +40,6 @@
 namespace internal
 {
 using _THRUST_STD::is_arithmetic;
-using _THRUST_STD::is_integral;
-using _THRUST_STD::is_integral_v;
 using _THRUST_STD::make_unsigned;
 
 template <typename T>
@@ -70,7 +68,7 @@ using true_type         = _THRUST_STD::true_type;
 using false_type        = _THRUST_STD::false_type;
 
 template <typename T>
-struct is_non_bool_integral : public ::internal::is_integral<T>
+struct is_non_bool_integral : public _THRUST_STD::is_integral<T>
 {};
 template <>
 struct is_non_bool_integral<bool> : public false_type
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl
index 984e97a9dbf0..d1a63e5931d2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl
@@ -681,7 +681,7 @@ void vector_base<T, Alloc>::insert(iterator position, InputIterator first, Input
 {
   // we could have received insert(position, n, x), so disambiguate on the
   // type of InputIterator
-  using integral = typename ::internal::is_integral<InputIterator>;
+  using integral = typename _THRUST_STD::is_integral<InputIterator>;
 
   insert_dispatch(position, first, last, integral());
 } // end vector_base::insert()
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h
index cafb596997ca..e9d5a1c5ebbe 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h
@@ -40,21 +40,18 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/type_identity.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_adaptor.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/strided_iterator.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__type_traits/is_floating_point.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_integral.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 #include _THRUST_STD_INCLUDE(cstddef)
-#include _THRUST_STD_INCLUDE(type_traits)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(type_traits)
-#else
-#  include <rocprim/type_traits.hpp>
-#endif
 
 THRUST_NAMESPACE_BEGIN
 
@@ -65,7 +62,7 @@ namespace detail
 {
 template <typename Number>
 using counting_iterator_difference_type =
-  ::internal::If<::internal::is_integral_v<Number> && sizeof(Number) < sizeof(int), int, _THRUST_STD::ptrdiff_t>;
+  _THRUST_STD::_If<_THRUST_STD::is_integral_v<Number> && sizeof(Number) < sizeof(int), int, _THRUST_STD::ptrdiff_t>;
 
 template <typename Incrementable, typename System, typename Traversal, typename Difference, typename StrideHolder>
 struct make_counting_iterator_base
@@ -290,7 +287,7 @@ class THRUST_DECLSPEC_EMPTY_BASES counting_iterator
   THRUST_HOST_DEVICE difference_type distance_to(
     counting_iterator<Incrementable, OtherSystem, OtherTraversal, OtherDifference, StrideHolder> const& y) const
   {
-    if constexpr (::internal::is_integral<Incrementable>::value)
+    if constexpr (_THRUST_STD::is_integral_v<Incrementable>)
     {
       return static_cast<difference_type>(y.base()) - static_cast<difference_type>(this->base());
     }
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h
index ee65e3affbf3..08e1fd7065e7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h
@@ -26,13 +26,15 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/use_default.h>
 #include <thrust/iterator/iterator_facade.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -50,8 +52,8 @@ namespace detail
 {
 // If T is use_default, return the result of invoking DefaultNullaryFn, otherwise return T.
 template <class T, class DefaultNullaryFn>
-using replace_if_use_default =
-  typename ::internal::If<_THRUST_STD::is_same_v<T, use_default>, DefaultNullaryFn, _THRUST_STD::type_identity<T>>::type;
+using replace_if_use_default = typename _THRUST_STD::
+  _If<_THRUST_STD::is_same_v<T, use_default>, DefaultNullaryFn, _THRUST_STD::type_identity<T>>::type;
 
 // A metafunction which computes an iterator_adaptor's base class, a specialization of iterator_facade.
 template <typename Derived,
@@ -69,9 +71,9 @@ struct make_iterator_adaptor_base
   using traversal = replace_if_use_default<Traversal, iterator_traversal<Base>>;
   using reference =
     replace_if_use_default<Reference,
-                           ::internal::If<_THRUST_STD::is_same_v<Value, use_default>,
-                                          lazy_trait<it_reference_t, Base>,
-                                          _THRUST_STD::add_lvalue_reference<Value>>>;
+                           _THRUST_STD::_If<_THRUST_STD::is_same_v<Value, use_default>,
+                                            lazy_trait<it_reference_t, Base>,
+                                            _THRUST_STD::add_lvalue_reference<Value>>>;
   using difference = replace_if_use_default<Difference, lazy_trait<it_difference_t, Base>>;
 
 public:
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h
index e1b0bdf02543..ea90a4f9143e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h
@@ -26,15 +26,10 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_categories.h>
 #include <thrust/iterator/iterator_traversal_tags.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 
 namespace detail
@@ -58,9 +53,9 @@ THRUST_HOST_DEVICE auto cat_to_traversal_impl(const output_device_iterator_tag&)
 template <typename CategoryOrTraversal>
 struct iterator_category_to_traversal
 {
-  using type = ::internal::If<_THRUST_STD::is_convertible_v<CategoryOrTraversal, incrementable_traversal_tag>,
-                              CategoryOrTraversal,
-                              decltype(cat_to_traversal_impl(CategoryOrTraversal{}))>;
+  using type = _THRUST_STD::_If<_THRUST_STD::is_convertible_v<CategoryOrTraversal, incrementable_traversal_tag>,
+                                CategoryOrTraversal,
+                                decltype(cat_to_traversal_impl(CategoryOrTraversal{}))>;
 };
 
 template <typename CategoryOrTraversal>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/minimum_system.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/minimum_system.h
index 816a5c04fba4..5328a24b0667 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/minimum_system.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/minimum_system.h
@@ -25,13 +25,11 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
+
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/is_metafunction_defined.h>
 #include <thrust/detail/type_traits/minimum_type.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/sort.h
index 96180b34fe6c..d3e12aeecabc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/sort.h
@@ -305,7 +305,6 @@ THRUST_RUNTIME_FUNCTION void radix_sort(execution_policy<Derived>& policy, Key*
 
 namespace __smart_sort
 {
-// TODO(bgruber): we can drop _THRUST_STD::less etc. when they truly alias to the ::cuda::std ones
 template <class Key, class CompareOp>
 using can_use_primitive_sort = ::cuda::std::integral_constant<
   bool,
@@ -318,14 +317,10 @@ using can_use_primitive_sort = ::cuda::std::integral_constant<
 #  endif // _CCCL_HAS_NVBF16() && !defined(__CUDA_NO_BFLOAT16_CONVERSIONS__) &&
          // !defined(__CUDA_NO_BFLOAT16_OPERATORS__)
    )
-    && (::cuda::std::is_same<CompareOp, _THRUST_STD::less<Key>>::value
-        || ::cuda::std::is_same<CompareOp, ::cuda::std::less<Key>>::value
-        || ::cuda::std::is_same<CompareOp, _THRUST_STD::less<void>>::value
-        || ::cuda::std::is_same<CompareOp, ::cuda::std::less<void>>::value
-        || ::cuda::std::is_same<CompareOp, _THRUST_STD::greater<Key>>::value
-        || ::cuda::std::is_same<CompareOp, ::cuda::std::greater<Key>>::value
-        || ::cuda::std::is_same<CompareOp, _THRUST_STD::greater<void>>::value
-        || ::cuda::std::is_same<CompareOp, ::cuda::std::greater<void>>::value)>;
+    && (::cuda::std::is_same_v<CompareOp, ::cuda::std::less<Key>>
+        || ::cuda::std::is_same_v<CompareOp, ::cuda::std::less<void>>
+        || ::cuda::std::is_same_v<CompareOp, ::cuda::std::greater<Key>>
+        || ::cuda::std::is_same_v<CompareOp, ::cuda::std::greater<void>>)>;
 
 template <
   class SORT_ITEMS,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
index a92fc79ed385..5686e332a345 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
@@ -27,7 +27,6 @@
 #endif // no system header
 
 #include <thrust/detail/internal_functional.h>
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/iterator/is_output_iterator.h>
@@ -41,6 +40,7 @@
 #  include _THRUST_STD_INCLUDE(iterator)
 #endif
 
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 THRUST_NAMESPACE_BEGIN
@@ -172,9 +172,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   OutputIterator2 values_output,
   BinaryPredicate binary_pred)
 {
-  using T = ::internal::
-
-    If<thrust::detail::is_output_iterator<OutputIterator2>,
+  using T = _THRUST_STD::_If<thrust::detail::is_output_iterator<OutputIterator2>,
        thrust::detail::it_value_t<InputIterator2>,
        thrust::detail::it_value_t<OutputIterator2>>;
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
index 591cfaa3527a..56ea7a91e0fe 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
@@ -42,7 +42,6 @@
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/alignment.h>
-#  include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #  include <thrust/detail/raw_reference_cast.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/detail/type_traits/iterator/is_output_iterator.h>
@@ -59,6 +58,7 @@
 #    include _THRUST_STD_INCLUDE(iterator)
 #  endif
 
+#  include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocprim include
@@ -334,9 +334,9 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
   ValOutputIt values_output,
   BinaryPred binary_pred)
 {
-  using value_type = ::internal::If<thrust::detail::is_output_iterator<ValOutputIt>,
-                                    thrust::detail::it_value_t<ValInputIt>,
-                                    thrust::detail::it_value_t<ValOutputIt>>;
+  using value_type = _THRUST_STD::_If<thrust::detail::is_output_iterator<ValOutputIt>,
+                                      thrust::detail::it_value_t<ValInputIt>,
+                                      thrust::detail::it_value_t<ValOutputIt>>;
   return hip_rocprim::reduce_by_key(
     policy, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, plus<value_type>());
 }

From 6034ef447237cc1224553d1b168766e235e51558 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:42:33 -0400
Subject: [PATCH 23/48] refactor(rocthrust): CCCL 3a4892e1fb9 parity - mdspan
 in sum_rows/sum_columns

Related upstream commit: 3a4892e1fb9 [Thrust]: New "sum rows" and "sum columns" examples (NVIDIA/cccl#4462)
Related local port commit: db4bdf3502d

The port used a raw pointer + manual row-major indexing and
thrust::counting_iterator because cuda::std::mdspan / cuda::counting_iterator
were unavailable without libhipcxx. libhipcxx is now mandatory, so the
examples follow upstream: _THRUST_STD::mdspan for the 2D view (M.data_handle(),
M.size(), M(i, j)) and _THRUST_LIBCXX::counting_iterator, with
_THRUST_LIBCXX_INCLUDE(iterator) / _THRUST_STD_INCLUDE(mdspan).
sum_columns.cu keeps its explicit permutation_iterator include.

Also removes a stray "<<<<<<< ours" conflict marker left at the top of
examples/sum_rows.cu by db4bdf3502d.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/examples/sum_columns.cu | 19 ++++++++-------
 .../hipccl3/rocthrust/examples/sum_rows.cu    | 24 +++++++++----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/examples/sum_columns.cu b/projects/hipccl/hipccl3/rocthrust/examples/sum_columns.cu
index 780153c24ad9..991be54c4d3a 100644
--- a/projects/hipccl/hipccl3/rocthrust/examples/sum_columns.cu
+++ b/projects/hipccl/hipccl3/rocthrust/examples/sum_columns.cu
@@ -13,6 +13,9 @@
 #include <thrust/tabulate.h>
 #include <thrust/universal_vector.h>
 
+#include _THRUST_LIBCXX_INCLUDE(iterator)
+#include _THRUST_STD_INCLUDE(mdspan)
+
 #include <iomanip>
 #include <iostream>
 
@@ -23,16 +26,15 @@ int main()
   const int rows = 32;
   const int cols = 16;
 
-  // Create a 2D row-major multidimensional array of ints.
+  // Create a 2D multidimensional array of ints.
   thrust::universal_vector<int> data(rows * cols, 42);
-  int* M         = thrust::raw_pointer_cast(data.data());
-  const int size = rows * cols;
+  _THRUST_STD::mdspan M(thrust::raw_pointer_cast(data.data()), rows, cols);
 
   // Create an iterator to the flat linear index space for the multidimensional array.
-  auto flat_idx = thrust::counting_iterator<int>(0);
+  auto flat_idx = _THRUST_LIBCXX::counting_iterator(0);
 
   // Fill the array with pseudorandom inputs in parallel on the device.
-  thrust::tabulate(thrust::device, M, M + size, [] __host__ __device__(int flat) {
+  thrust::tabulate(thrust::device, M.data_handle(), M.data_handle() + M.size(), [] __host__ __device__(int flat) {
     thrust::default_random_engine rng;
     thrust::uniform_int_distribution<int> dist(0, 3);
     rng.discard(flat); // Advance to the current element's position.
@@ -43,11 +45,12 @@ int main()
   auto col_idx_begin = thrust::make_transform_iterator(flat_idx, [=] __host__ __device__(int flat) {
     return flat / rows;
   });
-  auto col_idx_end   = col_idx_begin + size;
+  auto col_idx_end   = col_idx_begin + M.size();
 
   // Create a transposed view of the multidimensional array.
   auto M_transposed = thrust::make_permutation_iterator(
-    M, thrust::make_transform_iterator(thrust::counting_iterator<int>(0), [=] __host__ __device__(int flat) {
+    M.data_handle(),
+    thrust::make_transform_iterator(_THRUST_LIBCXX::counting_iterator(0), [=] __host__ __device__(int flat) {
       int i = flat / cols;
       int j = flat % cols;
       return i + j * rows;
@@ -62,7 +65,7 @@ int main()
   thrust::for_each_n(thrust::seq, flat_idx, rows, [&](int i) {
     std::cout << "[ ";
     thrust::for_each_n(thrust::seq, flat_idx, cols, [&](int j) {
-      std::cout << std::setw(2) << M[i * cols + j] << " ";
+      std::cout << std::setw(2) << M(i, j) << " ";
     });
     std::cout << "]\n";
   });
diff --git a/projects/hipccl/hipccl3/rocthrust/examples/sum_rows.cu b/projects/hipccl/hipccl3/rocthrust/examples/sum_rows.cu
index 39e023a6d3e9..d5901d7d3452 100644
--- a/projects/hipccl/hipccl3/rocthrust/examples/sum_rows.cu
+++ b/projects/hipccl/hipccl3/rocthrust/examples/sum_rows.cu
@@ -1,4 +1,3 @@
-<<<<<<< ours
 // Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,26 +28,28 @@
 #include <thrust/tabulate.h>
 #include <thrust/universal_vector.h>
 
+#include _THRUST_LIBCXX_INCLUDE(iterator)
+#include _THRUST_STD_INCLUDE(mdspan)
+
 #include <iomanip>
 #include <iostream>
 
 #include "include/host_device.h"
 
-int main(void)
+int main()
 {
   const int rows = 32;
   const int cols = 16;
 
-  // Create a 2D row-major multidimensional array of ints.
+  // Create a 2D multidimensional array of ints.
   thrust::universal_vector<int> data(rows * cols, 42);
-  int* M         = thrust::raw_pointer_cast(data.data());
-  const int size = rows * cols;
+  _THRUST_STD::mdspan M(thrust::raw_pointer_cast(data.data()), rows, cols);
 
   // Create an iterator to the flat linear index space for the multidimensional array.
-  auto flat_idx = thrust::counting_iterator<int>(0);
+  auto flat_idx = _THRUST_LIBCXX::counting_iterator(0);
 
   // Fill the array with pseudorandom inputs in parallel on the device.
-  thrust::tabulate(thrust::device, M, M + size, [] __host__ __device__(int flat) {
+  thrust::tabulate(thrust::device, M.data_handle(), M.data_handle() + M.size(), [] __host__ __device__(int flat) {
     thrust::default_random_engine rng;
     thrust::uniform_int_distribution<int> dist(0, 3);
     rng.discard(flat); // Advance to the current element's position.
@@ -59,20 +60,19 @@ int main(void)
   auto row_idx_begin = thrust::make_transform_iterator(flat_idx, [=] __host__ __device__(int flat) {
     return flat / cols;
   });
-  auto row_idx_end   = row_idx_begin + size;
+  auto row_idx_end   = row_idx_begin + M.size();
 
   // Sum each row, storing the result in a new vector.
   thrust::universal_vector<int> sums(rows);
-  thrust::reduce_by_key(thrust::device, row_idx_begin, row_idx_end, M, thrust::make_discard_iterator(), sums.begin());
+  thrust::reduce_by_key(
+    thrust::device, row_idx_begin, row_idx_end, M.data_handle(), thrust::make_discard_iterator(), sums.begin());
 
   // Output the result.
   thrust::for_each_n(thrust::seq, flat_idx, rows, [&](int i) {
     std::cout << "[ ";
     thrust::for_each_n(thrust::seq, flat_idx, cols, [&](int j) {
-      std::cout << std::setw(2) << M[i * cols + j] << " ";
+      std::cout << std::setw(2) << M(i, j) << " ";
     });
     std::cout << "] = " << sums[i] << "\n";
   });
-
-  return 0;
 }

From aaab958c6551d06955bf32cb471fc572acada75e Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:44:38 -0400
Subject: [PATCH 24/48] refactor(rocthrust): CCCL 91434d76ab3 parity -
 thrust::pair -> _THRUST_STD::pair

Related upstream commit: 91434d76ab3 Replace uses of `thrust::pair` with `cuda::std::pair` (NVIDIA/cccl#6616)
Related local port commit: 7bace77f410

The port only switched system/cuda and testing/cuda, keeping thrust::pair
in generic/public headers, the sequential/omp/tbb backends, system/hip,
tests and examples because thrust::pair was a distinct struct in the
non-libhipcxx fallback. libhipcxx is now mandatory and thrust::pair is
just an alias of _THRUST_STD::pair, so the remaining files follow upstream:
- thrust::pair / unqualified pair / thrust::make_pair ->
  _THRUST_STD::pair / _THRUST_STD::make_pair in every non-cuda header,
  test and example touched by upstream (including doxygen snippets),
  plus testing/binary_search.cu and testing/transform.cu (upstream's
  catch2_test_binary_search.cu / catch2_test_transform.cu).
- system/hip/detail (extrema, merge, mismatch, partition, reduce_by_key,
  set_operations, temporary_buffer, unique_by_key) gets the same spelling
  as its system/cuda counterpart, so hip tracks upstream.
- #include <thrust/pair.h> is replaced with
  _THRUST_STD_INCLUDE(__utility/pair.h) (headers) or
  _THRUST_STD_INCLUDE(utility) (tests/examples) where upstream did so,
  or dropped where upstream dropped it.
testing/pair.cu (tests thrust::pair itself), test/ and benchmark/ keep
thrust::pair, which remains a public alias.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/examples/bounding_box.cu        |   3 +-
 .../rocthrust/testing/binary_search.cu        |   8 +-
 .../hipccl3/rocthrust/testing/memory.cu       |  25 +--
 .../hipccl3/rocthrust/testing/merge_by_key.cu |  10 +-
 .../rocthrust/testing/minmax_element.cu       |  11 +-
 .../hipccl3/rocthrust/testing/mismatch.cu     |   8 +-
 .../hipccl3/rocthrust/testing/pair_reduce.cu  |  13 +-
 .../hipccl3/rocthrust/testing/pair_scan.cu    |  13 +-
 .../rocthrust/testing/pair_scan_by_key.cu     |  13 +-
 .../hipccl3/rocthrust/testing/pair_sort.cu    |   9 +-
 .../rocthrust/testing/pair_sort_by_key.cu     |   9 +-
 .../rocthrust/testing/pair_transform.cu       |  11 +-
 .../hipccl3/rocthrust/testing/partition.cu    | 184 +++++++++---------
 .../rocthrust/testing/reduce_by_key.cu        |  14 +-
 .../testing/set_difference_by_key.cu          |  22 +--
 .../set_difference_by_key_descending.cu       |   6 +-
 .../testing/set_intersection_by_key.cu        |  22 +--
 .../set_intersection_by_key_descending.cu     |   6 +-
 .../set_symmetric_difference_by_key.cu        |  22 +--
 ..._symmetric_difference_by_key_descending.cu |   6 +-
 .../rocthrust/testing/set_union_by_key.cu     |  22 +--
 .../testing/set_union_by_key_descending.cu    |   6 +-
 .../hipccl3/rocthrust/testing/transform.cu    |   7 +-
 .../hipccl3/rocthrust/testing/type_traits.cu  |   9 +-
 .../rocthrust/testing/unique_by_key.cu        |  62 +++---
 .../hipccl3/rocthrust/thrust/binary_search.h  |  11 +-
 .../detail/allocator/temporary_allocator.h    |   4 +-
 .../rocthrust/thrust/detail/binary_search.inl |   8 +-
 .../thrust/detail/execute_with_allocator.h    |   5 +-
 .../rocthrust/thrust/detail/extrema.inl       |   8 +-
 .../hipccl3/rocthrust/thrust/detail/merge.inl |   8 +-
 .../rocthrust/thrust/detail/mismatch.inl      |   8 +-
 .../rocthrust/thrust/detail/partition.inl     |  16 +-
 .../rocthrust/thrust/detail/reduce.inl        |  12 +-
 .../thrust/detail/set_operations.inl          |  32 +--
 .../thrust/detail/temporary_buffer.h          |  15 +-
 .../rocthrust/thrust/detail/unique.inl        |  16 +-
 .../hipccl/hipccl3/rocthrust/thrust/extrema.h |  19 +-
 .../detail/tuple_of_iterator_references.h     |   5 +-
 .../hipccl/hipccl3/rocthrust/thrust/memory.h  |  10 +-
 .../hipccl/hipccl3/rocthrust/thrust/merge.h   |  19 +-
 .../hipccl3/rocthrust/thrust/mismatch.h       |  19 +-
 .../hipccl3/rocthrust/thrust/partition.h      |  19 +-
 .../random/detail/normal_distribution_base.h  |   1 -
 .../thrust/random/normal_distribution.h       |   5 +-
 .../thrust/random/uniform_int_distribution.h  |   4 +-
 .../thrust/random/uniform_real_distribution.h |   5 +-
 .../hipccl/hipccl3/rocthrust/thrust/reduce.h  |  27 +--
 .../hipccl3/rocthrust/thrust/set_operations.h |  79 ++++----
 .../system/detail/generic/binary_search.h     |   4 +-
 .../system/detail/generic/binary_search.inl   |   6 +-
 .../thrust/system/detail/generic/extrema.h    |   7 +-
 .../thrust/system/detail/generic/extrema.inl  |  11 +-
 .../thrust/system/detail/generic/memory.h     |   1 -
 .../thrust/system/detail/generic/merge.h      |   4 +-
 .../thrust/system/detail/generic/merge.inl    |   6 +-
 .../thrust/system/detail/generic/mismatch.h   |   4 +-
 .../thrust/system/detail/generic/mismatch.inl |   6 +-
 .../thrust/system/detail/generic/partition.h  |   8 +-
 .../system/detail/generic/partition.inl       |  15 +-
 .../system/detail/generic/reduce_by_key.h     |   6 +-
 .../system/detail/generic/reduce_by_key.inl   |  10 +-
 .../detail/generic/scalar/binary_search.h     |   4 +-
 .../detail/generic/scalar/binary_search.inl   |   7 +-
 .../system/detail/generic/set_operations.h    |  19 +-
 .../system/detail/generic/set_operations.inl  |  24 +--
 .../system/detail/generic/temporary_buffer.h  |   9 +-
 .../detail/generic/temporary_buffer.inl       |   7 +-
 .../system/detail/generic/unique_by_key.h     |  11 +-
 .../system/detail/generic/unique_by_key.inl   |  10 +-
 .../thrust/system/detail/sequential/extrema.h |   7 +-
 .../thrust/system/detail/sequential/merge.h   |   4 +-
 .../system/detail/sequential/partition.h      |  11 +-
 .../system/detail/sequential/reduce_by_key.h  |   7 +-
 .../thrust/system/detail/sequential/unique.h  |   1 -
 .../system/detail/sequential/unique_by_key.h  |   9 +-
 .../thrust/system/hip/detail/extrema.h        |   9 +-
 .../thrust/system/hip/detail/merge.h          |  12 +-
 .../thrust/system/hip/detail/mismatch.h       |  10 +-
 .../thrust/system/hip/detail/partition.h      |  52 ++---
 .../thrust/system/hip/detail/reduce_by_key.h  |  18 +-
 .../thrust/system/hip/detail/set_operations.h |  52 ++---
 .../system/hip/detail/temporary_buffer.h      |   8 +-
 .../thrust/system/hip/detail/unique_by_key.h  |  26 +--
 .../thrust/system/omp/detail/extrema.h        |   2 +-
 .../thrust/system/omp/detail/partition.h      |   7 +-
 .../thrust/system/omp/detail/reduce_by_key.h  |   2 +-
 .../thrust/system/omp/detail/unique.h         |   3 +-
 .../thrust/system/omp/detail/unique_by_key.h  |   7 +-
 .../thrust/system/tbb/detail/extrema.h        |   2 +-
 .../thrust/system/tbb/detail/merge.h          |   4 +-
 .../thrust/system/tbb/detail/partition.h      |   7 +-
 .../thrust/system/tbb/detail/reduce_by_key.h  |  21 +-
 .../thrust/system/tbb/detail/unique.h         |   1 -
 .../thrust/system/tbb/detail/unique_by_key.h  |   7 +-
 .../hipccl/hipccl3/rocthrust/thrust/unique.h  |  35 ++--
 96 files changed, 706 insertions(+), 673 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/examples/bounding_box.cu b/projects/hipccl/hipccl3/rocthrust/examples/bounding_box.cu
index 8a27ea332807..ad74dc43e060 100644
--- a/projects/hipccl/hipccl3/rocthrust/examples/bounding_box.cu
+++ b/projects/hipccl/hipccl3/rocthrust/examples/bounding_box.cu
@@ -20,10 +20,11 @@
 
 #include <thrust/device_vector.h>
 #include <thrust/extrema.h>
-#include <thrust/pair.h>
 #include <thrust/random.h>
 #include <thrust/transform_reduce.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include "include/host_device.h"
 
 // This example shows how to compute a bounding box
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/binary_search.cu b/projects/hipccl/hipccl3/rocthrust/testing/binary_search.cu
index 9a9806bfa14e..4417786787ff 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/binary_search.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/binary_search.cu
@@ -223,11 +223,11 @@ void TestScalarEqualRangeSimple()
 DECLARE_VECTOR_UNITTEST(TestScalarEqualRangeSimple);
 
 template <typename ForwardIterator, typename LessThanComparable>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 equal_range(my_system& system, ForwardIterator first, ForwardIterator /*last*/, const LessThanComparable& /*value*/)
 {
   system.validate_dispatch();
-  return thrust::make_pair(first, first);
+  return _THRUST_STD::make_pair(first, first);
 }
 
 void TestScalarEqualRangeDispatchExplicit()
@@ -242,11 +242,11 @@ void TestScalarEqualRangeDispatchExplicit()
 DECLARE_UNITTEST(TestScalarEqualRangeDispatchExplicit);
 
 template <typename ForwardIterator, typename LessThanComparable>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 equal_range(my_tag, ForwardIterator first, ForwardIterator /*last*/, const LessThanComparable& /*value*/)
 {
   *first = 13;
-  return thrust::make_pair(first, first);
+  return _THRUST_STD::make_pair(first, first);
 }
 
 void TestScalarEqualRangeDispatchImplicit()
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/memory.cu b/projects/hipccl/hipccl3/rocthrust/testing/memory.cu
index 212e64322125..8012c8af04a9 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/memory.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/memory.cu
@@ -18,11 +18,12 @@
 #include <thrust/fill.h>
 #include <thrust/logical.h>
 #include <thrust/memory.h>
-#include <thrust/pair.h>
 #include <thrust/reverse.h>
 #include <thrust/sequence.h>
 #include <thrust/sort.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <iostream>
 
 #include <unittest/unittest.h>
@@ -80,12 +81,12 @@ struct my_old_temporary_allocation_system : public thrust::device_execution_poli
 {};
 
 template <typename T>
-thrust::pair<thrust::pointer<T, my_old_temporary_allocation_system>, std::ptrdiff_t>
+_THRUST_STD::pair<thrust::pointer<T, my_old_temporary_allocation_system>, std::ptrdiff_t>
 get_temporary_buffer(my_old_temporary_allocation_system, std::ptrdiff_t)
 {
   thrust::pointer<T, my_old_temporary_allocation_system> const result(reinterpret_cast<T*>(4217));
 
-  return thrust::make_pair(result, 314);
+  return _THRUST_STD::make_pair(result, 314);
 }
 
 template <typename Pointer>
@@ -102,12 +103,12 @@ struct my_new_temporary_allocation_system : public thrust::device_execution_poli
 {};
 
 template <typename T>
-thrust::pair<thrust::pointer<T, my_new_temporary_allocation_system>, std::ptrdiff_t>
+_THRUST_STD::pair<thrust::pointer<T, my_new_temporary_allocation_system>, std::ptrdiff_t>
 get_temporary_buffer(my_new_temporary_allocation_system, std::ptrdiff_t)
 {
   thrust::pointer<T, my_new_temporary_allocation_system> const result(reinterpret_cast<T*>(1742));
 
-  return thrust::make_pair(result, 413);
+  return _THRUST_STD::make_pair(result, 413);
 }
 
 template <typename Pointer>
@@ -184,7 +185,7 @@ void TestGetTemporaryBuffer()
 
   thrust::device_system_tag dev_tag;
   using pointer                                    = thrust::pointer<int, thrust::device_system_tag>;
-  thrust::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(dev_tag, n);
+  _THRUST_STD::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(dev_tag, n);
 
   ASSERT_EQUAL(ptr_and_sz.second, n);
 
@@ -254,15 +255,15 @@ void TestFreeDispatchExplicit()
 DECLARE_UNITTEST(TestFreeDispatchExplicit);
 
 template <typename T>
-thrust::pair<thrust::pointer<T, my_memory_system>, std::ptrdiff_t>
+_THRUST_STD::pair<thrust::pointer<T, my_memory_system>, std::ptrdiff_t>
 get_temporary_buffer(my_memory_system& system, std::ptrdiff_t n)
 {
   system.validate_dispatch();
 
   thrust::device_system_tag device_sys;
-  thrust::pair<thrust::pointer<T, thrust::device_system_tag>, std::ptrdiff_t> result =
+  _THRUST_STD::pair<thrust::pointer<T, thrust::device_system_tag>, std::ptrdiff_t> result =
     thrust::get_temporary_buffer<T>(device_sys, n);
-  return thrust::make_pair(thrust::pointer<T, my_memory_system>(result.first.get()), result.second);
+  return _THRUST_STD::make_pair(thrust::pointer<T, my_memory_system>(result.first.get()), result.second);
 }
 
 // [NON-CCCL PARITY BEGIN]
@@ -284,7 +285,7 @@ void TestGetTemporaryBufferDispatchExplicit()
 
   my_memory_system sys(0);
   using pointer                                    = thrust::pointer<int, thrust::device_system_tag>;
-  thrust::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(sys, n);
+  _THRUST_STD::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(sys, n);
 
   ASSERT_EQUAL(ptr_and_sz.second, n);
   ASSERT_EQUAL(true, sys.is_valid());
@@ -333,7 +334,7 @@ void TestTemporaryBufferOldCustomization()
 {
   using system           = my_old_namespace::my_old_temporary_allocation_system;
   using pointer          = thrust::pointer<int, system>;
-  using pointer_and_size = thrust::pair<pointer, std::ptrdiff_t>;
+  using pointer_and_size = _THRUST_STD::pair<pointer, std::ptrdiff_t>;
 
   system sys;
 
@@ -353,7 +354,7 @@ void TestTemporaryBufferNewCustomization()
 {
   using system           = my_new_namespace::my_new_temporary_allocation_system;
   using pointer          = thrust::pointer<int, system>;
-  using pointer_and_size = thrust::pair<pointer, std::ptrdiff_t>;
+  using pointer_and_size = _THRUST_STD::pair<pointer, std::ptrdiff_t>;
 
   system sys;
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/merge_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/merge_by_key.cu
index 2526fe27694e..42683990fd49 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/merge_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/merge_by_key.cu
@@ -61,7 +61,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -73,7 +73,7 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
   OutputIterator2 values_result)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestMergeByKeyDispatchExplicit()
@@ -94,7 +94,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   my_tag,
   InputIterator1,
   InputIterator1,
@@ -106,7 +106,7 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
   OutputIterator2 values_result)
 {
   *keys_result = 13;
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestMergeByKeyDispatchImplicit()
@@ -239,7 +239,7 @@ void TestMergeByKeyToDiscardIterator(size_t n)
   const thrust::device_vector<T> d_a_vals = h_a_vals;
   const thrust::device_vector<T> d_b_vals = h_b_vals;
 
-  using discard_pair = thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>>;
+  using discard_pair = _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>>;
 
   const discard_pair h_result = thrust::merge_by_key(
     h_a_keys.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/minmax_element.cu b/projects/hipccl/hipccl3/rocthrust/testing/minmax_element.cu
index 1a260fce2538..f7b260513507 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/minmax_element.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/minmax_element.cu
@@ -80,10 +80,11 @@ void TestMinMaxElement(const size_t n)
 DECLARE_VARIABLE_UNITTEST(TestMinMaxElement);
 
 template <typename ForwardIterator>
-thrust::pair<ForwardIterator, ForwardIterator> minmax_element(my_system& system, ForwardIterator first, ForwardIterator)
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
+minmax_element(my_system& system, ForwardIterator first, ForwardIterator)
 {
   system.validate_dispatch();
-  return thrust::make_pair(first, first);
+  return _THRUST_STD::make_pair(first, first);
 }
 
 void TestMinMaxElementDispatchExplicit()
@@ -98,10 +99,10 @@ void TestMinMaxElementDispatchExplicit()
 DECLARE_UNITTEST(TestMinMaxElementDispatchExplicit);
 
 template <typename ForwardIterator>
-thrust::pair<ForwardIterator, ForwardIterator> minmax_element(my_tag, ForwardIterator first, ForwardIterator)
+_THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(my_tag, ForwardIterator first, ForwardIterator)
 {
   *first = 13;
-  return thrust::make_pair(first, first);
+  return _THRUST_STD::make_pair(first, first);
 }
 
 void TestMinMaxElementDispatchImplicit()
@@ -121,7 +122,7 @@ void TestMinMaxElementWithBigIndexesHelper(int magnitude)
   Iter end = begin + (1ll << magnitude);
   ASSERT_EQUAL(_THRUST_STD::distance(begin, end), 1ll << magnitude);
 
-  thrust::pair<Iter, Iter> result = thrust::minmax_element(thrust::device, begin, end);
+  _THRUST_STD::pair<Iter, Iter> result = thrust::minmax_element(thrust::device, begin, end);
   ASSERT_EQUAL(*result.first, 1);
   ASSERT_EQUAL(*result.second, (1ll << magnitude));
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/mismatch.cu b/projects/hipccl/hipccl3/rocthrust/testing/mismatch.cu
index 60bc69eab07a..567af422d6f3 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/mismatch.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/mismatch.cu
@@ -41,11 +41,11 @@ void TestMismatchSimple()
 DECLARE_VECTOR_UNITTEST(TestMismatchSimple);
 
 template <typename InputIterator1, typename InputIterator2>
-thrust::pair<InputIterator1, InputIterator2>
+_THRUST_STD::pair<InputIterator1, InputIterator2>
 mismatch(my_system& system, InputIterator1 first, InputIterator1, InputIterator2)
 {
   system.validate_dispatch();
-  return thrust::make_pair(first, first);
+  return _THRUST_STD::make_pair(first, first);
 }
 
 void TestMismatchDispatchExplicit()
@@ -60,10 +60,10 @@ void TestMismatchDispatchExplicit()
 DECLARE_UNITTEST(TestMismatchDispatchExplicit);
 
 template <typename InputIterator1, typename InputIterator2>
-thrust::pair<InputIterator1, InputIterator2> mismatch(my_tag, InputIterator1 first, InputIterator1, InputIterator2)
+_THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(my_tag, InputIterator1 first, InputIterator1, InputIterator2)
 {
   *first = 13;
-  return thrust::make_pair(first, first);
+  return _THRUST_STD::make_pair(first, first);
 }
 
 void TestMismatchDispatchImplicit()
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/pair_reduce.cu b/projects/hipccl/hipccl3/rocthrust/testing/pair_reduce.cu
index 5dd6e6e2ce64..a5ae4e1a0c2e 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/pair_reduce.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/pair_reduce.cu
@@ -15,18 +15,19 @@
  *  limitations under the License.
  */
 
-#include <thrust/pair.h>
 #include <thrust/reduce.h>
 #include <thrust/transform.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <unittest/unittest.h>
 
 struct make_pair_functor
 {
   template <typename T1, typename T2>
-  THRUST_HOST_DEVICE thrust::pair<T1, T2> operator()(const T1& x, const T2& y)
+  THRUST_HOST_DEVICE _THRUST_STD::pair<T1, T2> operator()(const T1& x, const T2& y)
   {
-    return thrust::make_pair(x, y);
+    return _THRUST_STD::make_pair(x, y);
   } // end operator()()
 }; // end make_pair_functor
 
@@ -38,7 +39,7 @@ struct add_pairs
     // Need cast to undo integer promotion, decltype(char{} + char{}) == int
     using P1T1 = typename Pair1::first_type;
     using P1T2 = typename Pair1::second_type;
-    return thrust::make_pair(static_cast<P1T1>(x.first + y.first), static_cast<P1T2>(x.second + y.second));
+    return _THRUST_STD::make_pair(static_cast<P1T1>(x.first + y.first), static_cast<P1T2>(x.second + y.second));
   } // end operator()
 }; // end add_pairs
 
@@ -47,7 +48,7 @@ struct TestPairReduce
 {
   void operator()(const size_t n)
   {
-    using P = thrust::pair<T, T>;
+    using P = _THRUST_STD::pair<T, T>;
 
     thrust::host_vector<T> h_p1 = unittest::random_integers<T>(n);
     thrust::host_vector<T> h_p2 = unittest::random_integers<T>(n);
@@ -60,7 +61,7 @@ struct TestPairReduce
     thrust::device_vector<T> d_p2    = h_p2;
     thrust::device_vector<P> d_pairs = h_pairs;
 
-    P init = thrust::make_pair(T{13}, T{13});
+    P init = _THRUST_STD::make_pair(T{13}, T{13});
 
     // reduce on the host
     P h_result = thrust::reduce(h_pairs.begin(), h_pairs.end(), init, add_pairs());
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/pair_scan.cu b/projects/hipccl/hipccl3/rocthrust/testing/pair_scan.cu
index 662345b03608..863b7d583d96 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/pair_scan.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/pair_scan.cu
@@ -15,19 +15,20 @@
  *  limitations under the License.
  */
 
-#include <thrust/pair.h>
 #include <thrust/scan.h>
 #include <thrust/transform.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <unittest/hip/testframework.h>
 #include <unittest/unittest.h>
 
 struct make_pair_functor
 {
   template <typename T1, typename T2>
-  THRUST_HOST_DEVICE thrust::pair<T1, T2> operator()(const T1& x, const T2& y)
+  THRUST_HOST_DEVICE _THRUST_STD::pair<T1, T2> operator()(const T1& x, const T2& y)
   {
-    return thrust::make_pair(x, y);
+    return _THRUST_STD::make_pair(x, y);
   } // end operator()()
 }; // end make_pair_functor
 
@@ -36,7 +37,7 @@ struct add_pairs
   template <typename Pair1, typename Pair2>
   THRUST_HOST_DEVICE Pair1 operator()(const Pair1& x, const Pair2& y)
   {
-    return thrust::make_pair(x.first + y.first, x.second + y.second);
+    return _THRUST_STD::make_pair(x.first + y.first, x.second + y.second);
   } // end operator()
 }; // end add_pairs
 
@@ -45,7 +46,7 @@ struct TestPairScan
 {
   void operator()(const size_t n)
   {
-    using P = thrust::pair<T, T>;
+    using P = _THRUST_STD::pair<T, T>;
 
     thrust::host_vector<T> h_p1 = unittest::random_integers<T>(n);
     thrust::host_vector<T> h_p2 = unittest::random_integers<T>(n);
@@ -60,7 +61,7 @@ struct TestPairScan
     thrust::device_vector<P> d_pairs = h_pairs;
     thrust::device_vector<P> d_output(n);
 
-    P init = thrust::make_pair(13, 13);
+    P init = _THRUST_STD::make_pair(13, 13);
 
     // scan with plus
     thrust::inclusive_scan(h_pairs.begin(), h_pairs.end(), h_output.begin(), add_pairs());
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/pair_scan_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/pair_scan_by_key.cu
index ff4ed73f6d23..25d39cf7d2c6 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/pair_scan_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/pair_scan_by_key.cu
@@ -15,18 +15,19 @@
  *  limitations under the License.
  */
 
-#include <thrust/pair.h>
 #include <thrust/scan.h>
 #include <thrust/transform.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <unittest/unittest.h>
 
 struct make_pair_functor
 {
   template <typename T1, typename T2>
-  THRUST_HOST_DEVICE thrust::pair<T1, T2> operator()(const T1& x, const T2& y)
+  THRUST_HOST_DEVICE _THRUST_STD::pair<T1, T2> operator()(const T1& x, const T2& y)
   {
-    return thrust::make_pair(x, y);
+    return _THRUST_STD::make_pair(x, y);
   } // end operator()()
 }; // end make_pair_functor
 
@@ -38,7 +39,7 @@ struct add_pairs
     // Need cast to undo integer promotion, decltype(char{} + char{}) == int
     using P1T1 = typename Pair1::first_type;
     using P1T2 = typename Pair1::second_type;
-    return thrust::make_pair(static_cast<P1T1>(x.first + y.first), static_cast<P1T2>(x.second + y.second));
+    return _THRUST_STD::make_pair(static_cast<P1T1>(x.first + y.first), static_cast<P1T2>(x.second + y.second));
   } // end operator()
 }; // end add_pairs
 
@@ -47,7 +48,7 @@ struct TestPairScanByKey
 {
   void operator()(const size_t n)
   {
-    using P = thrust::pair<T, T>;
+    using P = _THRUST_STD::pair<T, T>;
 
     thrust::host_vector<T> h_p1 = unittest::random_integers<T>(n);
     thrust::host_vector<T> h_p2 = unittest::random_integers<T>(n);
@@ -63,7 +64,7 @@ struct TestPairScanByKey
     thrust::host_vector<T> h_keys   = unittest::random_integers<bool>(n);
     thrust::device_vector<T> d_keys = h_keys;
 
-    P init = thrust::make_pair(T{13}, T{13});
+    P init = _THRUST_STD::make_pair(T{13}, T{13});
 
     // scan on the host
     thrust::exclusive_scan_by_key(
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/pair_sort.cu b/projects/hipccl/hipccl3/rocthrust/testing/pair_sort.cu
index 68277db6e760..da52e1f881d8 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/pair_sort.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/pair_sort.cu
@@ -15,18 +15,19 @@
  *  limitations under the License.
  */
 
-#include <thrust/pair.h>
 #include <thrust/sequence.h>
 #include <thrust/sort.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <unittest/unittest.h>
 
 struct make_pair_functor
 {
   template <typename T1, typename T2>
-  THRUST_HOST_DEVICE thrust::pair<T1, T2> operator()(const T1& x, const T2& y)
+  THRUST_HOST_DEVICE _THRUST_STD::pair<T1, T2> operator()(const T1& x, const T2& y)
   {
-    return thrust::make_pair(x, y);
+    return _THRUST_STD::make_pair(x, y);
   } // end operator()()
 }; // end make_pair_functor
 
@@ -35,7 +36,7 @@ struct TestPairStableSortByKey
 {
   void operator()(const size_t n)
   {
-    using P = thrust::pair<T, T>;
+    using P = _THRUST_STD::pair<T, T>;
 
     // host arrays
     thrust::host_vector<T> h_p1 = unittest::random_integers<T>(n);
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/pair_sort_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/pair_sort_by_key.cu
index b9385b95c0cf..b686a9e964cd 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/pair_sort_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/pair_sort_by_key.cu
@@ -15,17 +15,18 @@
  *  limitations under the License.
  */
 
-#include <thrust/pair.h>
 #include <thrust/sort.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <unittest/unittest.h>
 
 struct make_pair_functor
 {
   template <typename T1, typename T2>
-  THRUST_HOST_DEVICE thrust::pair<T1, T2> operator()(const T1& x, const T2& y)
+  THRUST_HOST_DEVICE _THRUST_STD::pair<T1, T2> operator()(const T1& x, const T2& y)
   {
-    return thrust::make_pair(x, y);
+    return _THRUST_STD::make_pair(x, y);
   } // end operator()()
 }; // end make_pair_functor
 
@@ -34,7 +35,7 @@ struct TestPairStableSort
 {
   void operator()(const size_t n)
   {
-    using P = thrust::pair<T, T>;
+    using P = _THRUST_STD::pair<T, T>;
 
     thrust::host_vector<T> h_p1 = unittest::random_integers<T>(n);
     thrust::host_vector<T> h_p2 = unittest::random_integers<T>(n);
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/pair_transform.cu b/projects/hipccl/hipccl3/rocthrust/testing/pair_transform.cu
index b486daac5fde..4e2f18d8f32b 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/pair_transform.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/pair_transform.cu
@@ -16,10 +16,11 @@
  */
 
 #include <thrust/host_vector.h>
-#include <thrust/pair.h>
 #include <thrust/transform.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <unittest/unittest.h>
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
@@ -29,9 +30,9 @@
 struct make_pair_functor
 {
   template <typename T1, typename T2>
-  THRUST_HOST_DEVICE thrust::pair<T1, T2> operator()(const T1& x, const T2& y)
+  THRUST_HOST_DEVICE _THRUST_STD::pair<T1, T2> operator()(const T1& x, const T2& y)
   {
-    return thrust::make_pair(x, y);
+    return _THRUST_STD::make_pair(x, y);
   } // end operator()()
 }; // end make_pair_functor
 
@@ -43,7 +44,7 @@ struct add_pairs
     using T1 = typename _THRUST_STD::common_type<typename Pair1::first_type, typename Pair2::first_type>::type;
     using T2 = typename _THRUST_STD::common_type<typename Pair1::second_type, typename Pair2::second_type>::type;
 
-    return thrust::make_pair(static_cast<T1>(x.first + y.first), static_cast<T2>(x.second + y.second));
+    return _THRUST_STD::make_pair(static_cast<T1>(x.first + y.first), static_cast<T2>(x.second + y.second));
   } // end operator()
 }; // end add_pairs
 
@@ -52,7 +53,7 @@ struct TestPairTransform
 {
   void operator()(const size_t n)
   {
-    using P = thrust::pair<T, T>;
+    using P = _THRUST_STD::pair<T, T>;
 
     thrust::host_vector<T> h_p1 = unittest::random_integers<T>(n);
     thrust::host_vector<T> h_p2 = unittest::random_integers<T>(n);
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/partition.cu b/projects/hipccl/hipccl3/rocthrust/testing/partition.cu
index f8a2098736bc..86b614ed09a5 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/partition.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/partition.cu
@@ -96,7 +96,7 @@ void TestPartitionCopySimple()
   Vector true_results(2);
   Vector false_results(3);
 
-  thrust::pair<typename Vector::iterator, typename Vector::iterator> ends =
+  _THRUST_STD::pair<typename Vector::iterator, typename Vector::iterator> ends =
     thrust::partition_copy(data.begin(), data.end(), true_results.begin(), false_results.begin(), is_even<T>());
 
   Vector true_ref(2, 2);
@@ -122,7 +122,7 @@ void TestPartitionCopyStencilSimple()
   Vector true_results(2);
   Vector false_results(3);
 
-  thrust::pair<typename Vector::iterator, typename Vector::iterator> ends = thrust::partition_copy(
+  _THRUST_STD::pair<typename Vector::iterator, typename Vector::iterator> ends = thrust::partition_copy(
     data.begin(), data.end(), stencil.begin(), true_results.begin(), false_results.begin(), is_even<T>());
 
   Vector true_ref(2, 1);
@@ -181,7 +181,7 @@ void TestStablePartitionCopySimple()
   Vector true_results(2);
   Vector false_results(3);
 
-  thrust::pair<typename Vector::iterator, typename Vector::iterator> ends =
+  _THRUST_STD::pair<typename Vector::iterator, typename Vector::iterator> ends =
     thrust::stable_partition_copy(data.begin(), data.end(), true_results.begin(), false_results.begin(), is_even<T>());
 
   Vector true_ref(2, 2);
@@ -204,7 +204,7 @@ void TestStablePartitionCopyStencilSimple()
   Vector true_results(2);
   Vector false_results(3);
 
-  thrust::pair<typename Vector::iterator, typename Vector::iterator> ends = thrust::stable_partition_copy(
+  _THRUST_STD::pair<typename Vector::iterator, typename Vector::iterator> ends = thrust::stable_partition_copy(
     data.begin(), data.end(), stencil.begin(), true_results.begin(), false_results.begin(), _THRUST_STD::identity{});
 
   Vector true_ref(2, 2);
@@ -297,11 +297,11 @@ struct TestPartitionCopy
     thrust::device_vector<T> d_true_results(n_true, 0);
     thrust::device_vector<T> d_false_results(n_false, 0);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
       thrust::partition_copy(
         h_data.begin(), h_data.end(), h_true_results.begin(), h_false_results.begin(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
       thrust::partition_copy(
         d_data.begin(), d_data.end(), d_true_results.begin(), d_false_results.begin(), is_even<T>());
 
@@ -342,11 +342,11 @@ struct TestPartitionCopyStencil
     thrust::device_vector<T> d_true_results(n_true, 0);
     thrust::device_vector<T> d_false_results(n_false, 0);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
       thrust::partition_copy(
         h_data.begin(), h_data.end(), h_stencil.begin(), h_true_results.begin(), h_false_results.begin(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
       thrust::partition_copy(
         d_data.begin(), d_data.end(), d_stencil.begin(), d_true_results.begin(), d_false_results.begin(), is_even<T>());
 
@@ -387,11 +387,11 @@ struct TestStablePartitionCopyStencil
     thrust::device_vector<T> d_true_results(n_true, 0);
     thrust::device_vector<T> d_false_results(n_false, 0);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
       thrust::stable_partition_copy(
         h_data.begin(), h_data.end(), h_stencil.begin(), h_true_results.begin(), h_false_results.begin(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
       thrust::stable_partition_copy(
         d_data.begin(), d_data.end(), d_stencil.begin(), d_true_results.begin(), d_false_results.begin(), is_even<T>());
 
@@ -425,14 +425,14 @@ struct TestPartitionCopyToDiscardIterator
     std::ptrdiff_t n_false = n - n_true;
 
     // mask both ranges
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::partition_copy(
       h_data.begin(), h_data.end(), thrust::make_discard_iterator(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::partition_copy(
       d_data.begin(), d_data.end(), thrust::make_discard_iterator(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL_QUIET(reference1, h_result1);
     ASSERT_EQUAL_QUIET(reference1, d_result1);
@@ -441,19 +441,19 @@ struct TestPartitionCopyToDiscardIterator
     thrust::host_vector<T> h_trues(n_true);
     thrust::device_vector<T> d_trues(n_true);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
       thrust::partition_copy(
         h_data.begin(), h_data.end(), h_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
       thrust::partition_copy(
         d_data.begin(), d_data.end(), d_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
-      thrust::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
+      _THRUST_STD::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
-      thrust::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
+      _THRUST_STD::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL(h_trues, d_trues);
     ASSERT_EQUAL_QUIET(h_reference2, h_result2);
@@ -463,19 +463,19 @@ struct TestPartitionCopyToDiscardIterator
     thrust::host_vector<T> h_falses(n_false);
     thrust::device_vector<T> d_falses(n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
       thrust::partition_copy(
         h_data.begin(), h_data.end(), thrust::make_discard_iterator(), h_falses.begin(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
       thrust::partition_copy(
         d_data.begin(), d_data.end(), thrust::make_discard_iterator(), d_falses.begin(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
 
     ASSERT_EQUAL(h_falses, d_falses);
     ASSERT_EQUAL_QUIET(h_reference3, h_result3);
@@ -499,7 +499,7 @@ struct TestPartitionCopyStencilToDiscardIterator
     std::ptrdiff_t n_false = n - n_true;
 
     // mask both ranges
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::partition_copy(
       h_data.begin(),
       h_data.end(),
       h_stencil.begin(),
@@ -507,7 +507,7 @@ struct TestPartitionCopyStencilToDiscardIterator
       thrust::make_discard_iterator(),
       is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::partition_copy(
       d_data.begin(),
       d_data.end(),
       d_stencil.begin(),
@@ -515,8 +515,8 @@ struct TestPartitionCopyStencilToDiscardIterator
       thrust::make_discard_iterator(),
       is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL_QUIET(reference1, h_result1);
     ASSERT_EQUAL_QUIET(reference1, d_result1);
@@ -525,19 +525,19 @@ struct TestPartitionCopyStencilToDiscardIterator
     thrust::host_vector<T> h_trues(n_true);
     thrust::device_vector<T> d_trues(n_true);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
       thrust::partition_copy(
         h_data.begin(), h_data.end(), h_stencil.begin(), h_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
       thrust::partition_copy(
         d_data.begin(), d_data.end(), d_stencil.begin(), d_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
-      thrust::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
+      _THRUST_STD::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
-      thrust::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
+      _THRUST_STD::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL(h_trues, d_trues);
     ASSERT_EQUAL_QUIET(h_reference2, h_result2);
@@ -547,7 +547,7 @@ struct TestPartitionCopyStencilToDiscardIterator
     thrust::host_vector<T> h_falses(n_false);
     thrust::device_vector<T> d_falses(n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
       thrust::partition_copy(
         h_data.begin(),
         h_data.end(),
@@ -556,7 +556,7 @@ struct TestPartitionCopyStencilToDiscardIterator
         h_falses.begin(),
         is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
       thrust::partition_copy(
         d_data.begin(),
         d_data.end(),
@@ -565,11 +565,11 @@ struct TestPartitionCopyStencilToDiscardIterator
         d_falses.begin(),
         is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
 
     ASSERT_EQUAL(h_falses, d_falses);
     ASSERT_EQUAL_QUIET(h_reference3, h_result3);
@@ -649,11 +649,11 @@ struct TestStablePartitionCopy
     thrust::device_vector<T> d_true_results(n_true, 0);
     thrust::device_vector<T> d_false_results(n_false, 0);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_ends =
       thrust::stable_partition_copy(
         h_data.begin(), h_data.end(), h_true_results.begin(), h_false_results.begin(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_ends =
       thrust::stable_partition_copy(
         d_data.begin(), d_data.end(), d_true_results.begin(), d_false_results.begin(), is_even<T>());
 
@@ -683,14 +683,14 @@ struct TestStablePartitionCopyToDiscardIterator
     std::ptrdiff_t n_false = n - n_true;
 
     // mask both ranges
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::stable_partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::stable_partition_copy(
       h_data.begin(), h_data.end(), thrust::make_discard_iterator(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::stable_partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::stable_partition_copy(
       d_data.begin(), d_data.end(), thrust::make_discard_iterator(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL_QUIET(reference1, h_result1);
     ASSERT_EQUAL_QUIET(reference1, d_result1);
@@ -699,19 +699,19 @@ struct TestStablePartitionCopyToDiscardIterator
     thrust::host_vector<T> h_trues(n_true);
     thrust::device_vector<T> d_trues(n_true);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
       thrust::stable_partition_copy(
         h_data.begin(), h_data.end(), h_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
       thrust::stable_partition_copy(
         d_data.begin(), d_data.end(), d_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
-      thrust::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
+      _THRUST_STD::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
-      thrust::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
+      _THRUST_STD::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL(h_trues, d_trues);
     ASSERT_EQUAL_QUIET(h_reference2, h_result2);
@@ -721,19 +721,19 @@ struct TestStablePartitionCopyToDiscardIterator
     thrust::host_vector<T> h_falses(n_false);
     thrust::device_vector<T> d_falses(n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
       thrust::stable_partition_copy(
         h_data.begin(), h_data.end(), thrust::make_discard_iterator(), h_falses.begin(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
       thrust::stable_partition_copy(
         d_data.begin(), d_data.end(), thrust::make_discard_iterator(), d_falses.begin(), is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
 
     ASSERT_EQUAL(h_falses, d_falses);
     ASSERT_EQUAL_QUIET(h_reference3, h_result3);
@@ -758,7 +758,7 @@ struct TestStablePartitionCopyStencilToDiscardIterator
     std::ptrdiff_t n_false = n - n_true;
 
     // mask both ranges
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::stable_partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::stable_partition_copy(
       h_data.begin(),
       h_data.end(),
       h_stencil.begin(),
@@ -766,7 +766,7 @@ struct TestStablePartitionCopyStencilToDiscardIterator
       thrust::make_discard_iterator(),
       is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::stable_partition_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::stable_partition_copy(
       d_data.begin(),
       d_data.end(),
       d_stencil.begin(),
@@ -774,8 +774,8 @@ struct TestStablePartitionCopyStencilToDiscardIterator
       thrust::make_discard_iterator(),
       is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL_QUIET(reference1, h_result1);
     ASSERT_EQUAL_QUIET(reference1, d_result1);
@@ -784,19 +784,19 @@ struct TestStablePartitionCopyStencilToDiscardIterator
     thrust::host_vector<T> h_trues(n_true);
     thrust::device_vector<T> d_trues(n_true);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_result2 =
       thrust::stable_partition_copy(
         h_data.begin(), h_data.end(), h_stencil.begin(), h_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_result2 =
       thrust::stable_partition_copy(
         d_data.begin(), d_data.end(), d_stencil.begin(), d_trues.begin(), thrust::make_discard_iterator(), is_even<T>());
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
-      thrust::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, thrust::discard_iterator<>> h_reference2 =
+      _THRUST_STD::make_pair(h_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
-      thrust::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, thrust::discard_iterator<>> d_reference2 =
+      _THRUST_STD::make_pair(d_trues.begin() + n_true, thrust::make_discard_iterator(n_false));
 
     ASSERT_EQUAL(h_trues, d_trues);
     ASSERT_EQUAL_QUIET(h_reference2, h_result2);
@@ -806,7 +806,7 @@ struct TestStablePartitionCopyStencilToDiscardIterator
     thrust::host_vector<T> h_falses(n_false);
     thrust::device_vector<T> d_falses(n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_result3 =
       thrust::stable_partition_copy(
         h_data.begin(),
         h_data.end(),
@@ -815,7 +815,7 @@ struct TestStablePartitionCopyStencilToDiscardIterator
         h_falses.begin(),
         is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_result3 =
       thrust::stable_partition_copy(
         d_data.begin(),
         d_data.end(),
@@ -824,11 +824,11 @@ struct TestStablePartitionCopyStencilToDiscardIterator
         d_falses.begin(),
         is_even<T>());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<T>::iterator> h_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), h_falses.begin() + n_false);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<T>::iterator> d_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(n_true), d_falses.begin() + n_false);
 
     ASSERT_EQUAL(h_falses, d_falses);
     ASSERT_EQUAL_QUIET(h_reference3, h_result3);
@@ -1013,11 +1013,11 @@ void TestPartitionStencilDispatchImplicit()
 DECLARE_UNITTEST(TestPartitionStencilDispatchImplicit);
 
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   my_system& system, InputIterator, InputIterator, OutputIterator1 out_true, OutputIterator2 out_false, Predicate)
 {
   system.validate_dispatch();
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestPartitionCopyDispatchExplicit()
@@ -1036,7 +1036,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -1046,7 +1046,7 @@ thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
   Predicate)
 {
   system.validate_dispatch();
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestPartitionCopyStencilDispatchExplicit()
@@ -1061,11 +1061,11 @@ void TestPartitionCopyStencilDispatchExplicit()
 DECLARE_UNITTEST(TestPartitionCopyStencilDispatchExplicit);
 
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   my_tag, InputIterator first, InputIterator, OutputIterator1 out_true, OutputIterator2 out_false, Predicate)
 {
   *first = 13;
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestPartitionCopyDispatchImplicit()
@@ -1088,7 +1088,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   my_tag,
   InputIterator1 first,
   InputIterator1,
@@ -1098,7 +1098,7 @@ thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
   Predicate)
 {
   *first = 13;
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestPartitionCopyStencilDispatchImplicit()
@@ -1189,11 +1189,11 @@ void TestStablePartitionStencilDispatchImplicit()
 DECLARE_UNITTEST(TestStablePartitionStencilDispatchImplicit);
 
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   my_system& system, InputIterator, InputIterator, OutputIterator1 out_true, OutputIterator2 out_false, Predicate)
 {
   system.validate_dispatch();
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestStablePartitionCopyDispatchExplicit()
@@ -1212,7 +1212,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -1222,7 +1222,7 @@ thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   Predicate)
 {
   system.validate_dispatch();
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestStablePartitionCopyStencilDispatchExplicit()
@@ -1237,11 +1237,11 @@ void TestStablePartitionCopyStencilDispatchExplicit()
 DECLARE_UNITTEST(TestStablePartitionCopyStencilDispatchExplicit);
 
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   my_tag, InputIterator first, InputIterator, OutputIterator1 out_true, OutputIterator2 out_false, Predicate)
 {
   *first = 13;
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestStablePartitionCopyDispatchImplicit()
@@ -1264,7 +1264,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   my_tag,
   InputIterator1 first,
   InputIterator1,
@@ -1274,7 +1274,7 @@ thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   Predicate)
 {
   *first = 13;
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 void TestStablePartitionCopyStencilDispatchImplicit()
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/reduce_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/reduce_by_key.cu
index 29963c4993d4..73a2fc039a30 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/reduce_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/reduce_by_key.cu
@@ -53,7 +53,7 @@ void TestReduceByKeySimple()
   Vector keys;
   Vector values;
 
-  typename thrust::pair<typename Vector::iterator, typename Vector::iterator> new_last;
+  typename _THRUST_STD::pair<typename Vector::iterator, typename Vector::iterator> new_last;
 
   // basic test
   initialize_keys(keys);
@@ -144,8 +144,8 @@ struct TestReduceByKey
     using DeviceKeyIterator = typename thrust::device_vector<K>::iterator;
     using DeviceValIterator = typename thrust::device_vector<V>::iterator;
 
-    using HostIteratorPair   = typename thrust::pair<HostKeyIterator, HostValIterator>;
-    using DeviceIteratorPair = typename thrust::pair<DeviceKeyIterator, DeviceValIterator>;
+    using HostIteratorPair   = typename _THRUST_STD::pair<HostKeyIterator, HostValIterator>;
+    using DeviceIteratorPair = typename _THRUST_STD::pair<DeviceKeyIterator, DeviceValIterator>;
 
     HostIteratorPair h_last =
       thrust::reduce_by_key(h_keys.begin(), h_keys.end(), h_vals.begin(), h_keys_output.begin(), h_vals_output.begin());
@@ -212,7 +212,7 @@ struct TestReduceByKeyToDiscardIterator
 VariableUnitTest<TestReduceByKeyToDiscardIterator, IntegralTypes> TestReduceByKeyToDiscardIteratorInstance;
 
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -221,7 +221,7 @@ thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   OutputIterator2 values_output)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_output, values_output);
+  return _THRUST_STD::make_pair(keys_output, values_output);
 }
 
 void TestReduceByKeyDispatchExplicit()
@@ -236,11 +236,11 @@ void TestReduceByKeyDispatchExplicit()
 DECLARE_UNITTEST(TestReduceByKeyDispatchExplicit);
 
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   my_tag, InputIterator1, InputIterator1, InputIterator2, OutputIterator1 keys_output, OutputIterator2 values_output)
 {
   *keys_output = 13;
-  return thrust::make_pair(keys_output, values_output);
+  return _THRUST_STD::make_pair(keys_output, values_output);
 }
 
 void TestReduceByKeyDispatchImplicit()
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key.cu
index 1de71b603daf..ba901fa88d8b 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key.cu
@@ -28,7 +28,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -40,7 +40,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   OutputIterator2 values_result)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetDifferenceByKeyDispatchExplicit()
@@ -61,7 +61,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   my_tag,
   InputIterator1,
   InputIterator1,
@@ -73,7 +73,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   OutputIterator2 values_result)
 {
   *keys_result = 13;
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetDifferenceByKeyDispatchImplicit()
@@ -110,7 +110,7 @@ void TestSetDifferenceByKeySimple()
 
   Vector result_key(2), result_val(2);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_difference_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_difference_by_key(
     a_key.begin(),
     a_key.end(),
     b_key.begin(),
@@ -161,9 +161,9 @@ void TestSetDifferenceByKey(const size_t n)
     thrust::device_vector<T> d_result_keys(n);
     thrust::device_vector<T> d_result_vals(n);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
     h_end = thrust::set_difference_by_key(
       h_a_keys.begin(),
@@ -216,9 +216,9 @@ void TestSetDifferenceByKeyEquivalentRanges(const size_t n)
   thrust::host_vector<T> h_result_key(n), h_result_val(n);
   thrust::device_vector<T> d_result_key(n), d_result_val(n);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_difference_by_key(
     h_a_key.begin(),
@@ -280,9 +280,9 @@ void TestSetDifferenceByKeyMultiset(const size_t n)
   thrust::host_vector<T> h_result_key(n), h_result_val(n);
   thrust::device_vector<T> d_result_key(n), d_result_val(n);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_difference_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key_descending.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key_descending.cu
index 2ec484463d7d..4414bdc96084 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key_descending.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_difference_by_key_descending.cu
@@ -34,7 +34,7 @@ void TestSetDifferenceByKeyDescendingSimple()
 
   Vector result_key(2), result_val(2);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_difference_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_difference_by_key(
     a_key.begin(),
     a_key.end(),
     b_key.begin(),
@@ -74,9 +74,9 @@ void TestSetDifferenceByKeyDescending(const size_t n)
   thrust::host_vector<T> h_result_key(n), h_result_val(n);
   thrust::device_vector<T> d_result_key(n), d_result_val(n);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_difference_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key.cu
index 3fcac17fb6cf..3f333a1bb2f9 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key.cu
@@ -27,7 +27,7 @@ template <typename InputIterator1,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -38,7 +38,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   OutputIterator2 values_result)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetIntersectionByKeyDispatchExplicit()
@@ -58,7 +58,7 @@ template <typename InputIterator1,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   my_tag,
   InputIterator1,
   InputIterator1,
@@ -69,7 +69,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   OutputIterator2 values_result)
 {
   *keys_result = 13;
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetIntersectionByKeyDispatchImplicit()
@@ -100,7 +100,7 @@ void TestSetIntersectionByKeySimple()
   Vector ref_key{0, 4}, ref_val{0, 0};
   Vector result_key(2), result_val(2);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_intersection_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_intersection_by_key(
     a_key.begin(), a_key.end(), b_key.begin(), b_key.end(), a_val.begin(), result_key.begin(), result_val.begin());
 
   ASSERT_EQUAL_QUIET(result_key.end(), end.first);
@@ -142,9 +142,9 @@ void TestSetIntersectionByKey(const size_t n)
     thrust::device_vector<T> d_result_keys(n);
     thrust::device_vector<T> d_result_vals(n);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
     h_end = thrust::set_intersection_by_key(
       h_a_keys.begin(),
@@ -193,9 +193,9 @@ void TestSetIntersectionByKeyEquivalentRanges(const size_t n)
   thrust::host_vector<T> h_result_key(n), h_result_val(n);
   thrust::device_vector<T> d_result_key(n), d_result_val(n);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_intersection_by_key(
     h_a_key.begin(),
@@ -253,9 +253,9 @@ void TestSetIntersectionByKeyMultiset(const size_t n)
   thrust::host_vector<T> h_result_key(n), h_result_val(n);
   thrust::device_vector<T> d_result_key(n), d_result_val(n);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_intersection_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key_descending.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key_descending.cu
index a8c61ed7abdd..128c7ca109f9 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key_descending.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_intersection_by_key_descending.cu
@@ -33,7 +33,7 @@ void TestSetIntersectionByKeyDescendingSimple()
   Vector ref_key{4, 0}, ref_val{0, 0};
   Vector result_key(2), result_val(2);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_intersection_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_intersection_by_key(
     a_key.begin(),
     a_key.end(),
     b_key.begin(),
@@ -70,9 +70,9 @@ void TestSetIntersectionByKeyDescending(const size_t n)
   thrust::host_vector<T> h_result_key(n), h_result_val(n);
   thrust::device_vector<T> d_result_key(n), d_result_val(n);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_intersection_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key.cu
index 4471ba6e382a..c9109f7fb668 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key.cu
@@ -28,7 +28,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -40,7 +40,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   OutputIterator2 values_result)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetSymmetricDifferenceByKeyDispatchExplicit()
@@ -61,7 +61,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   my_tag,
   InputIterator1,
   InputIterator1,
@@ -73,7 +73,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   OutputIterator2 values_result)
 {
   *keys_result = 13;
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetSymmetricDifferenceByKeyDispatchImplicit()
@@ -105,7 +105,7 @@ void TestSetSymmetricDifferenceByKeySimple()
   Vector ref_key{2, 3, 3, 6, 7}, ref_val{0, 1, 1, 0, 1};
   Vector result_key(5), result_val(5);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_symmetric_difference_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_symmetric_difference_by_key(
     a_key.begin(),
     a_key.end(),
     b_key.begin(),
@@ -158,9 +158,9 @@ void TestSetSymmetricDifferenceByKey(const size_t n)
     thrust::device_vector<T> d_result_keys(max_size);
     thrust::device_vector<T> d_result_vals(max_size);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
     h_end = thrust::set_symmetric_difference_by_key(
       h_a_keys.begin(),
@@ -215,9 +215,9 @@ void TestSetSymmetricDifferenceByKeyEquivalentRanges(const size_t n)
   thrust::host_vector<T> h_result_key(max_size), h_result_val(max_size);
   thrust::device_vector<T> d_result_key(max_size), d_result_val(max_size);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_symmetric_difference_by_key(
     h_a_key.begin(),
@@ -280,9 +280,9 @@ void TestSetSymmetricDifferenceByKeyMultiset(const size_t n)
   thrust::host_vector<T> h_result_key(max_size), h_result_val(max_size);
   thrust::device_vector<T> d_result_key(max_size), d_result_val(max_size);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_symmetric_difference_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key_descending.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key_descending.cu
index eee7ebc99861..8f259c4076cb 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key_descending.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_symmetric_difference_by_key_descending.cu
@@ -33,7 +33,7 @@ void TestSetSymmetricDifferenceByKeyDescendingSimple()
   Vector ref_key{7, 6, 3, 3, 2}, ref_val{1, 0, 1, 1, 0};
   Vector result_key(5), result_val(5);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_symmetric_difference_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_symmetric_difference_by_key(
     a_key.begin(),
     a_key.end(),
     b_key.begin(),
@@ -74,9 +74,9 @@ void TestSetSymmetricDifferenceByKeyDescending(const size_t n)
   thrust::host_vector<T> h_result_key(max_size), h_result_val(max_size);
   thrust::device_vector<T> d_result_key(max_size), d_result_val(max_size);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_symmetric_difference_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key.cu
index e1586782ef64..0a12738c6448 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key.cu
@@ -28,7 +28,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -40,7 +40,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   OutputIterator2 values_result)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetUnionByKeyDispatchExplicit()
@@ -61,7 +61,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   my_tag,
   InputIterator1,
   InputIterator1,
@@ -73,7 +73,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   OutputIterator2 values_result)
 {
   *keys_result = 13;
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 
 void TestSetUnionByKeyDispatchImplicit()
@@ -105,7 +105,7 @@ void TestSetUnionByKeySimple()
   Vector ref_key{0, 2, 3, 3, 4}, ref_val{0, 0, 1, 1, 0};
   Vector result_key(5), result_val(5);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_union_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_union_by_key(
     a_key.begin(),
     a_key.end(),
     b_key.begin(),
@@ -158,9 +158,9 @@ void TestSetUnionByKey(const size_t n)
     thrust::device_vector<T> d_result_keys(max_size);
     thrust::device_vector<T> d_result_vals(max_size);
 
-    thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+    _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-    thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+    _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
     h_end = thrust::set_union_by_key(
       h_a_keys.begin(),
@@ -215,9 +215,9 @@ void TestSetUnionByKeyEquivalentRanges(const size_t n)
   thrust::host_vector<T> h_result_key(max_size), h_result_val(max_size);
   thrust::device_vector<T> d_result_key(max_size), d_result_val(max_size);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_union_by_key(
     h_a_key.begin(),
@@ -280,9 +280,9 @@ void TestSetUnionByKeyMultiset(const size_t n)
   thrust::host_vector<T> h_result_key(max_size), h_result_val(max_size);
   thrust::device_vector<T> d_result_key(max_size), d_result_val(max_size);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_union_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key_descending.cu b/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key_descending.cu
index 90156aa73adf..7ebeb17e0b9c 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key_descending.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/set_union_by_key_descending.cu
@@ -33,7 +33,7 @@ void TestSetUnionByKeyDescendingSimple()
   Vector ref_key{4, 3, 3, 2, 0}, ref_val{0, 1, 1, 0, 0};
   Vector result_key(5), result_val(5);
 
-  thrust::pair<Iterator, Iterator> end = thrust::set_union_by_key(
+  _THRUST_STD::pair<Iterator, Iterator> end = thrust::set_union_by_key(
     a_key.begin(),
     a_key.end(),
     b_key.begin(),
@@ -74,9 +74,9 @@ void TestSetUnionByKeyDescending(const size_t n)
   thrust::host_vector<T> h_result_key(max_size), h_result_val(max_size);
   thrust::device_vector<T> d_result_key(max_size), d_result_val(max_size);
 
-  thrust::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
+  _THRUST_STD::pair<typename thrust::host_vector<T>::iterator, typename thrust::host_vector<T>::iterator> h_end;
 
-  thrust::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
+  _THRUST_STD::pair<typename thrust::device_vector<T>::iterator, typename thrust::device_vector<T>::iterator> d_end;
 
   h_end = thrust::set_union_by_key(
     h_a_key.begin(),
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/transform.cu b/projects/hipccl/hipccl3/rocthrust/testing/transform.cu
index 34484688c373..899b799d2520 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/transform.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/transform.cu
@@ -19,10 +19,11 @@
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/pair.h>
 #include <thrust/transform.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_STD_INCLUDE(utility)
+
 #include <unittest/unittest.h>
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
@@ -410,9 +411,9 @@ DECLARE_VARIABLE_UNITTEST(TestTransformUnaryToDiscardIterator);
 struct repeat2
 {
   template <typename T>
-  THRUST_HOST_DEVICE thrust::pair<T, T> operator()(T x)
+  THRUST_HOST_DEVICE _THRUST_STD::pair<T, T> operator()(T x)
   {
-    return thrust::make_pair(x, x);
+    return _THRUST_STD::make_pair(x, x);
   }
 };
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu b/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu
index 97f64b35c07f..d8aecb7b5f02 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/type_traits.cu
@@ -28,7 +28,6 @@
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/pair.h>
 #include <thrust/tuple.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
@@ -210,25 +209,25 @@ void TestTriviallyRelocatable()
 #if THRUST_COMPILER(GCC, >=, 7)
   static_assert(thrust::is_trivially_relocatable<thrust::complex<float>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::complex<float>>::value, "");
-  static_assert(thrust::is_trivially_relocatable<thrust::pair<int, thrust::complex<float>>>::value, "");
+  static_assert(thrust::is_trivially_relocatable<_THRUST_STD::pair<int, thrust::complex<float>>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::pair<int, _THRUST_STD::complex<float>>>::value, "");
   static_assert(thrust::is_trivially_relocatable<thrust::tuple<int, thrust::complex<float>, char>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<int, _THRUST_STD::complex<float>, char>>::value,
                 "");
 #endif // THRUST_COMPILER(GCC, >=, 7)
   static_assert(thrust::is_trivially_relocatable<
-                  _THRUST_STD::tuple<thrust::pair<int, thrust::tuple<int, _THRUST_STD::tuple<>>>,
+                  _THRUST_STD::tuple<_THRUST_STD::pair<int, thrust::tuple<int, _THRUST_STD::tuple<>>>,
                                      thrust::tuple<_THRUST_STD::pair<int, thrust::tuple<>>, int>>>::value,
                 "");
 
-  static_assert(!thrust::is_trivially_relocatable<thrust::pair<int, std::string>>::value, "");
+  static_assert(!thrust::is_trivially_relocatable<_THRUST_STD::pair<int, std::string>>::value, "");
   static_assert(!thrust::is_trivially_relocatable<_THRUST_STD::pair<int, std::string>>::value, "");
   static_assert(!thrust::is_trivially_relocatable<thrust::tuple<int, float, std::string>>::value, "");
   static_assert(!thrust::is_trivially_relocatable<_THRUST_STD::tuple<int, float, std::string>>::value, "");
 
   // test propagation of relocatability through pair and tuple
   static_assert(thrust::is_trivially_relocatable<NonTriviallyCopyable>::value, "");
-  static_assert(thrust::is_trivially_relocatable<thrust::pair<NonTriviallyCopyable, int>>::value, "");
+  static_assert(thrust::is_trivially_relocatable<_THRUST_STD::pair<NonTriviallyCopyable, int>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::pair<NonTriviallyCopyable, int>>::value, "");
   static_assert(thrust::is_trivially_relocatable<thrust::tuple<NonTriviallyCopyable>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<NonTriviallyCopyable>>::value, "");
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/unique_by_key.cu b/projects/hipccl/hipccl3/rocthrust/testing/unique_by_key.cu
index f1cade3d18d1..a1cb86e436ad 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/unique_by_key.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/unique_by_key.cu
@@ -40,11 +40,11 @@ struct index_to_value_t
 };
 
 template <typename ForwardIterator1, typename ForwardIterator2>
-thrust::pair<ForwardIterator1, ForwardIterator2>
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2>
 unique_by_key(my_system& system, ForwardIterator1 keys_first, ForwardIterator1, ForwardIterator2 values_first)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_first, values_first);
+  return _THRUST_STD::make_pair(keys_first, values_first);
 }
 
 void TestUniqueByKeyDispatchExplicit()
@@ -59,11 +59,11 @@ void TestUniqueByKeyDispatchExplicit()
 DECLARE_UNITTEST(TestUniqueByKeyDispatchExplicit);
 
 template <typename ForwardIterator1, typename ForwardIterator2>
-thrust::pair<ForwardIterator1, ForwardIterator2>
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2>
 unique_by_key(my_tag, ForwardIterator1 keys_first, ForwardIterator1, ForwardIterator2 values_first)
 {
   *keys_first = 13;
-  return thrust::make_pair(keys_first, values_first);
+  return _THRUST_STD::make_pair(keys_first, values_first);
 }
 
 void TestUniqueByKeyDispatchImplicit()
@@ -78,7 +78,7 @@ void TestUniqueByKeyDispatchImplicit()
 DECLARE_UNITTEST(TestUniqueByKeyDispatchImplicit);
 
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   my_system& system,
   InputIterator1,
   InputIterator1,
@@ -87,7 +87,7 @@ thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   OutputIterator2 values_output)
 {
   system.validate_dispatch();
-  return thrust::make_pair(keys_output, values_output);
+  return _THRUST_STD::make_pair(keys_output, values_output);
 }
 
 void TestUniqueByKeyCopyDispatchExplicit()
@@ -102,11 +102,11 @@ void TestUniqueByKeyCopyDispatchExplicit()
 DECLARE_UNITTEST(TestUniqueByKeyCopyDispatchExplicit);
 
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   my_tag, InputIterator1, InputIterator1, InputIterator2, OutputIterator1 keys_output, OutputIterator2 values_output)
 {
   *keys_output = 13;
-  return thrust::make_pair(keys_output, values_output);
+  return _THRUST_STD::make_pair(keys_output, values_output);
 }
 
 void TestUniqueByKeyCopyDispatchImplicit()
@@ -155,7 +155,7 @@ void TestUniqueByKeySimple()
   Vector keys;
   Vector values;
 
-  typename thrust::pair<typename Vector::iterator, typename Vector::iterator> new_last;
+  typename _THRUST_STD::pair<typename Vector::iterator, typename Vector::iterator> new_last;
 
   // basic test
   initialize_keys(keys);
@@ -201,7 +201,7 @@ void TestUniqueCopyByKeySimple()
   Vector keys;
   Vector values;
 
-  typename thrust::pair<typename Vector::iterator, typename Vector::iterator> new_last;
+  typename _THRUST_STD::pair<typename Vector::iterator, typename Vector::iterator> new_last;
 
   // basic test
   initialize_keys(keys);
@@ -262,8 +262,8 @@ struct TestUniqueByKey
     using DeviceKeyIterator = typename thrust::device_vector<K>::iterator;
     using DeviceValIterator = typename thrust::device_vector<V>::iterator;
 
-    using HostIteratorPair   = typename thrust::pair<HostKeyIterator, HostValIterator>;
-    using DeviceIteratorPair = typename thrust::pair<DeviceKeyIterator, DeviceValIterator>;
+    using HostIteratorPair   = typename _THRUST_STD::pair<HostKeyIterator, HostValIterator>;
+    using DeviceIteratorPair = typename _THRUST_STD::pair<DeviceKeyIterator, DeviceValIterator>;
 
     HostIteratorPair h_last   = thrust::unique_by_key(h_keys.begin(), h_keys.end(), h_vals.begin());
     DeviceIteratorPair d_last = thrust::unique_by_key(d_keys.begin(), d_keys.end(), d_vals.begin());
@@ -308,8 +308,8 @@ struct TestUniqueCopyByKey
     using DeviceKeyIterator = typename thrust::device_vector<K>::iterator;
     using DeviceValIterator = typename thrust::device_vector<V>::iterator;
 
-    using HostIteratorPair   = typename thrust::pair<HostKeyIterator, HostValIterator>;
-    using DeviceIteratorPair = typename thrust::pair<DeviceKeyIterator, DeviceValIterator>;
+    using HostIteratorPair   = typename _THRUST_STD::pair<HostKeyIterator, HostValIterator>;
+    using DeviceIteratorPair = typename _THRUST_STD::pair<DeviceKeyIterator, DeviceValIterator>;
 
     HostIteratorPair h_last = thrust::unique_by_key_copy(
       h_keys.begin(), h_keys.end(), h_vals.begin(), h_keys_output.begin(), h_vals_output.begin());
@@ -358,51 +358,51 @@ struct TestUniqueCopyByKeyToDiscardIterator
     size_t num_unique_keys = h_unique_keys.size();
 
     // mask both outputs
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::unique_by_key_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> h_result1 = thrust::unique_by_key_copy(
       h_keys.begin(), h_keys.end(), h_vals.begin(), thrust::make_discard_iterator(), thrust::make_discard_iterator());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::unique_by_key_copy(
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> d_result1 = thrust::unique_by_key_copy(
       d_keys.begin(), d_keys.end(), d_vals.begin(), thrust::make_discard_iterator(), thrust::make_discard_iterator());
 
-    thrust::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 =
-      thrust::make_pair(thrust::make_discard_iterator(num_unique_keys), thrust::make_discard_iterator(num_unique_keys));
+    _THRUST_STD::pair<thrust::discard_iterator<>, thrust::discard_iterator<>> reference1 = _THRUST_STD::make_pair(
+      thrust::make_discard_iterator(num_unique_keys), thrust::make_discard_iterator(num_unique_keys));
 
     ASSERT_EQUAL_QUIET(reference1, h_result1);
     ASSERT_EQUAL_QUIET(reference1, d_result1);
 
     // mask values output
-    thrust::pair<typename thrust::host_vector<K>::iterator, thrust::discard_iterator<>> h_result2 =
+    _THRUST_STD::pair<typename thrust::host_vector<K>::iterator, thrust::discard_iterator<>> h_result2 =
       thrust::unique_by_key_copy(
         h_keys.begin(), h_keys.end(), h_vals.begin(), h_keys_output.begin(), thrust::make_discard_iterator());
 
-    thrust::pair<typename thrust::device_vector<K>::iterator, thrust::discard_iterator<>> d_result2 =
+    _THRUST_STD::pair<typename thrust::device_vector<K>::iterator, thrust::discard_iterator<>> d_result2 =
       thrust::unique_by_key_copy(
         d_keys.begin(), d_keys.end(), d_vals.begin(), d_keys_output.begin(), thrust::make_discard_iterator());
 
-    thrust::pair<typename thrust::host_vector<K>::iterator, thrust::discard_iterator<>> h_reference2 =
-      thrust::make_pair(h_keys_output.begin() + num_unique_keys, thrust::make_discard_iterator(num_unique_keys));
+    _THRUST_STD::pair<typename thrust::host_vector<K>::iterator, thrust::discard_iterator<>> h_reference2 =
+      _THRUST_STD::make_pair(h_keys_output.begin() + num_unique_keys, thrust::make_discard_iterator(num_unique_keys));
 
-    thrust::pair<typename thrust::device_vector<K>::iterator, thrust::discard_iterator<>> d_reference2 =
-      thrust::make_pair(d_keys_output.begin() + num_unique_keys, thrust::make_discard_iterator(num_unique_keys));
+    _THRUST_STD::pair<typename thrust::device_vector<K>::iterator, thrust::discard_iterator<>> d_reference2 =
+      _THRUST_STD::make_pair(d_keys_output.begin() + num_unique_keys, thrust::make_discard_iterator(num_unique_keys));
 
     ASSERT_EQUAL(h_keys_output, d_keys_output);
     ASSERT_EQUAL_QUIET(h_reference2, h_result2);
     ASSERT_EQUAL_QUIET(d_reference2, d_result2);
 
     // mask keys output
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<V>::iterator> h_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<V>::iterator> h_result3 =
       thrust::unique_by_key_copy(
         h_keys.begin(), h_keys.end(), h_vals.begin(), thrust::make_discard_iterator(), h_vals_output.begin());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<V>::iterator> d_result3 =
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<V>::iterator> d_result3 =
       thrust::unique_by_key_copy(
         d_keys.begin(), d_keys.end(), d_vals.begin(), thrust::make_discard_iterator(), d_vals_output.begin());
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::host_vector<V>::iterator> h_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(num_unique_keys), h_vals_output.begin() + num_unique_keys);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::host_vector<V>::iterator> h_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(num_unique_keys), h_vals_output.begin() + num_unique_keys);
 
-    thrust::pair<thrust::discard_iterator<>, typename thrust::device_vector<V>::iterator> d_reference3 =
-      thrust::make_pair(thrust::make_discard_iterator(num_unique_keys), d_vals_output.begin() + num_unique_keys);
+    _THRUST_STD::pair<thrust::discard_iterator<>, typename thrust::device_vector<V>::iterator> d_reference3 =
+      _THRUST_STD::make_pair(thrust::make_discard_iterator(num_unique_keys), d_vals_output.begin() + num_unique_keys);
 
     ASSERT_EQUAL(h_vals_output, d_vals_output);
     ASSERT_EQUAL_QUIET(h_reference3, h_result3);
@@ -504,7 +504,7 @@ struct Entry
 
 void TestKeysWithoutEqualityOperator()
 {
-  using Key = thrust::pair<std::int32_t, Entry>;
+  using Key = _THRUST_STD::pair<std::int32_t, Entry>;
 
   const auto k1 = Key{1, {}};
   const auto k2 = Key{2, {}};
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/binary_search.h b/projects/hipccl/hipccl3/rocthrust/thrust/binary_search.h
index 38cd22ef6a51..1bc2a9289122 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/binary_search.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/binary_search.h
@@ -30,7 +30,8 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -774,7 +775,7 @@ bool binary_search(ForwardIterator first, ForwardIterator last, const T& value,
  *  \see \p binary_search
  */
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -839,7 +840,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
  *  \see \p binary_search
  */
 template <class ForwardIterator, class LessThanComparable>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 equal_range(ForwardIterator first, ForwardIterator last, const LessThanComparable& value);
 
 /*! \p equal_range is a version of binary search: it attempts to find
@@ -917,7 +918,7 @@ equal_range(ForwardIterator first, ForwardIterator last, const LessThanComparabl
  *  \see \p binary_search
  */
 template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -994,7 +995,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
  *  \see \p binary_search
  */
 template <class ForwardIterator, class T, class StrictWeakOrdering>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 equal_range(ForwardIterator first, ForwardIterator last, const T& value, StrictWeakOrdering comp);
 
 /*! \addtogroup vectorized_binary_search Vectorized Searches
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/temporary_allocator.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/temporary_allocator.h
index a7b9b5308bd5..4b445d54ab78 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/temporary_allocator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/temporary_allocator.h
@@ -33,9 +33,9 @@
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/temporary_buffer.h>
 #include <thrust/memory.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/bad_alloc.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 #include _THRUST_STD_INCLUDE(cassert)
 
 #if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
@@ -118,7 +118,7 @@ class temporary_allocator : public thrust::detail::tagged_allocator<T, System, t
   } // end system()
 
 private:
-  using pointer_and_size = thrust::pair<pointer, size_type>;
+  using pointer_and_size = _THRUST_STD::pair<pointer, size_type>;
 }; // end temporary_allocator
 } // namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/binary_search.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/binary_search.inl
index 964533dc2c59..382dd507e4f7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/binary_search.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/binary_search.inl
@@ -123,7 +123,7 @@ THRUST_HOST_DEVICE bool binary_search(
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -136,7 +136,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -346,7 +346,7 @@ bool binary_search(ForwardIterator first, ForwardIterator last, const T& value,
 }
 
 template <typename ForwardIterator, typename LessThanComparable>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 equal_range(ForwardIterator first, ForwardIterator last, const LessThanComparable& value)
 {
   using thrust::system::detail::generic::select_system;
@@ -359,7 +359,7 @@ equal_range(ForwardIterator first, ForwardIterator last, const LessThanComparabl
 }
 
 template <typename ForwardIterator, typename T, typename StrictWeakOrdering>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 equal_range(ForwardIterator first, ForwardIterator last, const T& value, StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
index e2b2e823fb29..236c122f4ddf 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/execute_with_allocator.h
@@ -30,7 +30,6 @@
 #include <thrust/detail/execute_with_allocator_fwd.h>
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
-#include <thrust/pair.h>
 
 #include _THRUST_LIBCXX_INCLUDE(__cmath/ceil_div.h)
 #include _THRUST_STD_INCLUDE(__utility/pair.h)
@@ -40,7 +39,7 @@ THRUST_NAMESPACE_BEGIN
 namespace detail
 {
 template <typename T, typename Allocator, template <typename> class BaseSystem>
-THRUST_HOST thrust::pair<T*, std::ptrdiff_t>
+THRUST_HOST _THRUST_STD::pair<T*, std::ptrdiff_t>
 get_temporary_buffer(thrust::detail::execute_with_allocator<Allocator, BaseSystem>& system, std::ptrdiff_t n)
 {
   using naked_allocator = _THRUST_STD::remove_reference_t<Allocator>;
@@ -56,7 +55,7 @@ get_temporary_buffer(thrust::detail::execute_with_allocator<Allocator, BaseSyste
   void_pointer ptr = alloc_traits::allocate(system.get_allocator(), num_elements);
 
   // Return the pointer and the number of elements of type T allocated.
-  return thrust::make_pair(thrust::reinterpret_pointer_cast<T*>(ptr), n);
+  return _THRUST_STD::make_pair(thrust::reinterpret_pointer_cast<T*>(ptr), n);
 }
 
 template <typename Pointer, typename Allocator, template <typename> class BaseSystem>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/extrema.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/extrema.inl
index 443a35cb454f..251d98261e2d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/extrema.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/extrema.inl
@@ -90,7 +90,7 @@ THRUST_HOST_DEVICE ForwardIterator max_element(
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
 {
   using thrust::system::detail::generic::minmax_element;
@@ -99,7 +99,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -158,7 +158,7 @@ ForwardIterator max_element(ForwardIterator first, ForwardIterator last, BinaryP
 } // end max_element()
 
 template <typename ForwardIterator>
-thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last)
+_THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -170,7 +170,7 @@ thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator fi
 } // end minmax_element()
 
 template <typename ForwardIterator, typename BinaryPredicate>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 minmax_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   using thrust::system::detail::generic::select_system;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/merge.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/merge.inl
index 2d6507a21d6c..36db57e93421 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/merge.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/merge.inl
@@ -89,7 +89,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -122,7 +122,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Compare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -194,7 +194,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -240,7 +240,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/mismatch.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/mismatch.inl
index e531c55dc78f..f97bad718279 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/mismatch.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/mismatch.inl
@@ -48,7 +48,7 @@ THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2>
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2>
 mismatch(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
          InputIterator1 first1,
          InputIterator1 last1,
@@ -60,7 +60,7 @@ mismatch(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 first1,
   InputIterator1 last1,
@@ -72,7 +72,7 @@ THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
 } // end mismatch()
 
 template <typename InputIterator1, typename InputIterator2>
-thrust::pair<InputIterator1, InputIterator2> mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
+_THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -86,7 +86,7 @@ thrust::pair<InputIterator1, InputIterator2> mismatch(InputIterator1 first1, Inp
 } // end mismatch()
 
 template <typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-thrust::pair<InputIterator1, InputIterator2>
+_THRUST_STD::pair<InputIterator1, InputIterator2>
 mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryPredicate pred)
 {
   using thrust::system::detail::generic::select_system;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/partition.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/partition.inl
index 1524c0435e2a..eb586af02cd4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/partition.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/partition.inl
@@ -77,7 +77,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -97,7 +97,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
@@ -142,7 +142,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -162,7 +162,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
@@ -253,7 +253,7 @@ ForwardIterator stable_partition(ForwardIterator first, ForwardIterator last, In
 } // end stable_partition()
 
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   InputIterator first, InputIterator last, OutputIterator1 out_true, OutputIterator2 out_false, Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
@@ -274,7 +274,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   InputIterator1 first,
   InputIterator1 last,
   InputIterator2 stencil,
@@ -299,7 +299,7 @@ thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
 } // end partition_copy()
 
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   InputIterator first, InputIterator last, OutputIterator1 out_true, OutputIterator2 out_false, Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
@@ -320,7 +320,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   InputIterator1 first,
   InputIterator1 last,
   InputIterator2 stencil,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/reduce.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/reduce.inl
index 65b82a7b360f..8ecd6a3389fb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/reduce.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/reduce.inl
@@ -132,7 +132,7 @@ template <typename DerivedPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -157,7 +157,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -185,7 +185,7 @@ template <typename DerivedPolicy,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -286,7 +286,7 @@ void reduce_into(InputIterator first, InputIterator last, OutputIterator output,
 }
 
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
@@ -314,7 +314,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
@@ -350,7 +350,7 @@ template <typename InputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/set_operations.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/set_operations.inl
index 829117096b0d..463bf4281b82 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/set_operations.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/set_operations.inl
@@ -88,7 +88,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -121,7 +121,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -189,7 +189,7 @@ template <typename DerivedPolicy,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -219,7 +219,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -286,7 +286,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -319,7 +319,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -388,7 +388,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -421,7 +421,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -493,7 +493,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -539,7 +539,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -622,7 +622,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -663,7 +663,7 @@ template <typename InputIterator1,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -745,7 +745,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -791,7 +791,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -875,7 +875,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -921,7 +921,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_buffer.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_buffer.h
index e0ab6b44893d..d3f6ab12d3d4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_buffer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_buffer.h
@@ -30,7 +30,8 @@
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/pointer.h>
 #include <thrust/detail/raw_pointer_cast.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 // Include all active backend system implementations (generic, sequential, host and device)
 #include <thrust/system/detail/generic/temporary_buffer.h>
@@ -52,15 +53,15 @@ namespace detail
 {
 template <typename T, typename DerivedPolicy, typename Pair>
 THRUST_HOST_DEVICE
-  thrust::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
-  down_cast_pair(Pair p)
+_THRUST_STD::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
+down_cast_pair(Pair p)
 {
   // XXX should use a hypothetical thrust::static_pointer_cast here
   thrust::pointer<T, DerivedPolicy> ptr =
     thrust::pointer<T, DerivedPolicy>(static_cast<T*>(thrust::raw_pointer_cast(p.first)));
 
   using result_type =
-    thrust::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>;
+    _THRUST_STD::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>;
   return result_type(ptr, p.second);
 } // end down_cast_pair()
 } // namespace detail
@@ -68,9 +69,9 @@ THRUST_HOST_DEVICE
 THRUST_EXEC_CHECK_DISABLE
 template <typename T, typename DerivedPolicy>
 THRUST_HOST_DEVICE
-  thrust::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
-  get_temporary_buffer(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-                       typename thrust::pointer<T, DerivedPolicy>::difference_type n)
+_THRUST_STD::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
+get_temporary_buffer(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
+                     typename thrust::pointer<T, DerivedPolicy>::difference_type n)
 {
   using thrust::detail::get_temporary_buffer; // execute_with_allocator
   using thrust::system::detail::generic::get_temporary_buffer;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/unique.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/unique.inl
index 8af545a0905b..6cc3e2342991 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/unique.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/unique.inl
@@ -104,7 +104,7 @@ THRUST_HOST_DEVICE OutputIterator unique_copy(
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -117,7 +117,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_ke
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -135,7 +135,7 @@ template <typename DerivedPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -160,7 +160,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -233,7 +233,7 @@ OutputIterator unique_copy(InputIterator first, InputIterator last, OutputIterat
 } // end unique_copy()
 
 template <typename ForwardIterator1, typename ForwardIterator2>
-thrust::pair<ForwardIterator1, ForwardIterator2>
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2>
 unique_by_key(ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIterator2 values_first)
 {
   using thrust::system::detail::generic::select_system;
@@ -248,7 +248,7 @@ unique_by_key(ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIt
 } // end unique_by_key()
 
 template <typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIterator2 values_first, BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
@@ -263,7 +263,7 @@ thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
 } // end unique_by_key()
 
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
@@ -291,7 +291,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h
index 128ff58d614d..7594b6829981 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h
@@ -30,7 +30,8 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <thrust/detail/algorithm_wrapper.h>
 #endif
@@ -480,7 +481,7 @@ ForwardIterator max_element(ForwardIterator first, ForwardIterator last, BinaryP
  *  #include <thrust/execution_policy.h>
  *  ...
  *  int data[6] = {1, 0, 2, 2, 1, 3};
- *  thrust::pair<int *, int *> result = thrust::minmax_element(thrust::host, data, data + 6);
+ *  _THRUST_STD::pair<int *, int *> result = thrust::minmax_element(thrust::host, data, data + 6);
  *
  *  // result.first is data + 1
  *  // result.second is data + 5
@@ -493,7 +494,7 @@ ForwardIterator max_element(ForwardIterator first, ForwardIterator last, BinaryP
  *  \see http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1840.pdf
  */
 template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last);
 
 /*! \p minmax_element finds the smallest and largest elements in the range <tt>[first, last)</tt>.
@@ -514,7 +515,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
  *  #include <thrust/extrema.h>
  *  ...
  *  int data[6] = {1, 0, 2, 2, 1, 3};
- *  thrust::pair<int *, int *> result = thrust::minmax_element(data, data + 6);
+ *  _THRUST_STD::pair<int *, int *> result = thrust::minmax_element(data, data + 6);
  *
  *  // result.first is data + 1
  *  // result.second is data + 5
@@ -527,7 +528,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
  *  \see http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1840.pdf
  */
 template <typename ForwardIterator>
-thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last);
+_THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last);
 
 /*! \p minmax_element finds the smallest and largest elements in the range <tt>[first, last)</tt>.
  *  It returns a pair of iterators <tt>(imin, imax)</tt> where \c imin is the same iterator
@@ -576,7 +577,7 @@ thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator fi
  *  ...
  *  key_value data[4] = { {4,5}, {0,7}, {2,3}, {6,1} };
  *
- *  thrust::pair<key_value*,key_value*> extrema = thrust::minmax_element(thrust::host, data, data + 4,
+ *  _THRUST_STD::pair<key_value*,key_value*> extrema = thrust::minmax_element(thrust::host, data, data + 4,
  * compare_key_value());
  *
  *  // extrema.first   == data + 1
@@ -590,7 +591,7 @@ thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator fi
  *  \see http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1840.pdf
  */
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -637,7 +638,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
  *  ...
  *  key_value data[4] = { {4,5}, {0,7}, {2,3}, {6,1} };
  *
- *  thrust::pair<key_value*,key_value*> extrema = thrust::minmax_element(data, data + 4, compare_key_value());
+ *  _THRUST_STD::pair<key_value*,key_value*> extrema = thrust::minmax_element(data, data + 4, compare_key_value());
  *
  *  // extrema.first   == data + 1
  *  // *extrema.first  == {0,7}
@@ -650,7 +651,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
  *  \see http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1840.pdf
  */
 template <typename ForwardIterator, typename BinaryPredicate>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 minmax_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp);
 
 /*! \} // end extrema
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
index 25fb17eb1d39..e3db3101dcde 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
@@ -29,9 +29,10 @@
 
 #include <thrust/detail/raw_reference_cast.h>
 #include <thrust/detail/reference_forward_declaration.h>
-#include <thrust/pair.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 #  include _THRUST_STD_INCLUDE(tuple)
 #  include _THRUST_STD_INCLUDE(type_traits)
@@ -98,7 +99,7 @@ class tuple_of_iterator_references : public tuple<Ts...>
   // XXX might be worthwhile to guard this with an enable_if is_assignable
   THRUST_EXEC_CHECK_DISABLE
   template <typename U1, typename U2>
-  THRUST_HOST_DEVICE tuple_of_iterator_references& operator=(const pair<U1, U2>& other)
+  THRUST_HOST_DEVICE tuple_of_iterator_references& operator=(const _THRUST_STD::pair<U1, U2>& other)
   {
     super_t::operator=(other);
     return *this;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/memory.h b/projects/hipccl/hipccl3/rocthrust/thrust/memory.h
index d7882810a4ca..5166904c6f30 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/memory.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/memory.h
@@ -148,7 +148,7 @@ malloc(const thrust::detail::execution_policy_base<DerivedPolicy>& system, std::
  *  // allocate storage for 100 ints with thrust::get_temporary_buffer
  *  const int N = 100;
  *
- *  using ptr_and_size_t = thrust::pair<
+ *  using ptr_and_size_t = _THRUST_STD::pair<
  *    thrust::pointer<int,thrust::device_system_tag>,
  *    std::ptrdiff_t
  *  >;
@@ -171,9 +171,9 @@ malloc(const thrust::detail::execution_policy_base<DerivedPolicy>& system, std::
  */
 template <typename T, typename DerivedPolicy>
 THRUST_HOST_DEVICE
-  thrust::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
-  get_temporary_buffer(const thrust::detail::execution_policy_base<DerivedPolicy>& system,
-                       typename thrust::pointer<T, DerivedPolicy>::difference_type n);
+_THRUST_STD::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
+get_temporary_buffer(const thrust::detail::execution_policy_base<DerivedPolicy>& system,
+                     typename thrust::pointer<T, DerivedPolicy>::difference_type n);
 
 /*! \p free deallocates the storage previously allocated by \p thrust::malloc.
  *
@@ -230,7 +230,7 @@ THRUST_HOST_DEVICE void free(const thrust::detail::execution_policy_base<Derived
  *  // allocate storage for 100 ints with thrust::get_temporary_buffer
  *  const int N = 100;
  *
- *  using ptr_and_size_t = thrust::pair<
+ *  using ptr_and_size_t = _THRUST_STD::pair<
  *    thrust::pointer<int,thrust::device_system_tag>,
  *    std::ptrdiff_t
  *  >;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/merge.h b/projects/hipccl/hipccl3/rocthrust/thrust/merge.h
index d7bb43f247fd..30cfdcd60234 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/merge.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/merge.h
@@ -30,7 +30,8 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -384,7 +385,7 @@ merge(InputIterator1 first1,
  *  int keys_result[13];
  *  int vals_result[13];
  *
- *  thrust::pair<int*,int*> end =
+ *  _THRUST_STD::pair<int*,int*> end =
  *    thrust::merge_by_key(thrust::host,
  *                         A_keys, A_keys + 6,
  *                         B_keys, B_keys + 7,
@@ -406,7 +407,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -486,7 +487,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
  *  int keys_result[13];
  *  int vals_result[13];
  *
- *  thrust::pair<int*,int*> end = thrust::merge_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals, B_vals,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::merge_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals, B_vals,
  * keys_result, vals_result);
  *
  *  // keys_result = {1, 1, 1, 2, 3, 3, 5, 5, 7, 8, 9, 11, 13}
@@ -503,7 +504,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -585,7 +586,7 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
  *  int keys_result[13];
  *  int vals_result[13];
  *
- *  thrust::pair<int*,int*> end =
+ *  _THRUST_STD::pair<int*,int*> end =
  *    thrust::merge_by_key(thrust::host,
  *                         A_keys, A_keys + 6,
  *                         B_keys, B_keys + 7,
@@ -609,7 +610,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Compare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -688,7 +689,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
  *  int keys_result[13];
  *  int vals_result[13];
  *
- *  thrust::pair<int*,int*> end = thrust::merge_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals, B_vals,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::merge_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals, B_vals,
  * keys_result, vals_result, _THRUST_STD::greater<int>());
  *
  *  // keys_result = {13, 11, 9, 8, 7, 5, 5, 3, 3, 2, 1, 1, 1}
@@ -706,7 +707,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/mismatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/mismatch.h
index d2043bf4c9ba..55cb28cdff7a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/mismatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/mismatch.h
@@ -30,7 +30,8 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -80,7 +81,7 @@ THRUST_NAMESPACE_BEGIN
  *  vec1[3] = 7;  vec2[3] = 7;
  *
  *  using Iterator = thrust::device_vector<int>::iterator;
- *  thrust::pair<Iterator,Iterator> result;
+ *  _THRUST_STD::pair<Iterator,Iterator> result;
  *
  *  result = thrust::mismatch(thrust::device, vec1.begin(), vec1.end(), vec2.begin());
  *
@@ -92,7 +93,7 @@ THRUST_NAMESPACE_BEGIN
  *  \see find_if
  */
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2>
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2>
 mismatch(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
          InputIterator1 first1,
          InputIterator1 last1,
@@ -131,7 +132,7 @@ mismatch(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  vec1[3] = 7;  vec2[3] = 7;
  *
  *  using Iterator = thrust::device_vector<int>::iterator;
- *  thrust::pair<Iterator,Iterator> result;
+ *  _THRUST_STD::pair<Iterator,Iterator> result;
  *
  *  result = thrust::mismatch(vec1.begin(), vec1.end(), vec2.begin());
  *
@@ -143,7 +144,7 @@ mismatch(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \see find_if
  */
 template <typename InputIterator1, typename InputIterator2>
-thrust::pair<InputIterator1, InputIterator2>
+_THRUST_STD::pair<InputIterator1, InputIterator2>
 mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
 
 /*! \p mismatch finds the first position where the two ranges <tt>[first1, last1)</tt>
@@ -185,7 +186,7 @@ mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
  *  vec1[3] = 7;  vec2[3] = 7;
  *
  *  using Iterator = thrust::device_vector<int>::iterator;
- *  thrust::pair<Iterator,Iterator> result;
+ *  _THRUST_STD::pair<Iterator,Iterator> result;
  *
  *  result = thrust::mismatch(thrust::device, vec1.begin(), vec1.end(), vec2.begin(), _THRUST_STD::equal_to<int>());
  *
@@ -197,7 +198,7 @@ mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
  *  \see find_if
  */
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 first1,
   InputIterator1 last1,
@@ -238,7 +239,7 @@ THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
  *  vec1[3] = 7;  vec2[3] = 7;
  *
  *  using Iterator = thrust::device_vector<int>::iterator;
- *  thrust::pair<Iterator,Iterator> result;
+ *  _THRUST_STD::pair<Iterator,Iterator> result;
  *
  *  result = thrust::mismatch(vec1.begin(), vec1.end(), vec2.begin(), _THRUST_STD::equal_to<int>());
  *
@@ -250,7 +251,7 @@ THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
  *  \see find_if
  */
 template <typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-thrust::pair<InputIterator1, InputIterator2>
+_THRUST_STD::pair<InputIterator1, InputIterator2>
 mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryPredicate pred);
 
 /*! \} // end searching
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/partition.h
index 8d25651aeb0e..19552446b404 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/partition.h
@@ -30,7 +30,8 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -361,7 +362,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -433,7 +434,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy
  *  \see \p partition
  */
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   InputIterator first, InputIterator last, OutputIterator1 out_true, OutputIterator2 out_false, Predicate pred);
 
 /*! \p partition_copy differs from \p partition only in that the reordered
@@ -508,7 +509,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
@@ -582,7 +583,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   InputIterator1 first,
   InputIterator1 last,
   InputIterator2 stencil,
@@ -920,7 +921,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -994,7 +995,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
  *  \see \p stable_partition
  */
 template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   InputIterator first, InputIterator last, OutputIterator1 out_true, OutputIterator2 out_false, Predicate pred);
 
 /*! \p stable_partition_copy differs from \p stable_partition only in that the reordered
@@ -1071,7 +1072,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
@@ -1147,7 +1148,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   InputIterator1 first,
   InputIterator1 last,
   InputIterator2 stencil,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h
index fe6f3bc42be0..a4b93e51975f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h
@@ -33,7 +33,6 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/random/uniform_real_distribution.h>
 
 #include _THRUST_STD_INCLUDE(cmath)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/normal_distribution.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/normal_distribution.h
index 2176a0999c0e..6f7d110a4b4d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/normal_distribution.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/normal_distribution.h
@@ -29,10 +29,11 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/random/detail/normal_distribution_base.h>
 #include <thrust/random/detail/random_core_access.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 #include <iostream>
 
 THRUST_NAMESPACE_BEGIN
@@ -100,7 +101,7 @@ class normal_distribution : public detail::normal_distribution_base<RealType>::t
   /*! \typedef param_type
    *  \brief The type of the object encapsulating this \p normal_distribution's parameters.
    */
-  using param_type = thrust::pair<RealType, RealType>;
+  using param_type = _THRUST_STD::pair<RealType, RealType>;
 
   // constructors and reset functions
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_int_distribution.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_int_distribution.h
index 171cd478d42e..f176603f4425 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_int_distribution.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_int_distribution.h
@@ -29,9 +29,9 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/random/detail/random_core_access.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 #include <iostream>
@@ -105,7 +105,7 @@ class uniform_int_distribution
   /*! \typedef param_type
    *  \brief The type of the object encapsulating this \p uniform_int_distribution's parameters.
    */
-  using param_type = thrust::pair<IntType, IntType>;
+  using param_type = _THRUST_STD::pair<IntType, IntType>;
 
   // constructors and reset functions
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_real_distribution.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_real_distribution.h
index 3622a9f239f7..d2ecd4e74b4c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_real_distribution.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/uniform_real_distribution.h
@@ -29,9 +29,10 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/random/detail/random_core_access.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 #include <iostream>
 
 THRUST_NAMESPACE_BEGIN
@@ -102,7 +103,7 @@ class uniform_real_distribution
   /*! \typedef param_type
    *  \brief The type of the object encapsulating this \p uniform_real_distribution's parameters.
    */
-  using param_type = thrust::pair<RealType, RealType>;
+  using param_type = _THRUST_STD::pair<RealType, RealType>;
 
   // constructors and reset functions
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/reduce.h
index c52541933224..bb386c4688d7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/reduce.h
@@ -31,7 +31,8 @@
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -721,7 +722,7 @@ void reduce_into(InputIterator first, InputIterator last, OutputIterator output,
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  new_end = thrust::reduce_by_key(thrust::host, A, A + N, B, C, D);
  *
  *  // The first four keys in C are now {1, 3, 2, 1} and new_end.first - C is 4.
@@ -738,7 +739,7 @@ template <typename DerivedPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -785,7 +786,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  new_end = thrust::reduce_by_key(A, A + N, B, C, D);
  *
  *  // The first four keys in C are now {1, 3, 2, 1} and new_end.first - C is 4.
@@ -798,7 +799,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  *  \see unique_by_key_copy
  */
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
@@ -852,7 +853,7 @@ thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  new_end = thrust::reduce_by_key(thrust::host, A, A + N, B, C, D, binary_pred);
  *
@@ -871,7 +872,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -921,7 +922,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  new_end = thrust::reduce_by_key(A, A + N, B, C, D, binary_pred);
  *
@@ -939,7 +940,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
@@ -999,7 +1000,7 @@ thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  _THRUST_STD::plus<int> binary_op;
  *  new_end = thrust::reduce_by_key(thrust::host, A, A + N, B, C, D, binary_pred, binary_op);
@@ -1020,7 +1021,7 @@ template <typename DerivedPolicy,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -1076,7 +1077,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  _THRUST_STD::plus<int> binary_op;
  *  new_end = thrust::reduce_by_key(A, A + N, B, C, D, binary_pred, binary_op);
@@ -1096,7 +1097,7 @@ template <typename InputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/set_operations.h b/projects/hipccl/hipccl3/rocthrust/thrust/set_operations.h
index 07be193e0552..b0c3ff2f1f18 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/set_operations.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/set_operations.h
@@ -30,7 +30,8 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -1372,8 +1373,8 @@ OutputIterator set_union(
  *  int keys_result[3];
  *  int vals_result[3];
  *
- *  thrust::pair<int*,int*> end = thrust::set_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys + 5,
- * A_vals, B_vals, keys_result, vals_result);
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys +
+ * 5, A_vals, B_vals, keys_result, vals_result);
  *  // keys_result is now {0, 4, 6}
  *  // vals_result is now {0, 0, 0}
  *  \endcode
@@ -1391,7 +1392,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -1474,8 +1475,8 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference
  *  int keys_result[3];
  *  int vals_result[3];
  *
- *  thrust::pair<int*,int*> end = thrust::set_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5, A_vals, B_vals,
- * keys_result, vals_result);
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5, A_vals,
+ * B_vals, keys_result, vals_result);
  *  // keys_result is now {0, 4, 6}
  *  // vals_result is now {0, 0, 0}
  *  \endcode
@@ -1492,7 +1493,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -1584,8 +1585,8 @@ thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
  *  int keys_result[3];
  *  int vals_result[3];
  *
- *  thrust::pair<int*,int*> end = thrust::set_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys + 5,
- * A_vals, B_vals, keys_result, vals_result, _THRUST_STD::greater<int>());
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys +
+ * 5, A_vals, B_vals, keys_result, vals_result, _THRUST_STD::greater<int>());
  *  // keys_result is now {0, 4, 6}
  *  // vals_result is now {0, 0, 0}
  *  \endcode
@@ -1604,7 +1605,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -1692,8 +1693,8 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference
  *  int keys_result[3];
  *  int vals_result[3];
  *
- *  thrust::pair<int*,int*> end = thrust::set_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5, A_vals, B_vals,
- * keys_result, vals_result, _THRUST_STD::greater<int>());
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5, A_vals,
+ * B_vals, keys_result, vals_result, _THRUST_STD::greater<int>());
  *  // keys_result is now {0, 4, 6}
  *  // vals_result is now {0, 0, 0}
  *  \endcode
@@ -1711,7 +1712,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -1800,8 +1801,8 @@ thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
  *  int keys_result[7];
  *  int vals_result[7];
  *
- *  thrust::pair<int*,int*> end = thrust::set_intersection_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys + 7,
- * A_vals, keys_result, vals_result);
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_intersection_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys
+ * + 7, A_vals, keys_result, vals_result);
  *
  *  // keys_result is now {1, 3, 5}
  *  // vals_result is now {0, 0, 0}
@@ -1819,7 +1820,7 @@ template <typename DerivedPolicy,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -1901,7 +1902,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersecti
  *  int keys_result[7];
  *  int vals_result[7];
  *
- *  thrust::pair<int*,int*> end = thrust::set_intersection_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_intersection_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals,
  * keys_result, vals_result);
  *
  *  // keys_result is now {1, 3, 5}
@@ -1919,7 +1920,7 @@ template <typename InputIterator1,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -2010,8 +2011,8 @@ thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
  *  int keys_result[7];
  *  int vals_result[7];
  *
- *  thrust::pair<int*,int*> end = thrust::set_intersection_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys + 7,
- * A_vals, keys_result, vals_result, _THRUST_STD::greater<int>());
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_intersection_by_key(thrust::host, A_keys, A_keys + 6, B_keys, B_keys
+ * + 7, A_vals, keys_result, vals_result, _THRUST_STD::greater<int>());
  *
  *  // keys_result is now {5, 3, 1}
  *  // vals_result is now {0, 0, 0}
@@ -2030,7 +2031,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -2117,7 +2118,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersecti
  *  int keys_result[7];
  *  int vals_result[7];
  *
- *  thrust::pair<int*,int*> end = thrust::set_intersection_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_intersection_by_key(A_keys, A_keys + 6, B_keys, B_keys + 7, A_vals,
  * keys_result, vals_result, _THRUST_STD::greater<int>());
  *
  *  // keys_result is now {5, 3, 1}
@@ -2136,7 +2137,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -2227,7 +2228,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
  *  int keys_result[6];
  *  int vals_result[6];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
  * B_keys + 5, A_vals, B_vals, keys_result, vals_result);
  *  // keys_result is now {0, 4, 5, 6, 7, 8}
  *  // vals_result is now {0, 0, 1, 0, 0, 1}
@@ -2246,7 +2247,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -2332,7 +2333,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_
  *  int keys_result[6];
  *  int vals_result[6];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
  * A_vals, B_vals, keys_result, vals_result);
  *  // keys_result is now {0, 4, 5, 6, 7, 8}
  *  // vals_result is now {0, 0, 1, 0, 0, 1}
@@ -2350,7 +2351,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -2445,7 +2446,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
  *  int keys_result[6];
  *  int vals_result[6];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
  * B_keys + 5, A_vals, B_vals, keys_result, vals_result);
  *  // keys_result is now {8, 7, 6, 5, 4, 0}
  *  // vals_result is now {1, 0, 0, 1, 0, 0}
@@ -2465,7 +2466,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -2556,7 +2557,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_
  *  int keys_result[6];
  *  int vals_result[6];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
  * A_vals, B_vals, keys_result, vals_result);
  *  // keys_result is now {8, 7, 6, 5, 4, 0}
  *  // vals_result is now {1, 0, 0, 1, 0, 0}
@@ -2575,7 +2576,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -2665,7 +2666,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
  *  int keys_result[11];
  *  int vals_result[11];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
  * B_keys + 5, A_vals, B_vals, keys_result, vals_result);
  *  // keys_result is now {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12}
  *  // vals_result is now {0, 1, 0, 1, 0, 1, 0, 1, 0, 1,  0,  0}
@@ -2684,7 +2685,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -2768,7 +2769,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_k
  *  int keys_result[11];
  *  int vals_result[11];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
  * A_vals, B_vals, keys_result, vals_result);
  *  // keys_result is now {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12}
  *  // vals_result is now {0, 1, 0, 1, 0, 1, 0, 1, 0, 1,  0,  0}
@@ -2786,7 +2787,7 @@ template <typename InputIterator1,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
@@ -2879,7 +2880,7 @@ thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
  *  int keys_result[11];
  *  int vals_result[11];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(thrust::host, A_keys, A_keys + 6, B_keys,
  * B_keys + 5, A_vals, B_vals, keys_result, vals_result, _THRUST_STD::greater<int>());
  *  // keys_result is now {12, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}
  *  // vals_result is now { 0,  1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}
@@ -2899,7 +2900,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -2988,7 +2989,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_k
  *  int keys_result[11];
  *  int vals_result[11];
  *
- *  thrust::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
+ *  _THRUST_STD::pair<int*,int*> end = thrust::set_symmetric_difference_by_key(A_keys, A_keys + 6, B_keys, B_keys + 5,
  * A_vals, B_vals, keys_result, vals_result, _THRUST_STD::greater<int>());
  *  // keys_result is now {12, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}
  *  // vals_result is now { 0,  1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}
@@ -3007,7 +3008,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakCompare>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
   InputIterator2 keys_first2,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.h
index 9cf1b169d564..56134fe33fd0 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.h
@@ -140,14 +140,14 @@ THRUST_HOST_DEVICE OutputIterator binary_search(
   StrictWeakOrdering comp);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   thrust::execution_policy<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
   const LessThanComparable& value);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   thrust::execution_policy<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl
index 6857b31f0c90..a9510be8f325 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl
@@ -345,7 +345,7 @@ THRUST_HOST_DEVICE OutputIterator binary_search(
 }
 
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   thrust::execution_policy<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -355,7 +355,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
 }
 
 template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> equal_range(
   thrust::execution_policy<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -364,7 +364,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
 {
   ForwardIterator lb = thrust::lower_bound(exec, first, last, value, comp);
   ForwardIterator ub = thrust::upper_bound(exec, first, last, value, comp);
-  return thrust::make_pair(lb, ub);
+  return _THRUST_STD::make_pair(lb, ub);
 }
 } // namespace system::detail::generic
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.h
index 21caef0769b3..de2b8b2c9975 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.h
@@ -29,9 +29,10 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
@@ -52,11 +53,11 @@ THRUST_HOST_DEVICE ForwardIterator min_element(
   thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp);
 
 template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator>
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator>
 minmax_element(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(
   thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp);
 } // namespace system::detail::generic
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.inl
index aa50e4ae2128..136f2cb36c8b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/extrema.inl
@@ -31,10 +31,11 @@
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/pair.h>
 #include <thrust/reduce.h>
 #include <thrust/transform_reduce.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
@@ -208,7 +209,7 @@ THRUST_HOST_DEVICE ForwardIterator max_element(
 } // end max_element()
 
 template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator>
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator>
 minmax_element(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
 {
   using value_type = thrust::detail::it_value_t<ForwardIterator>;
@@ -217,12 +218,12 @@ minmax_element(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator fi
 } // end minmax_element()
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(
   thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   if (first == last)
   {
-    return thrust::make_pair(last, last);
+    return _THRUST_STD::make_pair(last, last);
   }
 
   using InputType = thrust::detail::it_value_t<ForwardIterator>;
@@ -238,7 +239,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
         thrust::tuple<InputType, IndexType>(thrust::detail::get_iterator_value(derived_cast(exec), first), 0)),
       detail::minmax_element_reduction<InputType, IndexType, BinaryPredicate>(comp));
 
-  return thrust::make_pair(first + thrust::get<1>(thrust::get<0>(result)),
+  return _THRUST_STD::make_pair(first + thrust::get<1>(thrust::get<0>(result)),
                            first + thrust::get<1>(thrust::get<1>(result)));
 } // end minmax_element()
 } // namespace system::detail::generic
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/memory.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/memory.h
index d640c3ff8881..81ed5a1b3016 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/memory.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/memory.h
@@ -33,7 +33,6 @@
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/pointer.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.h
index 68ea635655c6..99f0e7c240f4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.h
@@ -62,7 +62,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Compare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -81,7 +81,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.inl
index ef838b7fe079..29d07042b2bd 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/merge.inl
@@ -74,7 +74,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Compare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -108,7 +108,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
     thrust::merge(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
       .get_iterator_tuple();
 
-  return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
+  return _THRUST_STD::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end merge_by_key()
 
 template <typename DerivedPolicy,
@@ -118,7 +118,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.h
index 57c28f169110..493c0619b6f0 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.h
@@ -31,11 +31,11 @@ THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(
   thrust::execution_policy<DerivedPolicy>& exec, InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
 
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 first1,
   InputIterator1 last1,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.inl
index 76e408785836..e238b0ca6e8c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/mismatch.inl
@@ -34,7 +34,7 @@ THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(
   thrust::execution_policy<DerivedPolicy>& exec, InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
 {
   using namespace thrust::placeholders;
@@ -43,7 +43,7 @@ THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
 } // end mismatch()
 
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
+THRUST_HOST_DEVICE _THRUST_STD::pair<InputIterator1, InputIterator2> mismatch(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 first1,
   InputIterator1 last1,
@@ -60,7 +60,7 @@ THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
   ZipIterator result =
     thrust::find_if_not(exec, zipped_first, zipped_last, thrust::detail::tuple_binary_predicate<BinaryPredicate>{pred});
 
-  return thrust::make_pair(thrust::get<0>(result.get_iterator_tuple()), thrust::get<1>(result.get_iterator_tuple()));
+  return _THRUST_STD::make_pair(thrust::get<0>(result.get_iterator_tuple()), thrust::get<1>(result.get_iterator_tuple()));
 } // end mismatch()
 } // namespace system::detail::generic
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.h
index 3c6be85cf9ec..1aca4ca045c7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.h
@@ -51,7 +51,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -65,7 +65,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
@@ -91,7 +91,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -105,7 +105,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl
index 748028d4c792..51dd971614ec 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl
@@ -31,12 +31,13 @@
 #include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/transform_iterator.h>
-#include <thrust/pair.h>
 #include <thrust/partition.h>
 #include <thrust/remove.h>
 #include <thrust/sort.h>
 #include <thrust/system/detail/generic/partition.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
@@ -89,7 +90,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -105,7 +106,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
   // remove_copy_if the false partition to out_false
   OutputIterator2 end_of_false_partition = thrust::remove_copy_if(exec, first, last, out_false, pred);
 
-  return thrust::make_pair(end_of_true_partition, end_of_false_partition);
+  return _THRUST_STD::make_pair(end_of_true_partition, end_of_false_partition);
 } // end stable_partition_copy()
 
 template <typename DerivedPolicy,
@@ -114,7 +115,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
@@ -131,7 +132,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
   // remove_copy_if the false partition to out_false
   OutputIterator2 end_of_false_partition = thrust::remove_copy_if(exec, first, last, stencil, out_false, pred);
 
-  return thrust::make_pair(end_of_true_partition, end_of_false_partition);
+  return _THRUST_STD::make_pair(end_of_true_partition, end_of_false_partition);
 } // end stable_partition_copy()
 
 template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
@@ -157,7 +158,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -174,7 +175,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> partition_copy(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.h
index 85f5898e3320..ed121f7cc13a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.h
@@ -36,7 +36,7 @@ template <typename DerivedPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -50,7 +50,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -66,7 +66,7 @@ template <typename DerivedPolicy,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
index 5686e332a345..cbfcb5f5a7d2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
@@ -74,7 +74,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -93,7 +93,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
 
   if (keys_first == keys_last)
   {
-    return thrust::make_pair(keys_output, values_output);
+    return _THRUST_STD::make_pair(keys_output, values_output);
   }
 
   // input size
@@ -134,7 +134,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::scatter_if(
     exec, scanned_values.begin(), scanned_values.end(), scanned_tail_flags.begin(), tail_flags.begin(), values_output);
 
-  return thrust::make_pair(keys_output + N, values_output + N);
+  return _THRUST_STD::make_pair(keys_output + N, values_output + N);
 } // end reduce_by_key()
 
 template <typename ExecutionPolicy,
@@ -142,7 +142,7 @@ template <typename ExecutionPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -163,7 +163,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.h
index 1458edba8ec5..11791624fe73 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.h
@@ -25,7 +25,7 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -48,7 +48,7 @@ THRUST_HOST_DEVICE RandomAccessIterator
 upper_bound(RandomAccessIterator first, RandomAccessIterator last, const T& val, BinaryPredicate comp);
 
 template <typename RandomAccessIterator, typename T, typename BinaryPredicate>
-THRUST_HOST_DEVICE pair<RandomAccessIterator, RandomAccessIterator>
+THRUST_HOST_DEVICE _THRUST_STD::pair<RandomAccessIterator, RandomAccessIterator>
 equal_range(RandomAccessIterator first, RandomAccessIterator last, const T& val, BinaryPredicate comp);
 
 template <typename RandomAccessIterator, typename T, typename Compare>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl
index 48844ec80c9a..a9c9be17c2c4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl
@@ -27,7 +27,8 @@
 #endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -100,11 +101,11 @@ upper_bound(RandomAccessIterator first, RandomAccessIterator last, const T& val,
 }
 
 template <typename RandomAccessIterator, typename T, typename BinaryPredicate>
-THRUST_HOST_DEVICE pair<RandomAccessIterator, RandomAccessIterator>
+THRUST_HOST_DEVICE _THRUST_STD::pair<RandomAccessIterator, RandomAccessIterator>
 equal_range(RandomAccessIterator first, RandomAccessIterator last, const T& val, BinaryPredicate comp)
 {
   RandomAccessIterator lb = thrust::system::detail::generic::scalar::lower_bound(first, last, val, comp);
-  return thrust::make_pair(lb, thrust::system::detail::generic::scalar::upper_bound(lb, last, val, comp));
+  return _THRUST_STD::make_pair(lb, thrust::system::detail::generic::scalar::upper_bound(lb, last, val, comp));
 }
 
 template <typename RandomAccessIterator, typename T, typename Compare>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.h
index ea73bdca58d7..6db4215263c5 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.h
@@ -25,9 +25,10 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
@@ -62,7 +63,7 @@ template <typename ExecutionPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -81,7 +82,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -123,7 +124,7 @@ template <typename ExecutionPolicy,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   thrust::execution_policy<ExecutionPolicy>& system,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -140,7 +141,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   thrust::execution_policy<ExecutionPolicy>& system,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -182,7 +183,7 @@ template <typename ExecutionPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   thrust::execution_policy<ExecutionPolicy>& system,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -201,7 +202,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   thrust::execution_policy<ExecutionPolicy>& system,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -244,7 +245,7 @@ template <typename ExecutionPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   thrust::execution_policy<ExecutionPolicy>& system,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -263,7 +264,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   thrust::execution_policy<ExecutionPolicy>& system,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.inl
index 0c483e5a8213..d7093cebbb4e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/set_operations.inl
@@ -56,7 +56,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -89,7 +89,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -123,7 +123,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference
     thrust::set_difference(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
       .get_iterator_tuple();
 
-  return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
+  return _THRUST_STD::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_difference_by_key()
 
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
@@ -145,7 +145,7 @@ template <typename DerivedPolicy,
           typename InputIterator3,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -175,7 +175,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -215,7 +215,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersecti
     thrust::set_intersection(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
       .get_iterator_tuple();
 
-  return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
+  return _THRUST_STD::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_intersection_by_key()
 
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
@@ -238,7 +238,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -271,7 +271,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -306,7 +306,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_
       exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
       .get_iterator_tuple();
 
-  return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
+  return _THRUST_STD::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_symmetric_difference_by_key()
 
 template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
@@ -329,7 +329,7 @@ template <typename DerivedPolicy,
           typename InputIterator4,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -362,7 +362,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   thrust::execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -396,7 +396,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_k
     thrust::set_union(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
       .get_iterator_tuple();
 
-  return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
+  return _THRUST_STD::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_union_by_key()
 
 template <typename DerivedPolicy,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.h
index f8a54429b499..ae562651adf8 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.h
@@ -26,17 +26,18 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/pointer.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
 template <typename T, typename DerivedPolicy>
 THRUST_HOST_DEVICE
-  thrust::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
-  get_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec,
-                       typename thrust::pointer<T, DerivedPolicy>::difference_type n);
+_THRUST_STD::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
+get_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec,
+                     typename thrust::pointer<T, DerivedPolicy>::difference_type n);
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename Pointer>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.inl
index f7c899b07065..dcc4d8c4d53f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/temporary_buffer.inl
@@ -27,15 +27,16 @@
 #endif // no system header
 #include <thrust/detail/malloc_and_free.h>
 #include <thrust/detail/pointer.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/temporary_buffer.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
 template <typename T, typename DerivedPolicy>
 THRUST_HOST_DEVICE
-thrust::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
+_THRUST_STD::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
 get_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec,
                      typename thrust::pointer<T, DerivedPolicy>::difference_type n)
 {
@@ -47,7 +48,7 @@ get_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec,
     n = 0;
   } // end if
 
-  return thrust::make_pair(ptr, n);
+  return _THRUST_STD::make_pair(ptr, n);
 } // end get_temporary_buffer()
 
 THRUST_EXEC_CHECK_DISABLE
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.h
index 717cd19273c1..8aa07ae7308f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.h
@@ -25,21 +25,22 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
 template <typename ExecutionPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
   ForwardIterator2 values_first);
 
 template <typename ExecutionPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -51,7 +52,7 @@ template <typename ExecutionPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -65,7 +66,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.inl
index b754c96b6377..2795026903fa 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique_by_key.inl
@@ -39,7 +39,7 @@ THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
 template <typename ExecutionPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -50,7 +50,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_ke
 } // end unique_by_key()
 
 template <typename ExecutionPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   thrust::execution_policy<ExecutionPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -73,7 +73,7 @@ template <typename ExecutionPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -92,7 +92,7 @@ template <typename ExecutionPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   thrust::execution_policy<ExecutionPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -118,7 +118,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_
 
   difference_type output_size = result - thrust::make_zip_iterator(keys_output, values_output);
 
-  return thrust::make_pair(keys_output + output_size, values_output + output_size);
+  return _THRUST_STD::make_pair(keys_output + output_size, values_output + output_size);
 } // end unique_by_key_copy()
 } // namespace system::detail::generic
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/extrema.h
index e2a98e0fc528..732887263338 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/extrema.h
@@ -30,9 +30,10 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/function.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
 {
@@ -80,7 +81,7 @@ THRUST_HOST_DEVICE ForwardIterator max_element(
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator, ForwardIterator> minmax_element(
   sequential::execution_policy<DerivedPolicy>&, ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   // wrap comp
@@ -102,7 +103,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
     }
   }
 
-  return thrust::make_pair(imin, imax);
+  return _THRUST_STD::make_pair(imin, imax);
 }
 } // namespace system::detail::sequential
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/merge.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/merge.h
index 40a7276e954d..f47704293954 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/merge.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/merge.h
@@ -83,7 +83,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   sequential::execution_policy<DerivedPolicy>&,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -141,7 +141,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
     ++values_result;
   }
 
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 } // namespace system::detail::sequential
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/partition.h
index 634d8d14d146..624c7cafabb2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/partition.h
@@ -31,9 +31,10 @@
 #endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/detail/temporary_array.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <utility>
 #endif
@@ -234,7 +235,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   sequential::execution_policy<DerivedPolicy>&,
   InputIterator first,
   InputIterator last,
@@ -259,7 +260,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
     } // end else
   }
 
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 
 THRUST_EXEC_CHECK_DISABLE
@@ -269,7 +270,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   sequential::execution_policy<DerivedPolicy>&,
   InputIterator1 first,
   InputIterator1 last,
@@ -295,7 +296,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
     } // end else
   }
 
-  return thrust::make_pair(out_true, out_false);
+  return _THRUST_STD::make_pair(out_true, out_false);
 }
 } // namespace system::detail::sequential
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/reduce_by_key.h
index cd86dafaae31..12d8377e4b48 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/reduce_by_key.h
@@ -26,9 +26,10 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
 {
@@ -40,7 +41,7 @@ template <typename DerivedPolicy,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   sequential::execution_policy<DerivedPolicy>&,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -90,7 +91,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
     ++values_output;
   }
 
-  return thrust::make_pair(keys_output, values_output);
+  return _THRUST_STD::make_pair(keys_output, values_output);
 }
 } // namespace system::detail::sequential
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique.h
index 7bdcd2ebf1c3..d1c9802e2283 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique.h
@@ -30,7 +30,6 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique_by_key.h
index f68d3cb112de..07bc1b2fb0bb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/unique_by_key.h
@@ -30,9 +30,10 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
 {
@@ -43,7 +44,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   sequential::execution_policy<DerivedPolicy>&,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -85,11 +86,11 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_
     ++values_output;
   }
 
-  return thrust::make_pair(keys_output, values_output);
+  return _THRUST_STD::make_pair(keys_output, values_output);
 } // end unique_by_key_copy()
 
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   sequential::execution_policy<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h
index 42cab0f0622f..cc2b481fb826 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h
@@ -308,10 +308,10 @@ ItemsIt THRUST_HOST_DEVICE max_element(execution_policy<Derived>& policy, ItemsI
 
 THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class ItemsIt, class BinaryPred>
-pair<ItemsIt, ItemsIt> THRUST_HOST_DEVICE
+_THRUST_STD::pair<ItemsIt, ItemsIt> THRUST_HOST_DEVICE
 minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, BinaryPred binary_pred)
 {
-  auto ret = thrust::make_pair(last, last);
+  auto ret = _THRUST_STD::make_pair(last, last);
 
   using InputType = thrust::detail::it_value_t<ItemsIt>;
   using IndexType = thrust::detail::it_difference_t<ItemsIt>;
@@ -339,7 +339,7 @@ minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, B
   zip_iterator begin    = make_zip_iterator(iter_tuple);
   two_pairs_type result = __extrema::extrema(
     policy, transform_t(begin, duplicate_t()), num_items, arg_minmax_t(binary_pred), (two_pairs_type*) (nullptr));
-  ret = thrust::make_pair(first + get<1>(get<0>(result)), first + get<1>(get<1>(result)));
+  ret = _THRUST_STD::make_pair(first + get<1>(get<0>(result)), first + get<1>(get<1>(result)));
 #  else // defined(__HIP_DEVICE_COMPILE__)
   ret = thrust::minmax_element(cvt_to_seq(derived_cast(policy)), first, last, binary_pred);
 #  endif // !defined(__HIP_DEVICE_COMPILE__)
@@ -347,7 +347,8 @@ minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, B
 }
 
 template <class Derived, class ItemsIt>
-pair<ItemsIt, ItemsIt> THRUST_HOST_DEVICE minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
+_THRUST_STD::pair<ItemsIt, ItemsIt> THRUST_HOST_DEVICE
+minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
   using value_type = thrust::detail::it_value_t<ItemsIt>;
   return hip_rocprim::minmax_element(policy, first, last, less<value_type>());
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h
index 0e071ea7f333..0c586d7eeb7d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h
@@ -135,7 +135,7 @@ template <typename Derived,
           typename KeysOutputIt,
           typename ItemsOutputIt,
           typename CompareOp>
-THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ItemsOutputIt> merge(
+THRUST_HIP_RUNTIME_FUNCTION _THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> merge(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_begin,
   KeysIt1 keys1_end,
@@ -159,7 +159,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ItemsOutputIt> merge(
 
   if (input1_size == 0 && input2_size == 0)
   {
-    return thrust::make_pair(keys_out_begin, items_out_begin);
+    return _THRUST_STD::make_pair(keys_out_begin, items_out_begin);
   };
 
   size_t storage_size = 0;
@@ -201,7 +201,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ItemsOutputIt> merge(
   hip_rocprim::throw_on_error(hip_rocprim::synchronize_optional(policy), "merge: failed to synchronize");
 
   size_t count = input1_size + input2_size;
-  return thrust::make_pair(keys_out_begin + count, items_out_begin + count);
+  return _THRUST_STD::make_pair(keys_out_begin + count, items_out_begin + count);
 }
 
 } // namespace __merge
@@ -265,7 +265,7 @@ template <class Derived,
           class KeysOutputIt,
           class ItemsOutputIt,
           class CompareOp = ::cuda::std::less<>>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE merge_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE merge_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_begin,
   KeysIt1 keys1_end,
@@ -280,7 +280,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE merge_by_key(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<KeysOutputIt, ItemsOutputIt> par(
+    THRUST_HOST static _THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> par(
       execution_policy<Derived>& policy,
       KeysIt1 keys1_begin,
       KeysIt1 keys1_end,
@@ -305,7 +305,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE merge_by_key(
         compare_op);
     }
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<KeysOutputIt, ItemsOutputIt> seq(
+    THRUST_DEVICE static _THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> seq(
       execution_policy<Derived>& policy,
       KeysIt1 keys1_begin,
       KeysIt1 keys1_end,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
index 5311541c1902..a499108d9ec0 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
@@ -50,11 +50,11 @@ THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
 template <class Derived, class InputIt1, class InputIt2, class BinaryPred>
-pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
+_THRUST_STD::pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2, BinaryPred binary_pred);
 
 template <class Derived, class InputIt1, class InputIt2>
-pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
+_THRUST_STD::pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2);
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END
@@ -65,7 +65,7 @@ THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
 template <class Derived, class InputIt1, class InputIt2, class BinaryPred>
-pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
+_THRUST_STD::pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2, BinaryPred binary_pred)
 {
   const auto n            = _THRUST_STD::distance(first1, last1);
@@ -73,11 +73,11 @@ mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, Inp
   const auto last         = thrust::make_zip_iterator(last1, first2 + n);
   const auto mismatch_pos = hip_rocprim::find_if_not(policy, first, last, thrust::make_zip_function(binary_pred));
   const auto dist         = _THRUST_STD::distance(first, mismatch_pos);
-  return thrust::make_pair(first1 + dist, first2 + dist);
+  return _THRUST_STD::make_pair(first1 + dist, first2 + dist);
 }
 
 template <class Derived, class InputIt1, class InputIt2>
-pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
+_THRUST_STD::pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2)
 {
   using InputType1 = thrust::detail::it_value_t<InputIt1>;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
index ad45507f6b04..682de04aa63f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
@@ -65,7 +65,7 @@ namespace detail
 {
 
 template <class Derived, class InputIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition(
+THRUST_HIP_RUNTIME_FUNCTION _THRUST_STD::pair<SelectedOutIt, RejectedOutIt> partition(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -86,7 +86,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition(
 
   if (num_items <= 0)
   {
-    return thrust::make_pair(selected_result, rejected_result);
+    return _THRUST_STD::make_pair(selected_result, rejected_result);
   }
 
   // Determine temporary device storage requirements.
@@ -123,11 +123,11 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition(
 
   thrust::copy_n(policy, d_partition_out, num_items, selected_result);
 
-  return thrust::make_pair(selected_result + num_selected, rejected_result);
+  return _THRUST_STD::make_pair(selected_result + num_selected, rejected_result);
 }
 
 template <class Derived, class InputIt, class StencilIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-pair<SelectedOutIt, RejectedOutIt> THRUST_HIP_RUNTIME_FUNCTION partition(
+_THRUST_STD::pair<SelectedOutIt, RejectedOutIt> THRUST_HIP_RUNTIME_FUNCTION partition(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -150,7 +150,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HIP_RUNTIME_FUNCTION partition(
 
   if (num_items <= 0)
   {
-    return thrust::make_pair(selected_result, rejected_result);
+    return _THRUST_STD::make_pair(selected_result, rejected_result);
   }
 
   // Determine temporary device storage requirements.
@@ -187,11 +187,11 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HIP_RUNTIME_FUNCTION partition(
 
   thrust::copy_n(policy, d_partition_out, num_items, selected_result);
 
-  return thrust::make_pair(selected_result + num_selected, rejected_result);
+  return _THRUST_STD::make_pair(selected_result + num_selected, rejected_result);
 }
 
 template <class Derived, class InputIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
+THRUST_HIP_RUNTIME_FUNCTION _THRUST_STD::pair<SelectedOutIt, RejectedOutIt> partition_copy(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -210,7 +210,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
 
   if (num_items <= 0)
   {
-    return thrust::make_pair(selected_result, rejected_result);
+    return _THRUST_STD::make_pair(selected_result, rejected_result);
   }
 
   hip_rocprim::throw_on_error(
@@ -260,11 +260,11 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
 
   size_type num_selected = get_value(policy, d_num_selected_out);
 
-  return thrust::make_pair(selected_result + num_selected, rejected_result + num_items - num_selected);
+  return _THRUST_STD::make_pair(selected_result + num_selected, rejected_result + num_items - num_selected);
 }
 
 template <class Derived, class InputIt, class StencilIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
+THRUST_HIP_RUNTIME_FUNCTION _THRUST_STD::pair<SelectedOutIt, RejectedOutIt> partition_copy(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -285,7 +285,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
 
   if (num_items <= 0)
   {
-    return thrust::make_pair(selected_result, rejected_result);
+    return _THRUST_STD::make_pair(selected_result, rejected_result);
   }
 
   hip_rocprim::throw_on_error(
@@ -335,7 +335,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
 
   size_type num_selected = get_value(policy, d_num_selected_out);
 
-  return thrust::make_pair(selected_result + num_selected, rejected_result + num_items - num_selected);
+  return _THRUST_STD::make_pair(selected_result + num_selected, rejected_result + num_items - num_selected);
 }
 
 template <typename Derived, typename InputIt, typename Predicate>
@@ -356,7 +356,7 @@ inplace_partition(execution_policy<Derived>& policy, InputIt first, InputIt last
   hip_rocprim::uninitialized_copy(policy, first, last, tmp.begin());
 
   // Partition input from temporary storage to the user-provided range [`first`, `last`)
-  pair<InputIt, InputIt> result =
+  _THRUST_STD::pair<InputIt, InputIt> result =
     partition(policy, tmp.data().get(), tmp.data().get() + num_items, first, first, predicate);
 
   std::size_t num_selected = result.first - first;
@@ -382,7 +382,7 @@ THRUST_HIP_RUNTIME_FUNCTION InputIt inplace_partition(
   hip_rocprim::uninitialized_copy(policy, first, last, tmp.begin());
 
   // Partition input from temporary storage to the user-provided range [`first`, `last`)
-  pair<InputIt, InputIt> result =
+  _THRUST_STD::pair<InputIt, InputIt> result =
     partition(policy, tmp.data().get(), tmp.data().get() + num_items, stencil, first, first, predicate);
 
   std::size_t num_selected = result.first - first;
@@ -398,7 +398,7 @@ THRUST_HIP_RUNTIME_FUNCTION InputIt inplace_partition(
 
 THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class InputIt, class StencilIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
+_THRUST_STD::pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -410,7 +410,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_HOST static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     par(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
@@ -423,7 +423,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
     }
 
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_DEVICE static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
@@ -446,7 +446,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
 
 THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class InputIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
+_THRUST_STD::pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -457,7 +457,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_HOST static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     par(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
@@ -469,7 +469,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
     }
 
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_DEVICE static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
@@ -491,7 +491,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
 
 THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class InputIt, class StencilIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
+_THRUST_STD::pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -503,7 +503,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_HOST static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     par(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
@@ -515,7 +515,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
       return detail::partition_copy(policy, first, last, stencil, selected_result, rejected_result, predicate);
     }
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_DEVICE static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
@@ -538,7 +538,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
 
 THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class InputIt, class SelectedOutIt, class RejectedOutIt, class Predicate>
-pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
+_THRUST_STD::pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -549,7 +549,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_HOST static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     par(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
@@ -561,7 +561,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
     }
 
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
+    THRUST_DEVICE static _THRUST_STD::pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
         InputIt last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
index 56ea7a91e0fe..e00ca6454b63 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
@@ -72,7 +72,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -170,7 +170,7 @@ template <typename Derived,
           typename ValuesOutputIt,
           typename EqualityOp,
           typename ReductionOp>
-THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
+THRUST_HIP_RUNTIME_FUNCTION _THRUST_STD::pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
   execution_policy<Derived>& policy,
   KeysInputIt keys_first,
   KeysInputIt keys_last,
@@ -191,7 +191,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
 
   if (num_items == 0)
   {
-    return thrust::make_pair(keys_output, values_output);
+    return _THRUST_STD::make_pair(keys_output, values_output);
   }
 
   hip_rocprim::throw_on_error(
@@ -248,7 +248,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
 
   const auto num_runs_out = hip_rocprim::get_value(policy, d_num_runs_out);
 
-  return thrust::make_pair(keys_output + num_runs_out, values_output + num_runs_out);
+  return _THRUST_STD::make_pair(keys_output + num_runs_out, values_output + num_runs_out);
 }
 
 } // namespace __reduce_by_key
@@ -265,7 +265,7 @@ template <class Derived,
           class ValOutputIt,
           class BinaryPred,
           class BinaryOp>
-pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
+_THRUST_STD::pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
   execution_policy<Derived>& policy,
   KeyInputIt keys_first,
   KeyInputIt keys_last,
@@ -278,7 +278,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<KeyOutputIt, ValOutputIt>
+    THRUST_HOST static _THRUST_STD::pair<KeyOutputIt, ValOutputIt>
     par(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
         KeyInputIt keys_last,
@@ -293,7 +293,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
     }
 
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<KeyOutputIt, ValOutputIt>
+    THRUST_DEVICE static _THRUST_STD::pair<KeyOutputIt, ValOutputIt>
     seq(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
         KeyInputIt keys_last,
@@ -325,7 +325,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
 }
 
 template <class Derived, class KeyInputIt, class ValInputIt, class KeyOutputIt, class ValOutputIt, class BinaryPred>
-pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
+_THRUST_STD::pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
   execution_policy<Derived>& policy,
   KeyInputIt keys_first,
   KeyInputIt keys_last,
@@ -342,7 +342,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
 }
 
 template <class Derived, class KeyInputIt, class ValInputIt, class KeyOutputIt, class ValOutputIt>
-pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
+_THRUST_STD::pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
   execution_policy<Derived>& policy,
   KeyInputIt keys_first,
   KeyInputIt keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
index baaea64ee2d0..5f34f9d1c161 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
@@ -156,7 +156,7 @@ THRUST_HIP_DEVICE_FUNCTION Size merge_path(It1 a, Size aCount, It2 b, Size bCoun
 }
 
 template <class It1, class It2, class Size, class Size2, class CompareOp>
-THRUST_HIP_DEVICE_FUNCTION pair<Size, Size>
+THRUST_HIP_DEVICE_FUNCTION _THRUST_STD::pair<Size, Size>
 balanced_path(It1 keys1, It2 keys2, Size num_keys1, Size num_keys2, Size diag, Size2 levels, CompareOp compare_op)
 {
   using T = thrust::detail::it_value_t<It1>;
@@ -198,7 +198,7 @@ balanced_path(It1 keys1, It2 keys2, Size num_keys1, Size num_keys2, Size diag, S
 
     index1 = start1 + advance1;
   }
-  return thrust::make_pair(index1, (diag - index1) + star);
+  return _THRUST_STD::make_pair(index1, (diag - index1) + star);
 } // func balanced_path
 
 template <unsigned int BlockSize, unsigned int ItemsPerThread>
@@ -347,7 +347,7 @@ struct SetOpAgent
     ValuesOutputIt values_out,
     CompareOp compare_op,
     SetOp set_op,
-    pair<Size, Size>* partitions,
+    _THRUST_STD::pair<Size, Size>* partitions,
     Size* output_count)
   {
     using block_scan_type = ::rocprim::block_scan<Size, BLOCK_THREADS>;
@@ -377,8 +377,8 @@ struct SetOpAgent
       };
     } storage;
 
-    pair<Size, Size> partition_beg = partitions[tile_idx + 0];
-    pair<Size, Size> partition_end = partitions[tile_idx + 1];
+    _THRUST_STD::pair<Size, Size> partition_beg = partitions[tile_idx + 0];
+    _THRUST_STD::pair<Size, Size> partition_end = partitions[tile_idx + 1];
 
     Size keys1_beg = partition_beg.first;
     Size keys1_end = partition_end.first;
@@ -401,7 +401,7 @@ struct SetOpAgent
 
     int diag_loc = min<int>(ITEMS_PER_THREAD * threadIdx.x, num_keys1 + num_keys2);
 
-    pair<int, int> partition_loc = balanced_path(
+    _THRUST_STD::pair<int, int> partition_loc = balanced_path(
       &storage.keys_shared.get_unsafe_array()[0],
       &storage.keys_shared.get_unsafe_array()[num_keys1],
       num_keys1,
@@ -422,8 +422,8 @@ struct SetOpAgent
 
     ::rocprim::syncthreads();
 
-    pair<int, int> partition1_loc =
-      thrust::make_pair(storage.offset[threadIdx.x] >> 16, storage.offset[threadIdx.x] & 0xFFFF);
+    _THRUST_STD::pair<int, int> partition1_loc =
+      _THRUST_STD::make_pair(storage.offset[threadIdx.x] >> 16, storage.offset[threadIdx.x] & 0xFFFF);
 
     int keys1_end_loc = partition1_loc.first;
     int keys2_end_loc = partition1_loc.second;
@@ -801,7 +801,7 @@ ROCPRIM_KERNEL THRUST_HIP_LAUNCH_BOUNDS_DEFAULT void lookback_set_op_kernel(
   ValuesOutputIt values_output,
   CompareOp compare_op,
   SetOp set_op,
-  pair<Size, Size>* partitions,
+  _THRUST_STD::pair<Size, Size>* partitions,
   Size* output_count,
   LookBackScanState lookback_scan_state,
   rocprim::detail::ordered_block_id<unsigned int> ordered_bid)
@@ -924,7 +924,7 @@ hipError_t THRUST_HIP_RUNTIME_FUNCTION doit_step(
   }
   scan_state_bytes               = ::rocprim::detail::align_size(scan_state_bytes);
   size_t ordered_block_id_bytes  = ::rocprim::detail::align_size(ordered_block_id_type::get_storage_size());
-  size_t partition_storage_bytes = (number_of_blocks + 1) * sizeof(pair<Size, Size>);
+  size_t partition_storage_bytes = (number_of_blocks + 1) * sizeof(_THRUST_STD::pair<Size, Size>);
   if (d_temp_storage == nullptr)
   {
     // temp_storage_size is never zero
@@ -955,7 +955,7 @@ hipError_t THRUST_HIP_RUNTIME_FUNCTION doit_step(
   // Create and initialize ordered_block_id obj
   auto ordered_bid = ordered_block_id_type::create(reinterpret_cast<ordered_block_id_type::id_type*>(ptr));
   ptr += ordered_block_id_bytes;
-  pair<Size, Size>* partitions = reinterpret_cast<pair<Size, Size>*>(ptr);
+  _THRUST_STD::pair<Size, Size>* partitions = reinterpret_cast<_THRUST_STD::pair<Size, Size>*>(ptr);
 
   if (debug_synchronous)
   {
@@ -1024,7 +1024,7 @@ template <bool HAS_VALUES,
           typename ValuesOutputIt,
           typename CompareOp,
           typename SetOp>
-THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> set_operations(
+THRUST_HIP_RUNTIME_FUNCTION _THRUST_STD::pair<KeysOutputIt, ValuesOutputIt> set_operations(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1045,7 +1045,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> set_operations(
 
   if (num_keys1 + num_keys2 == 0)
   {
-    return thrust::make_pair(keys_output, values_output);
+    return _THRUST_STD::make_pair(keys_output, values_output);
   }
 
   size_t temp_storage_bytes = 0;
@@ -1112,7 +1112,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> set_operations(
 
   std::size_t output_count = hip_rocprim::get_value(policy, d_output_count);
 
-  return thrust::make_pair(keys_output + output_count, values_output + output_count);
+  return _THRUST_STD::make_pair(keys_output + output_count, values_output + output_count);
 }
 } // namespace __set_operations
 
@@ -1384,7 +1384,7 @@ template <class Derived,
           class KeysOutputIt,
           class ItemsOutputIt,
           class CompareOp>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1408,7 +1408,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_difference>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
+  auto ret = _THRUST_STD::make_pair(keys_result, items_result);
 #  if !defined(__HIP_DEVICE_COMPILE__)
   ret = __set_operations::set_operations<true>(
     policy,
@@ -1439,7 +1439,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
 }
 
 template <class Derived, class KeysIt1, class KeysIt2, class ItemsIt1, class ItemsIt2, class KeysOutputIt, class ItemsOutputIt>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1475,7 +1475,7 @@ template <class Derived,
           class KeysOutputIt,
           class ItemsOutputIt,
           class CompareOp>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1498,7 +1498,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_intersection>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
+  auto ret = _THRUST_STD::make_pair(keys_result, items_result);
 #  if !defined(__HIP_DEVICE_COMPILE__)
   ret = __set_operations::set_operations<true>(
     policy,
@@ -1528,7 +1528,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
 }
 
 template <class Derived, class KeysIt1, class KeysIt2, class ItemsIt1, class ItemsIt2, class KeysOutputIt, class ItemsOutputIt>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1562,7 +1562,7 @@ template <class Derived,
           class KeysOutputIt,
           class ItemsOutputIt,
           class CompareOp>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1586,7 +1586,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_symmetric_difference>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
+  auto ret = _THRUST_STD::make_pair(keys_result, items_result);
 #  if !defined(__HIP_DEVICE_COMPILE__)
   ret = __set_operations::set_operations<true>(
     policy,
@@ -1617,7 +1617,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by
 }
 
 template <class Derived, class KeysIt1, class KeysIt2, class ItemsIt1, class ItemsIt2, class KeysOutputIt, class ItemsOutputIt>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1653,7 +1653,7 @@ template <class Derived,
           class KeysOutputIt,
           class ItemsOutputIt,
           class CompareOp>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
@@ -1677,7 +1677,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_union>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
+  auto ret = _THRUST_STD::make_pair(keys_result, items_result);
 #  if !defined(__HIP_DEVICE_COMPILE__)
   ret = __set_operations::set_operations<true>(
     policy,
@@ -1708,7 +1708,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
 }
 
 template <class Derived, class KeysIt1, class KeysIt2, class ItemsIt1, class ItemsIt2, class KeysOutputIt, class ItemsOutputIt>
-pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
+_THRUST_STD::pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
   execution_policy<Derived>& policy,
   KeysIt1 keys1_first,
   KeysIt1 keys1_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
index f4ecde7f5d17..fd575dd8da32 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
@@ -43,7 +43,7 @@ namespace hip_rocprim
 // overloads should be selected.
 
 template <typename T>
-THRUST_HOST pair<T*, _THRUST_STD::ptrdiff_t> get_temporary_buffer(par_nosync_t&, _THRUST_STD::ptrdiff_t n)
+THRUST_HOST _THRUST_STD::pair<T*, _THRUST_STD::ptrdiff_t> get_temporary_buffer(par_nosync_t&, _THRUST_STD::ptrdiff_t n)
 {
   void* ptr;
   hipError_t status = hipMallocAsync(&ptr, sizeof(T) * n, nullptr);
@@ -62,7 +62,7 @@ THRUST_HOST pair<T*, _THRUST_STD::ptrdiff_t> get_temporary_buffer(par_nosync_t&,
     }
   }
 
-  return make_pair(reinterpret_pointer_cast<T*>(ptr), n);
+  return _THRUST_STD::make_pair(reinterpret_pointer_cast<T*>(ptr), n);
 }
 
 template <typename Pointer>
@@ -88,7 +88,7 @@ THRUST_HOST void return_temporary_buffer(par_nosync_t&, Pointer ptr, _THRUST_STD
 }
 
 template <typename T>
-THRUST_HOST pair<T*, _THRUST_STD::ptrdiff_t>
+THRUST_HOST _THRUST_STD::pair<T*, _THRUST_STD::ptrdiff_t>
 get_temporary_buffer(execute_on_stream_nosync& system, _THRUST_STD::ptrdiff_t n)
 {
   void* ptr;
@@ -108,7 +108,7 @@ get_temporary_buffer(execute_on_stream_nosync& system, _THRUST_STD::ptrdiff_t n)
     }
   }
 
-  return make_pair(reinterpret_pointer_cast<T*>(ptr), n);
+  return _THRUST_STD::make_pair(reinterpret_pointer_cast<T*>(ptr), n);
 }
 
 template <typename Pointer>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
index 20291e598a5c..4655ae67e279 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
@@ -59,7 +59,7 @@
 THRUST_NAMESPACE_BEGIN
 
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -69,7 +69,7 @@ template <typename DerivedPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -89,7 +89,7 @@ template <typename Derived,
           typename KeyOutputIt,
           typename ValOutputIt,
           typename BinaryPred>
-THRUST_HIP_RUNTIME_FUNCTION pair<KeyOutputIt, ValOutputIt> unique_by_key(
+THRUST_HIP_RUNTIME_FUNCTION _THRUST_STD::pair<KeyOutputIt, ValOutputIt> unique_by_key(
   execution_policy<Derived>& policy,
   KeyInputIt keys_first,
   KeyInputIt keys_last,
@@ -108,7 +108,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeyOutputIt, ValOutputIt> unique_by_key(
 
   if (num_items == 0)
   {
-    return thrust::make_pair(keys_result, values_result);
+    return _THRUST_STD::make_pair(keys_result, values_result);
   }
 
   // Determine temporary device storage requirements.
@@ -163,7 +163,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeyOutputIt, ValOutputIt> unique_by_key(
 
   size_type num_selected = get_value(policy, d_num_selected_out);
 
-  return thrust::make_pair(keys_result + num_selected, values_result + num_selected);
+  return _THRUST_STD::make_pair(keys_result + num_selected, values_result + num_selected);
 }
 
 } // namespace detail
@@ -173,7 +173,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeyOutputIt, ValOutputIt> unique_by_key(
 //-------------------------
 THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class KeyInputIt, class ValInputIt, class KeyOutputIt, class ValOutputIt, class BinaryPred>
-pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
+_THRUST_STD::pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
   execution_policy<Derived>& policy,
   KeyInputIt keys_first,
   KeyInputIt keys_last,
@@ -185,7 +185,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<KeyOutputIt, ValOutputIt>
+    THRUST_HOST static _THRUST_STD::pair<KeyOutputIt, ValOutputIt>
     par(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
         KeyInputIt keys_last,
@@ -197,7 +197,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
       return detail::unique_by_key(policy, keys_first, keys_last, values_first, keys_result, values_result, binary_pred);
     }
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<KeyOutputIt, ValOutputIt>
+    THRUST_DEVICE static _THRUST_STD::pair<KeyOutputIt, ValOutputIt>
     seq(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
         KeyInputIt keys_last,
@@ -219,7 +219,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
 }
 
 template <class Derived, class KeyInputIt, class ValInputIt, class KeyOutputIt, class ValOutputIt>
-pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
+_THRUST_STD::pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
   execution_policy<Derived>& policy,
   KeyInputIt keys_first,
   KeyInputIt keys_last,
@@ -233,7 +233,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
 }
 
 template <class Derived, class KeyInputIt, class ValInputIt, class BinaryPred>
-pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE unique_by_key(
+_THRUST_STD::pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE unique_by_key(
   execution_policy<Derived>& policy,
   KeyInputIt keys_first,
   KeyInputIt keys_last,
@@ -243,7 +243,7 @@ pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE unique_by_key(
   // struct workaround is required for HIP-clang
   struct workaround
   {
-    THRUST_HOST static pair<KeyInputIt, ValInputIt>
+    THRUST_HOST static _THRUST_STD::pair<KeyInputIt, ValInputIt>
     par(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
         KeyInputIt keys_last,
@@ -254,7 +254,7 @@ pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE unique_by_key(
         policy, keys_first, keys_last, values_first, keys_first, values_first, binary_pred);
     }
 #  if defined(__HIP_DEVICE_COMPILE__)
-    THRUST_DEVICE static pair<KeyInputIt, ValInputIt>
+    THRUST_DEVICE static _THRUST_STD::pair<KeyInputIt, ValInputIt>
     seq(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
         KeyInputIt keys_last,
@@ -273,7 +273,7 @@ pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE unique_by_key(
 }
 
 template <class Derived, class KeyInputIt, class ValInputIt>
-pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE
+_THRUST_STD::pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE
 unique_by_key(execution_policy<Derived>& policy, KeyInputIt keys_first, KeyInputIt keys_last, ValInputIt values_first)
 {
   using key_type = thrust::detail::it_value_t<KeyInputIt>;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/extrema.h
index 9b36c0480637..8db27ff12b21 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/extrema.h
@@ -36,7 +36,7 @@ min_element(execution_policy<DerivedPolicy>& exec, ForwardIterator first, Forwar
 } // end min_element()
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 minmax_element(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   // omp prefers generic::minmax_element to cpp::minmax_element
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/partition.h
index d5c5b057923e..2599959728ae 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/partition.h
@@ -17,10 +17,11 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/partition.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::omp::detail
 {
@@ -49,7 +50,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   execution_policy<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -67,7 +68,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   execution_policy<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h
index 9ef303f46c12..755b3da0ce2d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h
@@ -31,7 +31,7 @@ template <typename DerivedPolicy,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique.h
index 32a42b9efc0b..b96dd4a7baae 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique.h
@@ -13,10 +13,11 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/unique.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::omp::detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique_by_key.h
index cb41c37974cc..4d527b42db75 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/unique_by_key.h
@@ -13,15 +13,16 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/unique_by_key.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::omp::detail
 {
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   execution_policy<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -38,7 +39,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/extrema.h
index 75ab11bb1e63..3317dd5ea386 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/extrema.h
@@ -35,7 +35,7 @@ min_element(execution_policy<DerivedPolicy>& exec, ForwardIterator first, Forwar
 } // end min_element()
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-thrust::pair<ForwardIterator, ForwardIterator>
+_THRUST_STD::pair<ForwardIterator, ForwardIterator>
 minmax_element(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   // tbb prefers generic::minmax_element to cpp::minmax_element
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/merge.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/merge.h
index 2bf14b3aa0bf..0ea6bbd23d49 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/merge.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/merge.h
@@ -263,7 +263,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> merge_by_key(
   execution_policy<DerivedPolicy>&,
   InputIterator1 keys_first1,
   InputIterator1 keys_last1,
@@ -296,7 +296,7 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
   _THRUST_STD::advance(values_result,
                        _THRUST_STD::distance(keys_first1, keys_last1) + _THRUST_STD::distance(keys_first2, keys_last2));
 
-  return thrust::make_pair(keys_result, values_result);
+  return _THRUST_STD::make_pair(keys_result, values_result);
 }
 } // end namespace system::tbb::detail
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/partition.h
index d73782fa864f..449607f855bf 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/partition.h
@@ -12,10 +12,11 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/partition.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::tbb::detail
 {
@@ -44,7 +45,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   execution_policy<DerivedPolicy>& exec,
   InputIterator first,
   InputIterator last,
@@ -62,7 +63,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   execution_policy<DerivedPolicy>& exec,
   InputIterator1 first,
   InputIterator1 last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
index 1f462c9bfe9b..4817bb0a978a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
@@ -15,7 +15,6 @@
 #include <thrust/detail/range/tail_flags.h>
 #include <thrust/detail/seq.h>
 #include <thrust/detail/temporary_array.h>
-#include <thrust/pair.h>
 #include <thrust/scan.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 #include <thrust/system/tbb/detail/reduce_intervals.h>
@@ -50,9 +49,9 @@ struct partial_sum_type
 };
 
 template <typename InputIterator1, typename InputIterator2, typename BinaryPredicate, typename BinaryFunction>
-thrust::pair<InputIterator1,
-             thrust::pair<thrust::detail::it_value_t<InputIterator1>,
-                          typename partial_sum_type<InputIterator2, BinaryFunction>::type>>
+_THRUST_STD::pair<InputIterator1,
+                  _THRUST_STD::pair<thrust::detail::it_value_t<InputIterator1>,
+                                    typename partial_sum_type<InputIterator2, BinaryFunction>::type>>
 reduce_last_segment_backward(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -77,7 +76,7 @@ reduce_last_segment_backward(
     result_value = binary_op(result_value, *values_first_r);
   }
 
-  return thrust::make_pair(keys_first_r.base(), thrust::make_pair(result_key, result_value));
+  return _THRUST_STD::make_pair(keys_first_r.base(), _THRUST_STD::make_pair(result_key, result_value));
 }
 
 template <typename InputIterator1,
@@ -101,8 +100,8 @@ reduce_by_key_with_carry(
 {
   // first, consume the last sequence to produce the carry
   // XXX is there an elegant way to pose this such that we don't need to default construct carry?
-  thrust::pair<thrust::detail::it_value_t<InputIterator1>,
-               typename partial_sum_type<InputIterator2, BinaryFunction>::type>
+  _THRUST_STD::pair<thrust::detail::it_value_t<InputIterator1>,
+                    typename partial_sum_type<InputIterator2, BinaryFunction>::type>
     carry;
 
   thrust::tie(keys_last, carry) =
@@ -196,7 +195,7 @@ struct serial_reduce_by_key_body
     using value_type = typename partial_sum_type<Iterator2, BinaryFunction>::type;
 
     // XXX is there a way to pose this so that we don't require default construction of carry?
-    thrust::pair<key_type, value_type> carry;
+    _THRUST_STD::pair<key_type, value_type> carry;
 
     thrust::tie(my_keys_result, my_values_result, carry.first, carry.second) = reduce_by_key_with_carry(
       my_keys_first, my_keys_last, my_values_first, my_keys_result, my_values_result, binary_pred, binary_op);
@@ -274,7 +273,7 @@ template <typename DerivedPolicy,
           typename Iterator4,
           typename BinaryPredicate,
           typename BinaryFunction>
-thrust::pair<Iterator3, Iterator4> reduce_by_key(
+_THRUST_STD::pair<Iterator3, Iterator4> reduce_by_key(
   thrust::tbb::execution_policy<DerivedPolicy>& exec,
   Iterator1 keys_first,
   Iterator1 keys_last,
@@ -288,7 +287,7 @@ thrust::pair<Iterator3, Iterator4> reduce_by_key(
   difference_type n     = keys_last - keys_first;
   if (n == 0)
   {
-    return thrust::make_pair(keys_result, values_result);
+    return _THRUST_STD::make_pair(keys_result, values_result);
   }
 
   // XXX this value is a tuning opportunity
@@ -373,7 +372,7 @@ thrust::pair<Iterator3, Iterator4> reduce_by_key(
     }
   }
 
-  return thrust::make_pair(keys_result + size_of_result, values_result + size_of_result);
+  return _THRUST_STD::make_pair(keys_result + size_of_result, values_result + size_of_result);
 }
 } // namespace system::tbb::detail
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique.h
index 8a4557a472a2..43475f50f8c4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique.h
@@ -12,7 +12,6 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/unique.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique_by_key.h
index e3f668a1e1c8..d346abd09049 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/unique_by_key.h
@@ -12,15 +12,16 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/pair.h>
 #include <thrust/system/detail/generic/unique_by_key.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::tbb::detail
 {
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   execution_policy<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -37,7 +38,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   execution_policy<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/unique.h
index edd3c427e1dd..3d6b60a546c6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/unique.h
@@ -31,7 +31,8 @@
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/pair.h>
+
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -466,7 +467,7 @@ OutputIterator unique_copy(InputIterator first, InputIterator last, OutputIterat
  *  int A[N] = {1, 3, 3, 3, 2, 2, 1}; // keys
  *  int B[N] = {9, 8, 7, 6, 5, 4, 3}; // values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  new_end = thrust::unique_by_key(thrust::host, A, A + N, B);
  *
  *  // The first four keys in A are now {1, 3, 2, 1} and new_end.first - A is 4.
@@ -478,7 +479,7 @@ OutputIterator unique_copy(InputIterator first, InputIterator last, OutputIterat
  *  \see reduce_by_key
  */
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -523,7 +524,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_ke
  *  int A[N] = {1, 3, 3, 3, 2, 2, 1}; // keys
  *  int B[N] = {9, 8, 7, 6, 5, 4, 3}; // values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  new_end = thrust::unique_by_key(A, A + N, B);
  *
  *  // The first four keys in A are now {1, 3, 2, 1} and new_end.first - A is 4.
@@ -535,7 +536,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_ke
  *  \see reduce_by_key
  */
 template <typename ForwardIterator1, typename ForwardIterator2>
-thrust::pair<ForwardIterator1, ForwardIterator2>
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2>
 unique_by_key(ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIterator2 values_first);
 
 /*! \p unique_by_key is a generalization of \p unique to key-value pairs.
@@ -580,7 +581,7 @@ unique_by_key(ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIt
  *  int A[N] = {1, 3, 3, 3, 2, 2, 1}; // keys
  *  int B[N] = {9, 8, 7, 6, 5, 4, 3}; // values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  new_end = thrust::unique_by_key(thrust::host, A, A + N, B, binary_pred);
  *
@@ -593,7 +594,7 @@ unique_by_key(ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIt
  *  \see reduce_by_key
  */
 template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+THRUST_HOST_DEVICE _THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator1 keys_first,
   ForwardIterator1 keys_last,
@@ -636,7 +637,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_ke
  *  int A[N] = {1, 3, 3, 3, 2, 2, 1}; // keys
  *  int B[N] = {9, 8, 7, 6, 5, 4, 3}; // values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  new_end = thrust::unique_by_key(A, A + N, B, binary_pred);
  *
@@ -649,7 +650,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_ke
  *  \see reduce_by_key
  */
 template <typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
+_THRUST_STD::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIterator2 values_first, BinaryPredicate binary_pred);
 
 /*! \p unique_by_key_copy is a generalization of \p unique_copy to key-value pairs.
@@ -698,7 +699,7 @@ thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  new_end = thrust::unique_by_key_copy(thrust::host, A, A + N, B, C, D);
  *
  *  // The first four keys in C are now {1, 3, 2, 1} and new_end.first - C is 4.
@@ -714,7 +715,7 @@ template <typename DerivedPolicy,
           typename InputIterator2,
           typename OutputIterator1,
           typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -762,7 +763,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  new_end = thrust::unique_by_key_copy(A, A + N, B, C, D);
  *
  *  // The first four keys in C are now {1, 3, 2, 1} and new_end.first - C is 4.
@@ -774,7 +775,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_
  *  \see reduce_by_key
  */
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,
@@ -829,7 +830,7 @@ thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  new_end = thrust::unique_by_key_copy(thrust::host, A, A + N, B, C, D, binary_pred);
  *
@@ -847,7 +848,7 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+THRUST_HOST_DEVICE _THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   InputIterator1 keys_first,
   InputIterator1 keys_last,
@@ -898,7 +899,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_
  *  int C[N];                         // output keys
  *  int D[N];                         // output values
  *
- *  thrust::pair<int*,int*> new_end;
+ *  _THRUST_STD::pair<int*,int*> new_end;
  *  _THRUST_STD::equal_to<int> binary_pred;
  *  new_end = thrust::unique_by_key_copy(A, A + N, B, C, D, binary_pred);
  *
@@ -915,7 +916,7 @@ template <typename InputIterator1,
           typename OutputIterator1,
           typename OutputIterator2,
           typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
+_THRUST_STD::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   InputIterator1 keys_first,
   InputIterator1 keys_last,
   InputIterator2 values_first,

From e54ee268578644e9f0ea450e81fd161623b7eab0 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:45:14 -0400
Subject: [PATCH 25/48] refactor(rocthrust): CCCL 2f529edf653 parity -
 transform_iterator includes

Related upstream commit: 2f529edf653 Ensure that we properly warn about device lambdas that need to query the return type (#6765) (NVIDIA/cccl#6782)
Related local port commit: 99ecdb91b5f

The port kept the local include block (type_traits umbrella plus
!_THRUST_HAS_DEVICE_SYSTEM_STD fallbacks) instead of upstream's granular
includes. libhipcxx is now mandatory, so transform_iterator.h now:
- includes the upstream __functional/{identity,invoke}.h,
  __memory/construct_at.h and __type_traits/{is_copy_assignable,
  is_copy_constructible,remove_cvref,remove_reference}.h headers, dropping
  the dead fallback includes and the libcxx_wrapper construct_at.h;
- spells ::internal::remove_cvref / __destroy_at / __construct_at as
  _THRUST_STD:: like upstream's ::cuda::std::.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/iterator/transform_iterator.h      | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/transform_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/transform_iterator.h
index c9ef48b7d19f..4a22fdcd9e09 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/transform_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/transform_iterator.h
@@ -42,21 +42,18 @@
 #endif // no system header
 
 #include <thrust/detail/functional/actor.h>
-#include <thrust/detail/libcxx_wrapper/std/__memory/construct_at.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_adaptor.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(functional)
-#endif
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <utility>
-#endif
+#include _THRUST_STD_INCLUDE(__functional/identity.h)
+#include _THRUST_STD_INCLUDE(__functional/invoke.h)
+#include _THRUST_STD_INCLUDE(__memory/construct_at.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_copy_assignable.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_copy_constructible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_reference.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -92,7 +89,7 @@ struct make_transform_iterator_base
 {
 private:
   using reference  = replace_if_use_default<Reference, transform_iterator_reference<UnaryFunc, Iterator>>;
-  using value_type = replace_if_use_default<Value, ::internal::remove_cvref<reference>>;
+  using value_type = replace_if_use_default<Value, _THRUST_STD::remove_cvref<reference>>;
 
 public:
   using type =
@@ -279,8 +276,8 @@ class transform_iterator
     }
     else if constexpr (_THRUST_STD::is_copy_constructible_v<AdaptableUnaryFunction>)
     {
-      ::internal::__destroy_at(&m_f);
-      ::internal::__construct_at(&m_f, other.m_f);
+      _THRUST_STD::__destroy_at(&m_f);
+      _THRUST_STD::__construct_at(&m_f, other.m_f);
     }
     else
     {

From 5536bbb284d9e3895a291be6a309b3dd1c33f335 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:45:49 -0400
Subject: [PATCH 26/48] refactor(rocthrust): CCCL b85d41e36d4 parity -
 bit_width in random_bijection

Related upstream commit: b85d41e36d4 Fixes for thrust::shuffle (#7172) (NVIDIA/cccl#7189)
Related local port commit: bd2d9c02b2d

The port replaced _THRUST_STD::max/_THRUST_STD::bit_width in
feistel_bijection with a hand-written bit-count loop because bit_width
is C++20 and unavailable without libhipcxx. libhipcxx is now mandatory,
so random_bijection.h follows upstream: max_index/total_bits use
_THRUST_STD::max and _THRUST_STD::bit_width, the raw <cuda/std/...>
includes and ::cuda::std:: spellings become _THRUST_STD_INCLUDE /
_THRUST_STD::, and the upstream granular includes are taken
(__type_traits/{is_convertible,is_integral}.h, __utility/forward.h, bit,
cstdint). __algorithm/max.h is included explicitly (upstream gets it
transitively).

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/detail/random_bijection.h          | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h
index 45566c85dc4e..28aee2b88998 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h
@@ -23,8 +23,12 @@
 
 #include <thrust/random.h>
 
-#include <cuda/std/cstdint>
-#include <cuda/std/type_traits>
+#include _THRUST_STD_INCLUDE(__algorithm/max.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_integral.h)
+#include _THRUST_STD_INCLUDE(__utility/forward.h)
+#include _THRUST_STD_INCLUDE(bit)
+#include _THRUST_STD_INCLUDE(cstdint)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
@@ -40,14 +44,8 @@ class feistel_bijection
   {
     // Calculate number of bits needed to represent num_elements - 1
     // Prevent zero
-    const uint64_t max_index = (m > 1 ? m : 1) - 1;
-    // Portable bit_width(max_index): std::bit_width is C++20 and unavailable without libhipcxx
-    uint64_t index_bits = 0;
-    for (uint64_t v = max_index; v != 0; v >>= 1)
-    {
-      ++index_bits;
-    }
-    const uint64_t total_bits = index_bits > 8 ? index_bits : 8;
+    const uint64_t max_index  = _THRUST_STD::max(static_cast<uint64_t>(1), m) - 1;
+    const uint64_t total_bits = static_cast<uint64_t>(_THRUST_STD::max(8, _THRUST_STD::bit_width(max_index)));
     // Half bits rounded down
     L_bits = total_bits / 2;
     L_mask = (1ull << L_bits) - 1;
@@ -110,8 +108,8 @@ template <class IndexType, class Bijection = feistel_bijection>
 class random_bijection
 {
 private:
-  static_assert(::cuda::std::is_integral_v<IndexType>, "IndexType must be an integral type");
-  static_assert(::cuda::std::is_convertible_v<IndexType, typename Bijection::index_type>,
+  static_assert(_THRUST_STD::is_integral_v<IndexType>, "IndexType must be an integral type");
+  static_assert(_THRUST_STD::is_convertible_v<IndexType, typename Bijection::index_type>,
                 "IndexType must be convertible to Bijection::index_type");
 
   Bijection bijection;
@@ -122,7 +120,7 @@ class random_bijection
 
   template <class URBG>
   THRUST_HOST_DEVICE random_bijection(IndexType n, URBG&& g)
-      : bijection(n, ::cuda::std::forward<URBG>(g))
+      : bijection(n, _THRUST_STD::forward<URBG>(g))
       , n(n)
   {}
 

From d6d1c528cf901a94bccb12116cecc788b0f6bff7 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:47:02 -0400
Subject: [PATCH 27/48] refactor(rocthrust): CCCL 8ca3dc31e90/1c3c7ddee12
 parity - cuda iterators in hip find/mismatch

Related upstream commit: 8ca3dc31e90 Refactor thrust::mismatch to use CUDA iterators (NVIDIA/cccl#6018)
Related upstream commit: 1c3c7ddee12 Refactor iterator usage in thrust/cuda find() (NVIDIA/cccl#6019)
Related local port commit: e46dc36b2f1

e46dc36b2f1 brought the upstream find/mismatch rewrite to system/hip
using thrust:: iterators, plus a local transform_input_iterator_t because
thrust::transform_iterator materializes the value_type before calling the
predicate (NVIDIA/cccl#3591). libhipcxx is now mandatory, so hip now uses
the same libcu++ iterators as upstream's system/cuda:
- find.h: find_if_n zips _THRUST_LIBCXX::make_transform_iterator(
  try_unwrap_contiguous_iterator(first), predicate) with
  _THRUST_LIBCXX::counting_iterator<Size>(0) and uses a
  _THRUST_STD::tuple<bool, Size> result type; __find_if::
  transform_input_iterator_t and the dead !_THRUST_HAS_DEVICE_SYSTEM_STD
  include block are removed; upstream granular includes are taken
  (<thrust/functional.h> kept explicitly for the placeholders in find).
- mismatch.h: _THRUST_LIBCXX::make_zip_iterator and
  _THRUST_LIBCXX::zip_function(binary_pred), with upstream's granular
  includes instead of thrust/{distance,pair,zip_function}.h and
  thrust/iterator/zip_iterator.h.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/system/hip/detail/find.h | 126 ++----------------
 .../thrust/system/hip/detail/mismatch.h       |  16 ++-
 2 files changed, 22 insertions(+), 120 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h
index 2364f6802ebb..b8fd3cd79f0a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/find.h
@@ -40,16 +40,17 @@
 #if THRUST_HAS_HIP_COMPILER()
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/distance.h>
-#  include <thrust/iterator/counting_iterator.h>
-#  include <thrust/iterator/transform_iterator.h>
+#  include <thrust/functional.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/type_traits/unwrap_contiguous_iterator.h>
-#  if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#    include <thrust/detail/algorithm_wrapper.h>
 
-#    include <iterator>
-#  endif
+#  include _THRUST_LIBCXX_INCLUDE(__iterator/counting_iterator.h)
+#  include _THRUST_LIBCXX_INCLUDE(__iterator/transform_iterator.h)
+#  include _THRUST_LIBCXX_INCLUDE(__iterator/zip_iterator.h)
+#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#  include _THRUST_STD_INCLUDE(__functional/not_fn.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(tuple)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
@@ -69,7 +70,6 @@ InputIt THRUST_HOST_DEVICE find(execution_policy<Derived>& policy, InputIt first
 }; // namespace hip_rocprim
 THRUST_NAMESPACE_END
 
-#  include <thrust/iterator/zip_iterator.h>
 #  include <thrust/system/hip/detail/reduce.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -99,110 +99,13 @@ struct functor
     }
   }
 };
-
-template <class ValueType, class InputIt, class UnaryOp>
-struct transform_input_iterator_t
-{
-  using self_t            = transform_input_iterator_t;
-  using difference_type   = thrust::detail::it_difference_t<InputIt>;
-  using value_type        = ValueType;
-  using pointer           = void;
-  using reference         = value_type;
-  using iterator_category = _THRUST_STD::random_access_iterator_tag;
-
-  InputIt input;
-  mutable UnaryOp op;
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE transform_input_iterator_t(InputIt input, UnaryOp op)
-      : input(input)
-      , op(op)
-  {}
-
-  transform_input_iterator_t(const self_t&) = default;
-
-  // UnaryOp might not be copy assignable, such as when it is a lambda.  Define
-  // an explicit copy assignment operator that doesn't try to assign it.
-  THRUST_HOST_DEVICE self_t& operator=(const self_t& o)
-  {
-    input = o.input;
-    return *this;
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++(int)
-  {
-    self_t retval = *this;
-    ++input;
-    return retval;
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator++()
-  {
-    ++input;
-    return *this;
-  }
-
-  // Pass the dereferenced value straight to op (like ::cuda::transform_iterator) instead of materializing the
-  // value_type first, so value types need not be constructible on the device. See:
-  // https://github.com/NVIDIA/cccl/issues/3591
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*() const
-  {
-    return op(*input);
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*()
-  {
-    return op(*input);
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator+(difference_type n) const
-  {
-    return self_t(input + n, op);
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator+=(difference_type n)
-  {
-    input += n;
-    return *this;
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator-(difference_type n) const
-  {
-    return self_t(input - n, op);
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator-=(difference_type n)
-  {
-    input -= n;
-    return *this;
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE difference_type operator-(self_t other) const
-  {
-    return input - other.input;
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator[](difference_type n) const
-  {
-    return op(input[n]);
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator==(const self_t& rhs) const
-  {
-    return (input == rhs.input);
-  }
-
-  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator!=(const self_t& rhs) const
-  {
-    return (input != rhs.input);
-  }
-};
 } // namespace __find_if
 
 template <class Derived, class InputIt, class Size, class Predicate>
 InputIt THRUST_HOST_DEVICE
 find_if_n(execution_policy<Derived>& policy, InputIt first, Size num_items, Predicate predicate)
 {
-  using result_type = typename thrust::tuple<bool, Size>;
+  using result_type = _THRUST_STD::tuple<bool, Size>;
 
   // empty sequence
   if (num_items == 0)
@@ -220,12 +123,9 @@ find_if_n(execution_policy<Derived>& policy, InputIt first, Size num_items, Pred
   const Size interval_threshold = 1 << 20;
   const Size interval_size      = (_THRUST_STD::min)(interval_threshold, num_items);
 
-  // Upstream uses ::cuda::make_transform_iterator here. thrust::transform_iterator converts to the value_type before
-  // calling the functor (https://github.com/NVIDIA/cccl/issues/3591), so keep a dedicated iterator that does not.
-  auto unwrapped_first = thrust::try_unwrap_contiguous_iterator(first);
-  using XfrmIterator   = __find_if::transform_input_iterator_t<bool, decltype(unwrapped_first), Predicate>;
-
-  const auto begin = thrust::make_zip_iterator(XfrmIterator(unwrapped_first, predicate), counting_iterator<Size>(0));
+  const auto begin = _THRUST_LIBCXX::make_zip_iterator(
+    _THRUST_LIBCXX::make_transform_iterator(thrust::try_unwrap_contiguous_iterator(first), predicate),
+    _THRUST_LIBCXX::counting_iterator<Size>(0));
   const auto end = begin + num_items;
 
   for (auto interval_begin = begin; interval_begin < end; interval_begin += interval_size)
@@ -236,7 +136,7 @@ find_if_n(execution_policy<Derived>& policy, InputIt first, Size num_items, Pred
       interval_end = end;
     } // end if
 
-    result_type result = reduce(
+    const result_type result = reduce(
       policy, interval_begin, interval_end, result_type(false, interval_end - begin), __find_if::functor<result_type>());
 
     // see if we found something
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
index a499108d9ec0..c46371cbfeed 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/mismatch.h
@@ -40,11 +40,13 @@
 #if THRUST_HAS_HIP_COMPILER()
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/distance.h>
-#  include <thrust/iterator/zip_iterator.h>
-#  include <thrust/pair.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
-#  include <thrust/zip_function.h>
+
+#  include _THRUST_LIBCXX_INCLUDE(__iterator/zip_function.h)
+#  include _THRUST_LIBCXX_INCLUDE(__iterator/zip_iterator.h)
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
@@ -69,9 +71,9 @@ _THRUST_STD::pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2, BinaryPred binary_pred)
 {
   const auto n            = _THRUST_STD::distance(first1, last1);
-  const auto first        = thrust::make_zip_iterator(first1, first2);
-  const auto last         = thrust::make_zip_iterator(last1, first2 + n);
-  const auto mismatch_pos = hip_rocprim::find_if_not(policy, first, last, thrust::make_zip_function(binary_pred));
+  const auto first        = _THRUST_LIBCXX::make_zip_iterator(first1, first2);
+  const auto last         = _THRUST_LIBCXX::make_zip_iterator(last1, first2 + n);
+  const auto mismatch_pos = hip_rocprim::find_if_not(policy, first, last, _THRUST_LIBCXX::zip_function(binary_pred));
   const auto dist         = _THRUST_STD::distance(first, mismatch_pos);
   return _THRUST_STD::make_pair(first1 + dist, first2 + dist);
 }

From 73bfcd793dd1ddba7833cb3d48ead180c5079af1 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 15:49:06 -0400
Subject: [PATCH 28/48] refactor(rocthrust): CCCL 8b68d958473 parity - drop
 dead libhipcxx fallbacks in zip_iterator and iterator tests

Related upstream commit: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538)
Related upstream commit: 8b68d958473 Drop internal uses of `thrust::reverse_iterator` (NVIDIA/cccl#5616)
Related local port commit: 148b6e82c1f

libhipcxx is now mandatory, so every !_THRUST_HAS_DEVICE_SYSTEM_STD branch
in the files these upstream commits touched is dead code. Upstream has no
such fallbacks; remove them to match:

- thrust/iterator/zip_iterator.h: remove the fallback zip_iterator
  machinery (advance_iterator, tuple_impl_specific, tuple_of_value_types,
  tuple_of_iterator_references helpers, ...) and the associated TODO;
  includes are now unconditional _THRUST_STD_INCLUDE(...).
- thrust/iterator/detail/tuple_of_iterator_references.h: drop fallback
  branches.
- thrust/detail/vector_base.h: drop fallback <type_traits> include.
- testing/{copy,scan}.cu, testing/unittest/testframework.h: unconditionally
  specialize _THRUST_STD traits and drop fallback includes.
- testing/{reverse,transform,transform_input_output,transform_output,
  tabulate_output,zip}_iterator.cu: iterator concept static_asserts are
  now unconditional, as upstream.

The namespace macro rename from 7b52284299d needs no further change; the
local _THRUST_STD_NAMESPACE_BEGIN/_THRUST_LIBCXX_NAMESPACE_BEGIN
spellings are already the equivalents.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl/hipccl3/rocthrust/testing/copy.cu  |   6 -
 .../rocthrust/testing/reverse_iterator.cu     |   6 -
 .../hipccl/hipccl3/rocthrust/testing/scan.cu  |  10 +-
 .../testing/tabulate_output_iterator.cu       |   6 -
 .../transform_input_output_iterator.cu        |   7 -
 .../rocthrust/testing/transform_iterator.cu   |   8 -
 .../testing/transform_output_iterator.cu      |   7 -
 .../testing/unittest/testframework.h          |   6 +-
 .../hipccl3/rocthrust/testing/zip_iterator.cu |  10 -
 .../rocthrust/thrust/detail/vector_base.h     |   3 -
 .../detail/tuple_of_iterator_references.h     |  32 +-
 .../rocthrust/thrust/iterator/zip_iterator.h  | 331 +-----------------
 12 files changed, 8 insertions(+), 424 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/testing/copy.cu b/projects/hipccl/hipccl3/rocthrust/testing/copy.cu
index ea7dbd2cd8d7..b504905fd509 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/copy.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/copy.cu
@@ -34,10 +34,6 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
-
 #if _CCCL_COMPILER(GCC, >=, 11)
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
 #else
@@ -755,7 +751,6 @@ struct iterator_traits<only_set_when_expected_it>
 };
 } // namespace std
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_STD_NAMESPACE_BEGIN
 template <>
 struct iterator_traits<only_set_when_expected_it>
@@ -766,7 +761,6 @@ struct iterator_traits<only_set_when_expected_it>
   using difference_type   = _THRUST_STD::ptrdiff_t;
 };
 _THRUST_STD_NAMESPACE_END
-#  endif
 
 void TestCopyWithBigIndexesHelper(int magnitude)
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/reverse_iterator.cu b/projects/hipccl/hipccl3/rocthrust/testing/reverse_iterator.cu
index 6e4715898a5f..9b5ad3c9f4d4 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/reverse_iterator.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/reverse_iterator.cu
@@ -25,10 +25,6 @@
 #include _THRUST_STD_INCLUDE(iterator)
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 // ensure that we properly support thrust::reverse_iterator from _THRUST_STD
 void TestReverseIteratorTraits()
 {
@@ -48,14 +44,12 @@ void TestReverseIteratorTraits()
 
   static_assert(_THRUST_STD::__has_random_access_traversal<it>);
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
   static_assert(_THRUST_STD::output_iterator<it, int>);
   static_assert(_THRUST_STD::input_iterator<it>);
   static_assert(_THRUST_STD::forward_iterator<it>);
   static_assert(_THRUST_STD::bidirectional_iterator<it>);
   static_assert(_THRUST_STD::random_access_iterator<it>);
   static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
 }
 DECLARE_UNITTEST(TestReverseIteratorTraits);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/scan.cu b/projects/hipccl/hipccl3/rocthrust/testing/scan.cu
index 6967f26b9775..4ae51b6fbcbd 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/scan.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/scan.cu
@@ -29,15 +29,9 @@
 
 #include <unittest/unittest.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(functional)
-#endif
+#include _THRUST_LIBCXX_INCLUDE(functional)
 #include _THRUST_STD_INCLUDE(array)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
-
 #include <numeric>
 
 template <class Vector>
@@ -613,7 +607,6 @@ struct iterator_traits<only_set_when_expected_it>
 };
 } // namespace std
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_STD_NAMESPACE_BEGIN
 template <>
 struct iterator_traits<only_set_when_expected_it>
@@ -624,7 +617,6 @@ struct iterator_traits<only_set_when_expected_it>
   using difference_type   = _THRUST_STD::ptrdiff_t;
 };
 _THRUST_STD_NAMESPACE_END
-#endif
 
 void TestInclusiveScanWithBigIndexesHelper(int magnitude)
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/tabulate_output_iterator.cu b/projects/hipccl/hipccl3/rocthrust/testing/tabulate_output_iterator.cu
index 4649d8134984..e7ca2f6c8104 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/tabulate_output_iterator.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/tabulate_output_iterator.cu
@@ -34,10 +34,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 template <typename OutItT>
 struct host_write_op
 {
@@ -124,14 +120,12 @@ void TestTabulateOutputIteratorTraits()
   static_assert(_THRUST_STD::__has_random_access_traversal<it>);
 
   // FIXME(bgruber): all up to and including random access should be true
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
   static_assert(!_THRUST_STD::output_iterator<it, int>);
   static_assert(!_THRUST_STD::input_iterator<it>);
   static_assert(!_THRUST_STD::forward_iterator<it>);
   static_assert(!_THRUST_STD::bidirectional_iterator<it>);
   static_assert(!_THRUST_STD::random_access_iterator<it>);
   static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
 }
 DECLARE_UNITTEST(TestTabulateOutputIteratorTraits);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/transform_input_output_iterator.cu b/projects/hipccl/hipccl3/rocthrust/testing/transform_input_output_iterator.cu
index 3551fa8e6426..fac96ee32d97 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/transform_input_output_iterator.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/transform_input_output_iterator.cu
@@ -25,11 +25,6 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <type_traits>
-#endif
-
 // There is an unfortunate miscompilation of the gcc-12/gcc-13 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
 #if THRUST_COMPILER(GCC, >=, 12)
@@ -59,14 +54,12 @@ void TestTransformInputOutputIteratorTraits()
 
   static_assert(_THRUST_STD::__has_random_access_traversal<it>);
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
   static_assert(!_THRUST_STD::output_iterator<it, int>);
   static_assert(_THRUST_STD::input_iterator<it>);
   static_assert(_THRUST_STD::forward_iterator<it>);
   static_assert(_THRUST_STD::bidirectional_iterator<it>);
   static_assert(_THRUST_STD::random_access_iterator<it>);
   static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
 }
 DECLARE_UNITTEST(TestTransformInputOutputIteratorTraits);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/transform_iterator.cu b/projects/hipccl/hipccl3/rocthrust/testing/transform_iterator.cu
index 50baf05b18fe..0e5df73211ab 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/transform_iterator.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/transform_iterator.cu
@@ -29,12 +29,6 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <functional>
-#  include <iterator>
-#  include <type_traits>
-#endif
-
 // ensure that we properly support thrust::transform_iterator from _THRUST_STD
 void TestTransformIteratorTraits()
 {
@@ -54,14 +48,12 @@ void TestTransformIteratorTraits()
 
   static_assert(_THRUST_STD::__has_random_access_traversal<it>);
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
   static_assert(!_THRUST_STD::output_iterator<it, int>);
   static_assert(_THRUST_STD::input_iterator<it>);
   static_assert(_THRUST_STD::forward_iterator<it>);
   static_assert(_THRUST_STD::bidirectional_iterator<it>);
   static_assert(_THRUST_STD::random_access_iterator<it>);
   static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
 }
 DECLARE_UNITTEST(TestTransformIteratorTraits);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/transform_output_iterator.cu b/projects/hipccl/hipccl3/rocthrust/testing/transform_output_iterator.cu
index 271316abac77..4843c4ca26cc 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/transform_output_iterator.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/transform_output_iterator.cu
@@ -27,11 +27,6 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <type_traits>
-#endif
-
 // ensure that we properly support thrust::transform_output_iterator from _THRUST_STD
 void TestTransformOutputIteratorTraits()
 {
@@ -52,7 +47,6 @@ void TestTransformOutputIteratorTraits()
 
   static_assert(_THRUST_STD::__has_random_access_traversal<it>);
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
   static_assert(!_THRUST_STD::output_iterator<it, int>);
   // FIXME(bgruber): all up to and including random access should be true
   static_assert(!_THRUST_STD::input_iterator<it>);
@@ -60,7 +54,6 @@ void TestTransformOutputIteratorTraits()
   static_assert(!_THRUST_STD::bidirectional_iterator<it>);
   static_assert(!_THRUST_STD::random_access_iterator<it>);
   static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
 }
 DECLARE_UNITTEST(TestTransformOutputIteratorTraits);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/unittest/testframework.h b/projects/hipccl/hipccl3/rocthrust/testing/unittest/testframework.h
index 8a2042fe37e9..97d2970d87b8 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/unittest/testframework.h
+++ b/projects/hipccl/hipccl3/rocthrust/testing/unittest/testframework.h
@@ -28,14 +28,12 @@
 
 #include <cstdio>
 #include <iostream>
+#include <limits>
 #include <map>
 #include <set>
 #include <string>
 #include <type_traits>
 #include <vector>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <limits>
-#endif
 
 #include "meta.h"
 #include "util.h"
@@ -226,13 +224,11 @@ struct numeric_limits<custom_numeric> : numeric_limits<int>
 {};
 } // namespace std
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_STD_NAMESPACE_BEGIN
 template <>
 struct numeric_limits<custom_numeric> : numeric_limits<int>
 {};
 _THRUST_STD_NAMESPACE_END
-#endif
 
 using NumericTypes = unittest::type_list<
   char,
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/zip_iterator.cu b/projects/hipccl/hipccl3/rocthrust/testing/zip_iterator.cu
index 7b6527a703b8..072e9829b369 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/zip_iterator.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/zip_iterator.cu
@@ -26,10 +26,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 using namespace unittest;
 
 // ensure that we properly support thrust::zip_iterator from _THRUST_STD
@@ -52,18 +48,12 @@ void TestZipIteratorTraits()
 
   static_assert(_THRUST_STD::__has_random_access_traversal<it>);
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
   static_assert(!_THRUST_STD::output_iterator<it, int>);
-#endif
-#if _THRUST_HAS_DEVICE_SYSTEM_STD // The fallback version of zip_iterator lacks these iterator concepts.
   static_assert(_THRUST_STD::input_iterator<it>);
   static_assert(_THRUST_STD::forward_iterator<it>);
   static_assert(_THRUST_STD::bidirectional_iterator<it>);
   static_assert(_THRUST_STD::random_access_iterator<it>);
-#endif
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
   static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
 }
 DECLARE_UNITTEST(TestZipIteratorTraits);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h
index 8e353e87bd76..b0ed2c2bd86e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h
@@ -44,9 +44,6 @@
 #include _THRUST_STD_INCLUDE(utility)
 
 #include <vector>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
 
 #include _THRUST_STD_INCLUDE(initializer_list)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
index e3db3101dcde..f771b29f4ef1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
@@ -33,12 +33,8 @@
 
 #include _THRUST_STD_INCLUDE(__utility/pair.h)
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(tuple)
-#  include _THRUST_STD_INCLUDE(type_traits)
-#else
-#  include <utility>
-#endif
+#include _THRUST_STD_INCLUDE(tuple)
+#include _THRUST_STD_INCLUDE(type_traits)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -56,7 +52,6 @@ struct maybe_unwrap_nested
   }
 };
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <class... Us, class... Ts>
 struct maybe_unwrap_nested<tuple<Us...>, tuple_of_iterator_references<Ts...>>
 {
@@ -65,7 +60,6 @@ struct maybe_unwrap_nested<tuple<Us...>, tuple_of_iterator_references<Ts...>>
     return t.template __to_tuple<Us...>(typename _THRUST_STD::__make_tuple_indices<sizeof...(Ts)>::type{});
   }
 };
-#endif
 
 template <typename... Ts>
 class tuple_of_iterator_references : public tuple<Ts...>
@@ -118,13 +112,11 @@ class tuple_of_iterator_references : public tuple<Ts...>
     return *this;
   }
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   template <class... Us, _THRUST_STD::enable_if_t<sizeof...(Us) == sizeof...(Ts), int> = 0>
   THRUST_HOST_DEVICE constexpr operator tuple<Us...>() const
   {
     return __to_tuple<Us...>(typename _THRUST_STD::__make_tuple_indices<sizeof...(Ts)>::type{});
   }
-#endif
 
   // this overload of swap() permits swapping tuple_of_iterator_references returned as temporaries from
   // iterator dereferences
@@ -134,29 +126,21 @@ class tuple_of_iterator_references : public tuple<Ts...>
     x.swap(y);
   }
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   template <class... Us, size_t... Id>
   THRUST_HOST_DEVICE constexpr tuple<Us...> __to_tuple(_THRUST_STD::__tuple_indices<Id...>) const
   {
     return {maybe_unwrap_nested<Us, Ts>{}(get<Id>(*this))...};
   }
-#endif
 };
 } // namespace detail
 
 THRUST_NAMESPACE_END
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_STD_NAMESPACE_BEGIN
-#else
-THRUST_NAMESPACE_BEGIN
-#endif
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <class... Ts>
 inline constexpr bool
   __is_tuple_of_iterator_references_v<THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts...>> = true;
-#endif
 
 // define tuple_size, tuple_element, etc.
 template <class... Ts>
@@ -166,18 +150,10 @@ struct tuple_size<THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts..
 
 template <size_t Id, class... Ts>
 struct tuple_element<Id, THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts...>>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     : _THRUST_STD::tuple_element<Id, _THRUST_STD::tuple<Ts...>>
-#else
-    : THRUST_NS_QUALIFIER::tuple_element<Id, THRUST_NS_QUALIFIER::tuple<Ts...>>
-#endif
 {};
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 _THRUST_STD_NAMESPACE_END
-#else
-THRUST_NAMESPACE_END
-#endif
 
 // structured bindings support
 #if !THRUST_COMPILER(NVRTC)
@@ -190,11 +166,7 @@ struct tuple_size<THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts..
 
 template <size_t Id, class... Ts>
 struct tuple_element<Id, THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts...>>
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
     : _THRUST_STD::tuple_element<Id, _THRUST_STD::tuple<Ts...>>
-#  else
-    : THRUST_NS_QUALIFIER::tuple_element<Id, THRUST_NS_QUALIFIER::tuple<Ts...>>
-#  endif
 {};
 } // namespace std
 #endif // !THRUST_COMPILER(NVRTC)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h
index f5911d369c05..401f3bd236da 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-// TODO(libhipcxx): remove all the code in the path of !_THRUST_HAS_DEVICE_SYSTEM_STD
-// once libhipcxx gets ready
-
 #include <thrust/detail/config.h>
 
 #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
@@ -48,17 +45,10 @@
 #include <thrust/iterator/iterator_facade.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/type_traits/integer_sequence.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/tuple_meta_transform.h>
-#  include <thrust/iterator/iterator_categories.h>
-#  include <thrust/tuple.h>
-#endif
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(tuple)
-#  include _THRUST_STD_INCLUDE(type_traits)
-#  include _THRUST_STD_INCLUDE(utility)
-#endif
+
+#include _THRUST_STD_INCLUDE(tuple)
+#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(utility)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -67,7 +57,6 @@ class zip_iterator;
 
 namespace detail
 {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <typename IteratorTuple>
 struct make_zip_iterator_base
 {
@@ -108,288 +97,6 @@ struct make_zip_iterator_base<_THRUST_STD::tuple<Its...>>
                     reference,
                     difference_type>;
 };
-#else
-// Functors to be used with tuple algorithms
-//
-template <typename DiffType>
-class advance_iterator
-{
-public:
-  inline THRUST_HOST_DEVICE advance_iterator(DiffType step)
-      : m_step(step)
-  {}
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  inline THRUST_HOST_DEVICE void operator()(Iterator& it) const
-  {
-    _THRUST_STD::advance(it, m_step);
-  }
-
-private:
-  DiffType m_step;
-}; // end advance_iterator
-
-struct increment_iterator
-{
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  inline THRUST_HOST_DEVICE void operator()(Iterator& it)
-  {
-    ++it;
-  }
-}; // end increment_iterator
-
-struct decrement_iterator
-{
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  inline THRUST_HOST_DEVICE void operator()(Iterator& it)
-  {
-    --it;
-  }
-}; // end decrement_iterator
-
-struct dereference_iterator
-{
-  template <typename Iterator>
-  struct apply
-  {
-    using type = thrust::detail::it_reference_t<Iterator>;
-  }; // end apply
-
-  // XXX silence warnings of the form "calling a __host__ function from a __host__ __device__ function is not allowed
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  THRUST_HOST_DEVICE typename apply<Iterator>::type operator()(Iterator const& it)
-  {
-    return *it;
-  }
-}; // end dereference_iterator
-
-// The namespace tuple_impl_specific provides two meta-
-// algorithms and two algorithms for tuples.
-namespace tuple_impl_specific
-{
-
-// define apply1 for tuple_meta_transform_impl
-template <typename UnaryMetaFunctionClass, class Arg>
-struct apply1 : UnaryMetaFunctionClass::template apply<Arg>
-{}; // end apply1
-
-// define apply2 for tuple_meta_accumulate_impl
-template <typename UnaryMetaFunctionClass, class Arg1, class Arg2>
-struct apply2 : UnaryMetaFunctionClass::template apply<Arg1, Arg2>
-{}; // end apply2
-
-// Meta-accumulate algorithm for tuples. Note: The template
-// parameter StartType corresponds to the initial value in
-// ordinary accumulation.
-//
-template <class Tuple, class BinaryMetaFun, class StartType>
-struct tuple_meta_accumulate;
-
-template <class BinaryMetaFun, typename StartType>
-struct tuple_meta_accumulate<thrust::tuple<>, BinaryMetaFun, StartType>
-{
-  using type = typename _THRUST_STD::type_identity<StartType>::type;
-};
-
-template <class BinaryMetaFun, typename StartType, typename T, typename... Ts>
-struct tuple_meta_accumulate<thrust::tuple<T, Ts...>, BinaryMetaFun, StartType>
-{
-  using type =
-    typename apply2<BinaryMetaFun,
-                    T,
-                    typename tuple_meta_accumulate<thrust::tuple<Ts...>, BinaryMetaFun, StartType>::type>::type;
-};
-
-template <typename Fun>
-inline THRUST_HOST_DEVICE Fun tuple_for_each_helper(Fun f)
-{
-  return f;
-}
-
-template <typename Fun, typename T, typename... Ts>
-inline THRUST_HOST_DEVICE Fun tuple_for_each_helper(Fun f, T& t, Ts&... ts)
-{
-  f(t);
-  return tuple_for_each_helper(f, ts...);
-}
-
-// for_each algorithm for tuples.
-
-template <typename Fun, typename... Ts, size_t... Is>
-inline THRUST_HOST_DEVICE Fun tuple_for_each(thrust::tuple<Ts...>& t, Fun f, thrust::index_sequence<Is...>)
-{
-  return tuple_for_each_helper(f, thrust::get<Is>(t)...);
-} // end tuple_for_each()
-
-// for_each algorithm for tuples.
-template <typename Fun, typename... Ts>
-inline THRUST_HOST_DEVICE Fun tuple_for_each(thrust::tuple<Ts...>& t, Fun f)
-{
-  return tuple_for_each(t, f, thrust::make_index_sequence<thrust::tuple_size<thrust::tuple<Ts...>>::value>{});
-}
-
-} // namespace tuple_impl_specific
-
-namespace internal
-{
-
-template <typename Iterator>
-struct iterator_value
-{
-  using type = thrust::detail::it_value_t<Iterator>;
-};
-
-} // namespace internal
-
-// Metafunction to obtain the type of the tuple whose element types
-// are the value_types of an iterator tuple.
-//
-template <typename IteratorTuple>
-struct tuple_of_value_types : tuple_meta_transform<IteratorTuple, internal::iterator_value>
-{}; // end tuple_of_value_types
-
-struct minimum_category_lambda
-{
-  template <typename T1, typename T2>
-  struct apply : minimum_category<T1, T2>
-  {};
-};
-
-// Metafunction to obtain the minimal traversal tag in a tuple
-// of iterators.
-//
-template <typename IteratorTuple>
-struct minimum_traversal_category_in_iterator_tuple
-{
-  using tuple_of_traversal_tags = typename tuple_meta_transform<IteratorTuple, thrust::iterator_traversal>::type;
-
-  using type = typename tuple_impl_specific::
-    tuple_meta_accumulate<tuple_of_traversal_tags, minimum_category_lambda, thrust::random_access_traversal_tag>::type;
-};
-
-struct minimum_system_lambda
-{
-  template <typename T1, typename T2>
-  struct apply : minimum_system<T1, T2>
-  {};
-};
-
-// Metafunction to obtain the minimal system tag in a tuple
-// of iterators.
-template <typename IteratorTuple>
-struct minimum_system_in_iterator_tuple
-{
-  using tuple_of_system_tags =
-    typename thrust::detail::tuple_meta_transform<IteratorTuple, thrust::iterator_system>::type;
-
-  using type = typename tuple_impl_specific::
-    tuple_meta_accumulate<tuple_of_system_tags, minimum_system_lambda, thrust::any_system_tag>::type;
-};
-
-namespace zip_iterator_base_ns
-{
-
-template <typename Tuple, typename IndexSequence>
-struct tuple_of_iterator_references_helper;
-
-template <typename Tuple, size_t... Is>
-struct tuple_of_iterator_references_helper<Tuple, thrust::index_sequence<Is...>>
-{
-  using type = thrust::detail::tuple_of_iterator_references<typename thrust::tuple_element<Is, Tuple>::type...>;
-};
-
-template <typename Iterator>
-struct iterator_reference
-{
-  using type = typename ::std::iterator_traits<Iterator>::reference;
-};
-
-template <typename IteratorTuple>
-struct tuple_of_iterator_references
-{
-  // get a thrust::tuple of the iterators' references
-  using tuple_of_references = typename tuple_meta_transform<IteratorTuple, iterator_reference>::type;
-
-  // map thrust::tuple<T...> to tuple_of_iterator_references<T...>
-  using type = typename tuple_of_iterator_references_helper<
-    tuple_of_references,
-    thrust::make_index_sequence<thrust::tuple_size<tuple_of_references>::value>>::type;
-};
-
-} // namespace zip_iterator_base_ns
-
-///////////////////////////////////////////////////////////////////
-//
-// Class make_zip_iterator_base
-//
-// Builds and exposes the iterator facade type from which the zip
-// iterator will be derived.
-//
-template <typename IteratorTuple>
-struct make_zip_iterator_base
-{
-  // private:
-  //  reference type is the type of the tuple obtained from the
-  //  iterators' reference types.
-  using reference = typename zip_iterator_base_ns::tuple_of_iterator_references<IteratorTuple>::type;
-
-  // Boost's Value type is the same as reference type.
-  // using value_type = reference;
-  using value_type = typename tuple_of_value_types<IteratorTuple>::type;
-
-  // Difference type is the first iterator's difference type
-  using difference_type = thrust::detail::it_difference_t<typename thrust::tuple_element<0, IteratorTuple>::type>;
-
-  // Iterator system is the minimum system tag in the
-  // iterator tuple
-  using system = typename minimum_system_in_iterator_tuple<IteratorTuple>::type;
-
-  // Traversal category is the minimum traversal category in the
-  // iterator tuple
-  using traversal_category = typename minimum_traversal_category_in_iterator_tuple<IteratorTuple>::type;
-
-public:
-  // The iterator facade type from which the zip iterator will
-  // be derived.
-  using type = thrust::
-    iterator_facade<zip_iterator<IteratorTuple>, value_type, system, traversal_category, reference, difference_type>;
-}; // end make_zip_iterator_base
-
-namespace internal
-{
-
-template <typename Tuple,
-          template <typename>
-          class UnaryMetaFunction,
-          typename UnaryFunction,
-          typename IndexSequence = thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>>
-struct tuple_transform_functor;
-
-template <typename Tuple, template <typename> class UnaryMetaFunction, typename UnaryFunction, size_t... Is>
-struct tuple_transform_functor<Tuple, UnaryMetaFunction, UnaryFunction, thrust::index_sequence<Is...>>
-{
-  static THRUST_HOST_DEVICE typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple& t, UnaryFunction f)
-  {
-    using XfrmTuple = typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type;
-
-    return XfrmTuple(f(thrust::get<Is>(t))...);
-  }
-};
-
-template <template <typename> class UnaryMetaFunction, typename Tuple, typename UnaryFunction>
-typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type THRUST_HOST_DEVICE
-tuple_host_device_transform(const Tuple& t, UnaryFunction f)
-{
-  return tuple_transform_functor<Tuple, UnaryMetaFunction, UnaryFunction>::do_it_on_the_host_or_device(t, f);
-}
-
-} // namespace internal
-#endif
 } // namespace detail
 
 //! \addtogroup iterators
@@ -524,7 +231,6 @@ class THRUST_DECLSPEC_EMPTY_BASES zip_iterator : public detail::make_zip_iterato
 
   friend class iterator_core_access;
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   using index_seq = make_index_sequence<_THRUST_STD::tuple_size_v<IteratorTuple>>;
 
   THRUST_EXEC_CHECK_DISABLE
@@ -533,19 +239,11 @@ class THRUST_DECLSPEC_EMPTY_BASES zip_iterator : public detail::make_zip_iterato
   {
     return {*_THRUST_STD::get<Is>(m_iterator_tuple)...};
   }
-#endif
 
   // Dereferencing returns a tuple built from the dereferenced iterators in the iterator tuple.
   THRUST_HOST_DEVICE typename super_t::reference dereference() const
   {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     return dereference_impl(index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
-
-    return thrust::detail::internal::tuple_host_device_transform<detail::dereference_iterator::template apply>(
-      get_iterator_tuple(), detail::dereference_iterator());
-#endif
   }
 
   // Two zip_iterators are equal if the two first iterators of the tuple are equal. Note this differs from Boost's
@@ -557,64 +255,43 @@ class THRUST_DECLSPEC_EMPTY_BASES zip_iterator : public detail::make_zip_iterato
     return get<0>(get_iterator_tuple()) == get<0>(other.get_iterator_tuple());
   }
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   THRUST_EXEC_CHECK_DISABLE
   template <size_t... Is>
   inline THRUST_HOST_DEVICE void advance_impl(typename super_t::difference_type n, index_sequence<Is...>)
   {
     (..., _THRUST_STD::advance(_THRUST_STD::get<Is>(m_iterator_tuple), n));
   }
-#endif
 
   // Advancing a zip_iterator means to advance all iterators in the tuple
   inline THRUST_HOST_DEVICE void advance(typename super_t::difference_type n)
   {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     advance_impl(n, index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
-    tuple_for_each(m_iterator_tuple, detail::advance_iterator<typename super_t::difference_type>(n));
-#endif
   }
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   THRUST_EXEC_CHECK_DISABLE
   template <size_t... Is>
   inline THRUST_HOST_DEVICE void increment_impl(index_sequence<Is...>)
   {
     (..., ++_THRUST_STD::get<Is>(m_iterator_tuple));
   }
-#endif
 
   // Incrementing a zip iterator means to increment all iterators in the tuple
   inline THRUST_HOST_DEVICE void increment()
   {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     increment_impl(index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
-    tuple_for_each(m_iterator_tuple, detail::increment_iterator());
-#endif
   }
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   THRUST_EXEC_CHECK_DISABLE
   template <size_t... Is>
   inline THRUST_HOST_DEVICE void decrement_impl(index_sequence<Is...>)
   {
     (..., --_THRUST_STD::get<Is>(m_iterator_tuple));
   }
-#endif
 
   // Decrementing a zip iterator means to decrement all iterators in the tuple
   inline THRUST_HOST_DEVICE void decrement()
   {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     decrement_impl(index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
-    tuple_for_each(m_iterator_tuple, detail::decrement_iterator());
-#endif
   }
 
   // Distance is calculated using the first iterator in the tuple.

From bb0c0d6b21fc8eee22986c3f806c89a77936f84f Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 16:19:31 -0400
Subject: [PATCH 29/48] refactor(rocthrust): CCCL 4b2201184c4/ee141c6b175
 parity - hip uninitialized_copy delegates to copy_n

Related upstream commit: 4b2201184c4 Use `thrust::copy` in `thrust::uninitialized_copy[_n]` in CUDA system when possible (NVIDIA/cccl#5181)
Related upstream commit: ee141c6b175 Fix uninitialized read in uninitialized_copy_n (NVIDIA/cccl#5811)
Related local port commit: 9d7099b1e54
Related local port commit: c91e8ff7919

Both upstream commits were ported to system/cuda only, with the HIP
counterpart marked "no change: performance-only". Bring system/hip in line:

- hip_rocprim::uninitialized_copy_n now delegates to hip_rocprim::copy_n
  when the output value type is trivially constructible from, and
  trivially assignable from, the input reference (the #5811 condition).
  For trivially relocatable device-to-device copies this turns the
  placement-new parallel_for kernel into a hipMemcpyAsync.
- copy_n is forward-declared rather than included, as upstream does, to
  avoid the circular include via internal/copy_cross_system.h.
- Includes follow upstream's granular libhipcxx headers
  (__iterator/distance.h, __iterator/incrementable_traits.h, and the
  is_trivially_{constructible,assignable} traits actually used).

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../system/hip/detail/uninitialized_copy.h    | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
index d63f2da79dbc..6454408aa08b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
@@ -38,12 +38,15 @@
 #endif // no system header
 
 #if THRUST_HAS_HIP_COMPILER()
-#  include <thrust/distance.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__iterator/incrementable_traits.h)
 #  include _THRUST_STD_INCLUDE(__new/device_new.h)
+#  include _THRUST_STD_INCLUDE(__type_traits/is_trivially_assignable.h)
+#  include _THRUST_STD_INCLUDE(__type_traits/is_trivially_constructible.h)
 
 #  include <iterator>
 
@@ -51,6 +54,11 @@ THRUST_NAMESPACE_BEGIN
 
 namespace hip_rocprim
 {
+// forward declare and not include thrust/system/hip/detail/copy.h to avoid a circular dependency
+template <class System, class InputIterator, class Size, class OutputIterator>
+OutputIterator THRUST_HOST_DEVICE
+copy_n(execution_policy<System>& system, InputIterator first, Size n, OutputIterator result);
+
 namespace __uninitialized_copy
 {
 template <class InputIt, class OutputIt>
@@ -78,7 +86,21 @@ template <class Derived, class InputIt, class Size, class OutputIt>
 OutputIt THRUST_HOST_DEVICE
 uninitialized_copy_n(execution_policy<Derived>& policy, InputIt first, Size count, OutputIt result)
 {
-  hip_rocprim::parallel_for(policy, __uninitialized_copy::functor<InputIt, OutputIt>{first, result}, count);
+  // if the output type is trivially constructible from the input, it has no side effect, and we can skip placement new
+  // and calling a constructor. Furthermore, if assigning an input to an output element is also trivial, there is no
+  // copy constructor which could have a side effect and we can delegate to copy_n.
+  using input_ref_t  = thrust::detail::raw_reference_t<_THRUST_STD::iter_reference_t<InputIt>>;
+  using output_ref_t = thrust::detail::raw_reference_t<_THRUST_STD::iter_reference_t<OutputIt>>;
+  using output_t     = thrust::detail::it_value_t<OutputIt>;
+  if constexpr (_THRUST_STD::is_trivially_constructible_v<output_t, input_ref_t>
+                && _THRUST_STD::is_trivially_assignable_v<output_ref_t, input_ref_t>)
+  {
+    hip_rocprim::copy_n(policy, first, count, result);
+  }
+  else
+  {
+    hip_rocprim::parallel_for(policy, __uninitialized_copy::functor<InputIt, OutputIt>{first, result}, count);
+  }
 
   return result + count;
 }

From 0db51794513ed5f7965eb2f618c7e4eef4513770 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 16:19:58 -0400
Subject: [PATCH 30/48] refactor(rocthrust): CCCL 1ceac3731d5 parity - hip
 replace uses shared new_value_if_f

Related upstream commit: 1ceac3731d5 Improve `thrust::cuda_cub::replace` functor handling (NVIDIA/cccl#5949)
Related local port commit: 3d25701be6a

The local port added the generic thrust::detail::new_value_if_f (with its
proclaims_copyable_arguments specialization) to detail/internal_functional.h
and moved system/cuda onto it, but left system/hip on its own copy as
"no change: performance-only". Bring system/hip in line:

- Drop hip's private __replace::new_value_if_f; replace_copy_if uses
  thrust::detail::new_value_if_f, as upstream's cuda backend does.
- replace() uses thrust::detail::equal_to_value<T> instead of the
  `_1 == old_value` placeholder expression, as upstream.
- __replace::constant_f is kept: upstream switched to CUB's
  detail::__return_constant, which has no rocThrust/libhipcxx equivalent.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/hip/detail/replace.h        | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/replace.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/replace.h
index 3ccae229f1d6..41928d83a3fe 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/replace.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/replace.h
@@ -58,34 +58,14 @@ struct constant_f
     return value;
   }
 };
-
-template <class Predicate, class NewType, class OutputType>
-struct new_value_if_f
-{
-  Predicate pred;
-  NewType new_value;
-
-  template <class T>
-  OutputType THRUST_HIP_DEVICE_FUNCTION operator()(T const& x)
-  {
-    return pred(x) ? new_value : x;
-  }
-
-  template <class T, class P>
-  OutputType THRUST_HIP_DEVICE_FUNCTION operator()(T const& x, P const& y)
-  {
-    return pred(y) ? new_value : x;
-  }
-};
-
 } // namespace __replace
 
 template <class Derived, class Iterator, class T>
 void THRUST_HOST_DEVICE
 replace(execution_policy<Derived>& policy, Iterator first, Iterator last, T const& old_value, T const& new_value)
 {
-  using thrust::placeholders::_1;
-  hip_rocprim::transform_if(policy, first, last, first, __replace::constant_f<T>{new_value}, _1 == old_value);
+  hip_rocprim::transform_if(
+    policy, first, last, first, __replace::constant_f<T>{new_value}, thrust::detail::equal_to_value<T>{old_value});
 }
 
 template <class Derived, class Iterator, class Predicate, class T>
@@ -117,7 +97,7 @@ OutputIt THRUST_HOST_DEVICE replace_copy_if(
   T const& new_value)
 {
   using output_type    = thrust::detail::it_value_t<OutputIt>;
-  using new_value_if_t = __replace::new_value_if_f<Predicate, T, output_type>;
+  using new_value_if_t = thrust::detail::new_value_if_f<Predicate, T, output_type>;
   return hip_rocprim::transform(policy, first, last, result, new_value_if_t{predicate, new_value});
 }
 
@@ -132,7 +112,7 @@ OutputIt THRUST_HOST_DEVICE replace_copy_if(
   T const& new_value)
 {
   using output_type    = thrust::detail::it_value_t<OutputIt>;
-  using new_value_if_t = __replace::new_value_if_f<Predicate, T, output_type>;
+  using new_value_if_t = thrust::detail::new_value_if_f<Predicate, T, output_type>;
   return hip_rocprim::transform(policy, first, last, stencil, result, new_value_if_t{predicate, new_value});
 }
 

From 4698506025182fd81edb34c6d305c551e99ef105 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 16:20:37 -0400
Subject: [PATCH 31/48] refactor(rocthrust): CCCL ad70011e990 parity - hip
 tabulate is a transform over counting_iterator

Related upstream commit: ad70011e990 Support fancy iterators in vectorized transform and port thrust::tabulate to it (NVIDIA/cccl#6012)
Related local port commit: 291f437712f

The local port took upstream's cuda tabulate.h but left system/hip on its
own parallel_for functor as "no change: performance-only". Bring
system/hip in line with upstream's structure:

- Drop __tabulate::functor; tabulate is a transform of
  _THRUST_LIBCXX::counting_iterator<iter_difference_t<Iterator>> into
  the output range, with granular libhipcxx includes as upstream.
- hip has no transform_n overload (NVIDIA/cccl#5238 was cuda-only), so
  hip_rocprim::transform is called with [begin, begin + count).
- tabulate_op is not wrapped in _THRUST_LIBCXX::proclaim_copyable_arguments:
  the proclamation only feeds cub::DeviceTransform, which hip's transform
  does not use, and the wrapper inherits from the functor, so it would
  reject function pointers and final classes for no benefit.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/hip/detail/tabulate.h       | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h
index b85b2a9804b3..587dfc327e36 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h
@@ -40,39 +40,25 @@
 #if THRUST_HAS_HIP_COMPILER()
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/distance.h>
-#  include <thrust/system/hip/detail/parallel_for.h>
+#  include <thrust/system/hip/detail/transform.h>
 #  include <thrust/system/hip/execution_policy.h>
 
+#  include _THRUST_LIBCXX_INCLUDE(__iterator/counting_iterator.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__iterator/incrementable_traits.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
-namespace __tabulate
-{
-template <class Iterator, class TabulateOp>
-struct functor
-{
-  Iterator items;
-  TabulateOp op;
-
-  template <typename Size>
-  void THRUST_DEVICE operator()(Size idx)
-  {
-    items[idx] = op(idx);
-  }
-};
-
-} // namespace __tabulate
-
 template <class Derived, class Iterator, class TabulateOp>
 void THRUST_HOST_DEVICE
 tabulate(execution_policy<Derived>& policy, Iterator first, Iterator last, TabulateOp tabulate_op)
 {
-  using size_type = thrust::detail::it_difference_t<Iterator>;
-  size_type count = _THRUST_STD::distance(first, last);
-  hip_rocprim::parallel_for(policy, __tabulate::functor<Iterator, TabulateOp>{first, tabulate_op}, count);
+  using size_type  = _THRUST_STD::iter_difference_t<Iterator>;
+  const auto count = _THRUST_STD::distance(first, last);
+  const auto begin = _THRUST_LIBCXX::counting_iterator<size_type>{};
+  hip_rocprim::transform(policy, begin, begin + count, first, tabulate_op);
 }
-
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END
 #endif

From 2b563b33e953f2fe71c4c380a19b0034f5090ba3 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 28 Oct 2026 16:23:40 -0400
Subject: [PATCH 32/48] refactor(rocthrust): CCCL 2f39a342b93 parity - fold hip
 par.h/par_to_seq.h into execution_policy.h

Related upstream commit: 2f39a342b93 Refactor Thrust execution policies (NVIDIA/cccl#5821)
Related local port commit: db142f7db9e

The local port applied this refactor to the cuda backend only. Do the same
for hip:
- thrust/system/hip/detail/par.h and par_to_seq.h are removed; their
  contents (execute_on_stream*, par_t, par_nosync_t and the hip-specific
  par_det_t/par_det_nosync_t, and the par/par_nosync/par_det/par_det_nosync
  constants) now live in hip/detail/execution_policy.h. All existing aliases
  in thrust::hip, thrust::system::hip and thrust::system::hip::detail are kept.
- cvt_to_seq takes upstream's simple form (returns thrust::detail::seq_t),
  dropping the unused has_par trait and the #if 0 block.
- hip/detail/util.h forward-declares execution_policy instead of including
  hip/detail/execution_policy.h at the top, as cuda/detail/util.h does. It
  includes it at the bottom so headers that relied on util.h for the policy
  definitions keep working.
- Algorithm headers, temporary_buffer.h, hip/execution_policy.h and the
  allocator_aware_policies tests include hip/detail/execution_policy.h
  instead of the removed headers.

Compatibility: code that includes thrust/system/hip/detail/par.h or
par_to_seq.h directly must switch to thrust/system/hip/execution_policy.h.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../test/test_allocator_aware_policies.cpp    |   2 +-
 .../testing/allocator_aware_policies.cu       |   2 +-
 .../system/hip/detail/adjacent_difference.h   |   2 +-
 .../thrust/system/hip/detail/binary_search.h  |   2 +-
 .../rocthrust/thrust/system/hip/detail/copy.h |   1 -
 .../thrust/system/hip/detail/copy_if.h        |   2 +-
 .../system/hip/detail/execution_policy.h      | 323 +++++++++++++++-
 .../rocthrust/thrust/system/hip/detail/par.h  | 358 ------------------
 .../thrust/system/hip/detail/par_to_seq.h     |  96 -----
 .../thrust/system/hip/detail/partition.h      |   2 +-
 .../thrust/system/hip/detail/reduce.h         |   2 +-
 .../thrust/system/hip/detail/reduce_by_key.h  |   2 +-
 .../thrust/system/hip/detail/scan_by_key.h    |   2 +-
 .../thrust/system/hip/detail/set_operations.h |   1 -
 .../rocthrust/thrust/system/hip/detail/sort.h |   1 -
 .../system/hip/detail/temporary_buffer.h      |   2 +-
 .../system/hip/detail/transform_reduce.h      |   2 +-
 .../thrust/system/hip/detail/unique.h         |   2 +-
 .../thrust/system/hip/detail/unique_by_key.h  |   2 +-
 .../rocthrust/thrust/system/hip/detail/util.h |   8 +-
 .../thrust/system/hip/execution_policy.h      |   1 -
 21 files changed, 330 insertions(+), 485 deletions(-)
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par.h
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par_to_seq.h

diff --git a/projects/hipccl/hipccl3/rocthrust/test/test_allocator_aware_policies.cpp b/projects/hipccl/hipccl3/rocthrust/test/test_allocator_aware_policies.cpp
index 96ece7afada8..b0448c9a8ff4 100644
--- a/projects/hipccl/hipccl3/rocthrust/test/test_allocator_aware_policies.cpp
+++ b/projects/hipccl/hipccl3/rocthrust/test/test_allocator_aware_policies.cpp
@@ -18,7 +18,7 @@
 #include <thrust/detail/libcxx_wrapper/__cccl_config.h>
 #include <thrust/detail/seq.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
-#include <thrust/system/hip/detail/par.h>
+#include <thrust/system/hip/detail/execution_policy.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/testing/allocator_aware_policies.cu b/projects/hipccl/hipccl3/rocthrust/testing/allocator_aware_policies.cu
index b95803f9b751..c5b4aa42c899 100644
--- a/projects/hipccl/hipccl3/rocthrust/testing/allocator_aware_policies.cu
+++ b/projects/hipccl/hipccl3/rocthrust/testing/allocator_aware_policies.cu
@@ -18,7 +18,7 @@
 #include <thrust/detail/libcxx_wrapper/__cccl_config.h>
 #include <thrust/detail/seq.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
-#include <thrust/system/hip/detail/par.h>
+#include <thrust/system/hip/detail/execution_policy.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h
index da11231f7192..d3828ca5978f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h
@@ -45,7 +45,7 @@
 #  include <thrust/detail/type_traits.h>
 #  include <thrust/functional.h>
 #  include <thrust/system/hip/detail/dispatch.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
 #  include <thrust/type_traits/unwrap_contiguous_iterator.h>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h
index d219329c750a..758363b54e7f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h
@@ -33,7 +33,7 @@
 #  include <thrust/binary_search.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/execution_policy.h>
 
 #  include _THRUST_STD_INCLUDE(cstdint)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
index a332fa867da4..da5c7b91951a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
@@ -78,7 +78,6 @@ THRUST_NAMESPACE_END
 
 #include <thrust/system/hip/detail/internal/copy_cross_system.h>
 #include <thrust/system/hip/detail/internal/copy_device_to_device.h>
-#include <thrust/system/hip/detail/par_to_seq.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h
index cd114f78901d..e05e4a2bec43 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h
@@ -52,8 +52,8 @@
 #  include <thrust/iterator/iterator_traits.h>
 #  include <thrust/iterator/transform_iterator.h>
 #  include <thrust/system/hip/detail/dispatch.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/general/temp_storage.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
 #  include _THRUST_STD_INCLUDE(cstdint)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h
index fa66f2187baf..62cc94f646d5 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h
@@ -42,13 +42,16 @@
 
 #include <thrust/detail/allocator_aware_execution_policy.h>
 #include <thrust/detail/execution_policy.h>
+#include <thrust/detail/seq.h>
 #include <thrust/iterator/detail/any_system_tag.h>
+#include <thrust/system/hip/detail/util.h>
 #include <thrust/version.h>
 
 THRUST_NAMESPACE_BEGIN
 
 namespace hip_rocprim
 {
+// note: the tag and execution policy need to be defined in the same namespace as the algorithms for ADL to find them
 
 struct tag;
 
@@ -70,45 +73,339 @@ template <class Derived>
 struct execution_policy : thrust::execution_policy<Derived>
 {
   using tag_type = tag;
+
+  // allow conversion to tag when it is not a successor
   THRUST_HOST_DEVICE operator tag() const
   {
     return tag();
   }
 };
 
-} // namespace hip_rocprim
+template <class Derived>
+struct execute_on_stream_base : execution_policy<Derived>
+{
+private:
+  hipStream_t stream;
 
-namespace system
+public:
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE execute_on_stream_base(hipStream_t stream_ = default_stream())
+      : stream(stream_)
+  {}
+
+  THRUST_HIP_RUNTIME_FUNCTION Derived on(hipStream_t const& s) const
+  {
+    Derived result = derived_cast(*this);
+    result.stream  = s;
+    return result;
+  }
+
+private:
+  friend THRUST_HOST_DEVICE hipStream_t get_stream(const execute_on_stream_base& exec)
+  {
+    return exec.stream;
+  }
+};
+
+template <class Derived>
+struct execute_on_stream_nosync_base : execution_policy<Derived>
 {
-namespace hip
+private:
+  hipStream_t stream;
+
+public:
+  THRUST_HOST_DEVICE execute_on_stream_nosync_base(hipStream_t stream_ = default_stream())
+      : stream(stream_)
+  {}
+
+  THRUST_HIP_RUNTIME_FUNCTION Derived on(hipStream_t const& s) const
+  {
+    Derived result = derived_cast(*this);
+    result.stream  = s;
+    return result;
+  }
+
+private:
+  friend THRUST_HOST_DEVICE hipStream_t get_stream(const execute_on_stream_nosync_base& exec)
+  {
+    return exec.stream;
+  }
+
+  friend THRUST_HOST_DEVICE bool must_perform_optional_stream_synchronization(const execute_on_stream_nosync_base&)
+  {
+    return false;
+  }
+};
+
+struct execute_on_stream : execute_on_stream_base<execute_on_stream>
 {
-namespace detail
+  using base_t = execute_on_stream_base<execute_on_stream>;
+
+  THRUST_HOST_DEVICE execute_on_stream()
+      : base_t() {};
+  THRUST_HOST_DEVICE execute_on_stream(hipStream_t stream)
+      : base_t(stream) {};
+};
+
+struct execute_on_stream_nosync : execute_on_stream_nosync_base<execute_on_stream_nosync>
 {
+  using base_t = execute_on_stream_nosync_base<execute_on_stream_nosync>;
 
-using thrust::hip_rocprim::execution_policy;
-using thrust::hip_rocprim::tag;
+  THRUST_HOST_DEVICE execute_on_stream_nosync()
+      : base_t() {};
+  THRUST_HOST_DEVICE execute_on_stream_nosync(hipStream_t stream)
+      : base_t(stream) {};
+};
 
-} // namespace detail
-} // namespace hip
-} // namespace system
+struct par_t
+    : execution_policy<par_t>
+    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_base>
+{
+  using base_t = execution_policy<par_t>;
+
+  THRUST_HOST_DEVICE constexpr par_t()
+      : base_t()
+  {}
+
+  using stream_attachment_type = execute_on_stream;
+
+  THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
+  {
+    return execute_on_stream(stream);
+  }
+};
+
+struct par_nosync_t
+    : execution_policy<par_nosync_t>
+    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_base>
+{
+  using base_t = execution_policy<par_nosync_t>;
+
+  THRUST_HOST_DEVICE constexpr par_nosync_t()
+      : base_t()
+  {}
+
+  using stream_attachment_type = execute_on_stream_nosync;
+
+  THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
+  {
+    return execute_on_stream_nosync(stream);
+  }
+
+private:
+  // this function is defined to allow non-blocking calls on the default_stream() with thrust::hip::par_nosync
+  // without explicitly using thrust::hip::par_nosync.on(default_stream())
+  friend THRUST_HOST_DEVICE bool must_perform_optional_stream_synchronization(const par_nosync_t&)
+  {
+    return false;
+  }
+};
+
+template <class Derived>
+struct execute_on_stream_deterministic_base : execute_on_stream_base<Derived>
+{
+private:
+  using base_t = execute_on_stream_base<Derived>;
+
+public:
+  THRUST_HOST_DEVICE execute_on_stream_deterministic_base()
+      : base_t() {};
+  THRUST_HOST_DEVICE execute_on_stream_deterministic_base(hipStream_t stream)
+      : base_t(stream) {};
+
+private:
+  friend THRUST_HOST_DEVICE integral_constant<bool, false>
+  allows_nondeterminism(const execute_on_stream_deterministic_base&)
+  {
+    return {};
+  }
+};
+
+struct execute_on_stream_deterministic : execute_on_stream_deterministic_base<execute_on_stream_deterministic>
+{
+  using base_t = execute_on_stream_deterministic_base<execute_on_stream_deterministic>;
+
+  THRUST_HOST_DEVICE execute_on_stream_deterministic()
+      : base_t() {};
+  THRUST_HOST_DEVICE execute_on_stream_deterministic(hipStream_t stream)
+      : base_t(stream) {};
+};
+
+struct par_det_t
+    : execution_policy<par_det_t>
+    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_deterministic_base>
+{
+  using base_t = execution_policy<par_det_t>;
+
+  THRUST_HOST_DEVICE constexpr par_det_t()
+      : base_t()
+  {}
+
+  using stream_attachment_type = execute_on_stream_deterministic;
+
+  THRUST_HIP_RUNTIME_FUNCTION
+  stream_attachment_type on(hipStream_t const& stream) const
+  {
+    return execute_on_stream_deterministic(stream);
+  }
+
+private:
+  friend THRUST_HOST_DEVICE integral_constant<bool, false> allows_nondeterminism(const par_det_t&)
+  {
+    return {};
+  }
+};
+
+template <class Derived>
+struct execute_on_stream_nosync_deterministic_base : execute_on_stream_nosync_base<Derived>
+{
+private:
+  using base_t = execute_on_stream_nosync_base<Derived>;
+
+public:
+  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic_base()
+      : base_t() {};
+  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic_base(hipStream_t stream)
+      : base_t(stream) {};
+
+private:
+  friend THRUST_HOST_DEVICE integral_constant<bool, false>
+  allows_nondeterminism(const execute_on_stream_nosync_deterministic_base&)
+  {
+    return {};
+  }
+};
+
+struct execute_on_stream_nosync_deterministic
+    : execute_on_stream_nosync_deterministic_base<execute_on_stream_nosync_deterministic>
+{
+  using base_t = execute_on_stream_nosync_deterministic_base<execute_on_stream_nosync_deterministic>;
+
+  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic()
+      : base_t() {};
+  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic(hipStream_t stream)
+      : base_t(stream) {};
+};
+
+struct par_det_nosync_t
+    : execution_policy<par_det_nosync_t>
+    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_deterministic_base>
+{
+  using base_t = execution_policy<par_det_nosync_t>;
+
+  THRUST_HOST_DEVICE constexpr par_det_nosync_t()
+      : base_t()
+  {}
+
+  using stream_attachment_type = execute_on_stream_nosync_deterministic;
+
+  THRUST_HIP_RUNTIME_FUNCTION
+  stream_attachment_type on(hipStream_t const& stream) const
+  {
+    return execute_on_stream_nosync_deterministic(stream);
+  }
+
+private:
+  friend THRUST_HOST_DEVICE integral_constant<bool, false> allows_nondeterminism(const par_det_nosync_t&)
+  {
+    return {};
+  }
+};
+
+THRUST_GLOBAL_CONSTANT par_t par;
+
+/*! \p thrust::hip::par_nosync is a parallel execution policy targeting Thrust's CUDA device backend.
+ *  Similar to \p thrust::hip::par it allows execution of Thrust algorithms in a specific CUDA stream.
+ *
+ *  \p thrust::hip::par_nosync indicates that an algorithm is free to avoid any synchronization of the
+ *  associated stream that is not strictly required for correctness. Additionally, algorithms may return
+ *  before the corresponding kernels are completed, similar to asynchronous kernel launches via <<< >>> syntax.
+ *  The user must take care to perform explicit synchronization if necessary.
+ *
+ *  The following code snippet demonstrates how to use \p thrust::hip::par_nosync :
+ *
+ *  \code
+ *    #include <thrust/device_vector.h>
+ *    #include <thrust/for_each.h>
+ *    #include <thrust/execution_policy.h>
+ *
+ *    struct IncFunctor{
+ *        __host__ __device__
+ *        void operator()(std::size_t& x){ x = x + 1; };
+ *    };
+ *
+ *    int main(){
+ *        std::size_t N = 1000000;
+ *        thrust::device_vector<std::size_t> d_vec(N);
+ *
+ *        hipStream_t stream;
+ *        hipStreamCreate(&stream);
+ *        auto nosync_policy = thrust::hip::par_nosync.on(stream);
+ *
+ *        thrust::for_each(nosync_policy, d_vec.begin(), d_vec.end(), IncFunctor{});
+ *        thrust::for_each(nosync_policy, d_vec.begin(), d_vec.end(), IncFunctor{});
+ *        thrust::for_each(nosync_policy, d_vec.begin(), d_vec.end(), IncFunctor{});
+ *
+ *        //for_each may return before completion. Could do other cpu work in the meantime
+ *        // ...
+ *
+ *        //Wait for the completion of all for_each kernels
+ *        hipStreamSynchronize(stream);
+ *
+ *        std::size_t x = thrust::reduce(nosync_policy, d_vec.begin(), d_vec.end());
+ *        //Currently, this synchronization is not necessary. reduce will still perform
+ *        //implicit synchronization to transfer the reduced value to the host to return it.
+ *        hipStreamSynchronize(stream);
+ *        hipStreamDestroy(stream);
+ *    }
+ *  \endcode
+ *
+ */
+THRUST_GLOBAL_CONSTANT par_nosync_t par_nosync;
+THRUST_GLOBAL_CONSTANT par_det_t par_det;
+THRUST_GLOBAL_CONSTANT par_det_nosync_t par_det_nosync;
+template <class Policy>
+auto THRUST_HOST_DEVICE cvt_to_seq(Policy&) -> thrust::detail::seq_t
+{
+  // TODO(bgruber): we completely discard the previous policy, including any allocators it contains. A proper
+  // implementation would carry over this information to the sequential policy. However, AFAIK no sequential algorithm
+  // uses any such information for now.
+  return {};
+}
+} // namespace hip_rocprim
+
+// aliases:
 
 namespace system
 {
 namespace hip
 {
-
 using thrust::hip_rocprim::execution_policy;
+using thrust::hip_rocprim::par;
+using thrust::hip_rocprim::par_det;
+using thrust::hip_rocprim::par_det_nosync;
+using thrust::hip_rocprim::par_nosync;
 using thrust::hip_rocprim::tag;
-
+namespace detail
+{
+using thrust::hip_rocprim::execution_policy;
+using thrust::hip_rocprim::par_det_nosync_t;
+using thrust::hip_rocprim::par_det_t;
+using thrust::hip_rocprim::par_nosync_t;
+using thrust::hip_rocprim::par_t;
+using thrust::hip_rocprim::tag;
+} // namespace detail
 } // namespace hip
 } // namespace system
 
 namespace hip
 {
-
 using thrust::hip_rocprim::execution_policy;
+using thrust::hip_rocprim::par;
+using thrust::hip_rocprim::par_det;
+using thrust::hip_rocprim::par_det_nosync;
+using thrust::hip_rocprim::par_nosync;
 using thrust::hip_rocprim::tag;
-
 } // namespace hip
 
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par.h
deleted file mode 100644
index cb0a1e237398..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/allocator_aware_execution_policy.h>
-#include <thrust/system/hip/detail/execution_policy.h>
-#include <thrust/system/hip/detail/util.h>
-
-THRUST_NAMESPACE_BEGIN
-namespace hip_rocprim
-{
-
-template <class Derived>
-struct execute_on_stream_base : execution_policy<Derived>
-{
-private:
-  hipStream_t stream;
-
-public:
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE execute_on_stream_base(hipStream_t stream_ = default_stream())
-      : stream(stream_)
-  {}
-
-  THRUST_HIP_RUNTIME_FUNCTION Derived on(hipStream_t const& s) const
-  {
-    Derived result = derived_cast(*this);
-    result.stream  = s;
-    return result;
-  }
-
-private:
-  friend THRUST_HOST_DEVICE hipStream_t get_stream(const execute_on_stream_base& exec)
-  {
-    return exec.stream;
-  }
-};
-
-template <class Derived>
-struct execute_on_stream_nosync_base : execution_policy<Derived>
-{
-private:
-  hipStream_t stream;
-
-public:
-  THRUST_HOST_DEVICE execute_on_stream_nosync_base(hipStream_t stream_ = default_stream())
-      : stream(stream_)
-  {}
-
-  THRUST_HIP_RUNTIME_FUNCTION Derived on(hipStream_t const& s) const
-  {
-    Derived result = derived_cast(*this);
-    result.stream  = s;
-    return result;
-  }
-
-private:
-  friend THRUST_HOST_DEVICE hipStream_t get_stream(const execute_on_stream_nosync_base& exec)
-  {
-    return exec.stream;
-  }
-
-  friend THRUST_HOST_DEVICE bool must_perform_optional_stream_synchronization(const execute_on_stream_nosync_base&)
-  {
-    return false;
-  }
-};
-
-struct execute_on_stream : execute_on_stream_base<execute_on_stream>
-{
-  using base_t = execute_on_stream_base<execute_on_stream>;
-
-  THRUST_HOST_DEVICE execute_on_stream()
-      : base_t(){};
-  THRUST_HOST_DEVICE execute_on_stream(hipStream_t stream)
-      : base_t(stream){};
-};
-
-struct execute_on_stream_nosync : execute_on_stream_nosync_base<execute_on_stream_nosync>
-{
-  using base_t = execute_on_stream_nosync_base<execute_on_stream_nosync>;
-
-  THRUST_HOST_DEVICE execute_on_stream_nosync()
-      : base_t(){};
-  THRUST_HOST_DEVICE execute_on_stream_nosync(hipStream_t stream)
-      : base_t(stream){};
-};
-
-struct par_t
-    : execution_policy<par_t>
-    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_base>
-{
-  using base_t = execution_policy<par_t>;
-
-  THRUST_HOST_DEVICE constexpr par_t()
-      : base_t()
-  {}
-
-  using stream_attachment_type = execute_on_stream;
-
-  THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
-  {
-    return execute_on_stream(stream);
-  }
-};
-
-struct par_nosync_t
-    : execution_policy<par_nosync_t>
-    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_base>
-{
-  using base_t = execution_policy<par_nosync_t>;
-
-  THRUST_HOST_DEVICE constexpr par_nosync_t()
-      : base_t()
-  {}
-
-  using stream_attachment_type = execute_on_stream_nosync;
-
-  THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
-  {
-    return execute_on_stream_nosync(stream);
-  }
-
-private:
-  // this function is defined to allow non-blocking calls on the default_stream() with thrust::hip::par_nosync
-  // without explicitly using thrust::hip::par_nosync.on(default_stream())
-  friend THRUST_HOST_DEVICE bool must_perform_optional_stream_synchronization(const par_nosync_t&)
-  {
-    return false;
-  }
-};
-
-template <class Derived>
-struct execute_on_stream_deterministic_base : execute_on_stream_base<Derived>
-{
-private:
-  using base_t = execute_on_stream_base<Derived>;
-
-public:
-  THRUST_HOST_DEVICE execute_on_stream_deterministic_base()
-      : base_t(){};
-  THRUST_HOST_DEVICE execute_on_stream_deterministic_base(hipStream_t stream)
-      : base_t(stream){};
-
-private:
-  friend THRUST_HOST_DEVICE integral_constant<bool, false>
-  allows_nondeterminism(const execute_on_stream_deterministic_base&)
-  {
-    return {};
-  }
-};
-
-struct execute_on_stream_deterministic : execute_on_stream_deterministic_base<execute_on_stream_deterministic>
-{
-  using base_t = execute_on_stream_deterministic_base<execute_on_stream_deterministic>;
-
-  THRUST_HOST_DEVICE execute_on_stream_deterministic()
-      : base_t(){};
-  THRUST_HOST_DEVICE execute_on_stream_deterministic(hipStream_t stream)
-      : base_t(stream){};
-};
-
-struct par_det_t
-    : execution_policy<par_det_t>
-    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_deterministic_base>
-{
-  using base_t = execution_policy<par_det_t>;
-
-  THRUST_HOST_DEVICE constexpr par_det_t()
-      : base_t()
-  {}
-
-  using stream_attachment_type = execute_on_stream_deterministic;
-
-  THRUST_HIP_RUNTIME_FUNCTION
-  stream_attachment_type on(hipStream_t const& stream) const
-  {
-    return execute_on_stream_deterministic(stream);
-  }
-
-private:
-  friend THRUST_HOST_DEVICE integral_constant<bool, false> allows_nondeterminism(const par_det_t&)
-  {
-    return {};
-  }
-};
-
-template <class Derived>
-struct execute_on_stream_nosync_deterministic_base : execute_on_stream_nosync_base<Derived>
-{
-private:
-  using base_t = execute_on_stream_nosync_base<Derived>;
-
-public:
-  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic_base()
-      : base_t(){};
-  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic_base(hipStream_t stream)
-      : base_t(stream){};
-
-private:
-  friend THRUST_HOST_DEVICE integral_constant<bool, false>
-  allows_nondeterminism(const execute_on_stream_nosync_deterministic_base&)
-  {
-    return {};
-  }
-};
-
-struct execute_on_stream_nosync_deterministic
-    : execute_on_stream_nosync_deterministic_base<execute_on_stream_nosync_deterministic>
-{
-  using base_t = execute_on_stream_nosync_deterministic_base<execute_on_stream_nosync_deterministic>;
-
-  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic()
-      : base_t(){};
-  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic(hipStream_t stream)
-      : base_t(stream){};
-};
-
-struct par_det_nosync_t
-    : execution_policy<par_det_nosync_t>
-    , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_deterministic_base>
-{
-  using base_t = execution_policy<par_det_nosync_t>;
-
-  THRUST_HOST_DEVICE constexpr par_det_nosync_t()
-      : base_t()
-  {}
-
-  using stream_attachment_type = execute_on_stream_nosync_deterministic;
-
-  THRUST_HIP_RUNTIME_FUNCTION
-  stream_attachment_type on(hipStream_t const& stream) const
-  {
-    return execute_on_stream_nosync_deterministic(stream);
-  }
-
-private:
-  friend THRUST_HOST_DEVICE integral_constant<bool, false> allows_nondeterminism(const par_det_nosync_t&)
-  {
-    return {};
-  }
-};
-
-THRUST_GLOBAL_CONSTANT par_t par;
-
-/*! \p thrust::hip::par_nosync is a parallel execution policy targeting Thrust's CUDA device backend.
- *  Similar to \p thrust::hip::par it allows execution of Thrust algorithms in a specific CUDA stream.
- *
- *  \p thrust::hip::par_nosync indicates that an algorithm is free to avoid any synchronization of the
- *  associated stream that is not strictly required for correctness. Additionally, algorithms may return
- *  before the corresponding kernels are completed, similar to asynchronous kernel launches via <<< >>> syntax.
- *  The user must take care to perform explicit synchronization if necessary.
- *
- *  The following code snippet demonstrates how to use \p thrust::hip::par_nosync :
- *
- *  \code
- *    #include <thrust/device_vector.h>
- *    #include <thrust/for_each.h>
- *    #include <thrust/execution_policy.h>
- *
- *    struct IncFunctor{
- *        __host__ __device__
- *        void operator()(std::size_t& x){ x = x + 1; };
- *    };
- *
- *    int main(){
- *        std::size_t N = 1000000;
- *        thrust::device_vector<std::size_t> d_vec(N);
- *
- *        hipStream_t stream;
- *        hipStreamCreate(&stream);
- *        auto nosync_policy = thrust::hip::par_nosync.on(stream);
- *
- *        thrust::for_each(nosync_policy, d_vec.begin(), d_vec.end(), IncFunctor{});
- *        thrust::for_each(nosync_policy, d_vec.begin(), d_vec.end(), IncFunctor{});
- *        thrust::for_each(nosync_policy, d_vec.begin(), d_vec.end(), IncFunctor{});
- *
- *        //for_each may return before completion. Could do other cpu work in the meantime
- *        // ...
- *
- *        //Wait for the completion of all for_each kernels
- *        hipStreamSynchronize(stream);
- *
- *        std::size_t x = thrust::reduce(nosync_policy, d_vec.begin(), d_vec.end());
- *        //Currently, this synchronization is not necessary. reduce will still perform
- *        //implicit synchronization to transfer the reduced value to the host to return it.
- *        hipStreamSynchronize(stream);
- *        hipStreamDestroy(stream);
- *    }
- *  \endcode
- *
- */
-THRUST_GLOBAL_CONSTANT par_nosync_t par_nosync;
-THRUST_GLOBAL_CONSTANT par_det_t par_det;
-THRUST_GLOBAL_CONSTANT par_det_nosync_t par_det_nosync;
-} // namespace hip_rocprim
-
-namespace system
-{
-namespace hip
-{
-using thrust::hip_rocprim::par;
-using thrust::hip_rocprim::par_det;
-using thrust::hip_rocprim::par_det_nosync;
-using thrust::hip_rocprim::par_nosync;
-namespace detail
-{
-using thrust::hip_rocprim::par_det_nosync_t;
-using thrust::hip_rocprim::par_det_t;
-using thrust::hip_rocprim::par_nosync_t;
-using thrust::hip_rocprim::par_t;
-} // namespace detail
-} // namespace hip
-} // namespace system
-
-namespace hip
-{
-using thrust::hip_rocprim::par;
-using thrust::hip_rocprim::par_det;
-using thrust::hip_rocprim::par_det_nosync;
-using thrust::hip_rocprim::par_nosync;
-} // namespace hip
-
-THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par_to_seq.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par_to_seq.h
deleted file mode 100644
index 43797f57d5ca..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/par_to_seq.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/seq.h>
-#include <thrust/system/hip/detail/par.h>
-
-THRUST_NAMESPACE_BEGIN
-namespace hip_rocprim
-{
-
-template <int PAR>
-struct has_par : _THRUST_STD::true_type
-{};
-
-template <>
-struct has_par<0> : _THRUST_STD::false_type
-{};
-
-template <class Policy>
-struct cvt_to_seq_impl
-{
-  using seq_t = thrust::detail::seq_t;
-
-  static seq_t THRUST_HOST_DEVICE doit(Policy&)
-  {
-    return seq_t();
-  }
-}; // cvt_to_seq_impl
-
-#if 0
-template <class Allocator>
-struct cvt_to_seq_impl<
-    thrust::detail::execute_with_allocator<Allocator,
-                                           execute_on_stream_base> >
-{
-  using Policy = thrust::detail::execute_with_allocator<Allocator,
-                                                 execute_on_stream_base>
-     ;
-  using seq_t = thrust::detail::execute_with_allocator<
-      Allocator,
-      thrust::system::detail::sequential::execution_policy>
-     ;
-
-
-  static seq_t THRUST_HOST_DEVICE
-  doit(Policy& policy)
-  {
-    return seq_t(policy.m_alloc);
-  }
-};    // specialization of struct cvt_to_seq_impl
-#endif
-
-template <class Policy>
-typename cvt_to_seq_impl<Policy>::seq_t THRUST_HOST_DEVICE cvt_to_seq(Policy& policy)
-{
-  return cvt_to_seq_impl<Policy>::doit(policy);
-}
-
-} // namespace hip_rocprim
-THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
index 682de04aa63f..e30f0d9b1789 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
@@ -45,9 +45,9 @@
 #  include <thrust/distance.h>
 #  include <thrust/pair.h>
 #  include <thrust/partition.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/find.h>
 #  include <thrust/system/hip/detail/general/temp_storage.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/reverse.h>
 #  include <thrust/system/hip/detail/uninitialized_copy.h>
 #  include <thrust/system/hip/detail/util.h>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h
index 18c9d6f85e97..d29e40ca7f7b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h
@@ -47,9 +47,9 @@
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/system/hip/detail/dispatch.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/general/temp_storage.h>
 #  include <thrust/system/hip/detail/get_value.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
 #  include _THRUST_STD_INCLUDE(cstdint)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
index e00ca6454b63..d3d99e7dda4b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
@@ -49,9 +49,9 @@
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/pair.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/general/temp_storage.h>
 #  include <thrust/system/hip/detail/get_value.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
 #  if _THRUST_HAS_DEVICE_SYSTEM_STD
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h
index bf9189f72d2e..8d932671b717 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h
@@ -46,7 +46,7 @@
 #  include <thrust/functional.h>
 #  include <thrust/iterator/iterator_traits.h>
 #  include <thrust/system/hip/detail/dispatch.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
 #  include <thrust/type_traits/unwrap_contiguous_iterator.h>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
index 5f34f9d1c161..f7df168052e1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
@@ -48,7 +48,6 @@
 #  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/general/temp_storage.h>
 #  include <thrust/system/hip/detail/get_value.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
 #  include _THRUST_STD_INCLUDE(__algorithm/max.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
index 1b2728cdfa09..ae9bef1e9bd5 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
@@ -48,7 +48,6 @@
 #  include <thrust/sequence.h>
 #  include <thrust/sort.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
index fd575dd8da32..ecc87fd34d15 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
@@ -29,7 +29,7 @@
 
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/system/detail/bad_alloc.h>
-#include <thrust/system/hip/detail/par.h>
+#include <thrust/system/hip/detail/execution_policy.h>
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <cstddef>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h
index a03b9d8cf15d..0ff3678509e2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h
@@ -47,8 +47,8 @@
 #  include <thrust/functional.h>
 #  include <thrust/iterator/transform_iterator.h>
 #  include <thrust/system/hip/detail/dispatch.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/get_value.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/reduce.h>
 #  include <thrust/system/hip/detail/util.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h
index b19847b1704d..e3a4006f3928 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h
@@ -46,9 +46,9 @@
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/general/temp_storage.h>
 #  include <thrust/system/hip/detail/get_value.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
 #  include _THRUST_STD_INCLUDE(cstdint)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
index 4655ae67e279..9409acc40f09 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
@@ -46,9 +46,9 @@
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/pair.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/general/temp_storage.h>
 #  include <thrust/system/hip/detail/get_value.h>
-#  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
 #  include _THRUST_STD_INCLUDE(cstdint)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h
index 12afe7b2917a..4cb6fa5a2121 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h
@@ -37,8 +37,9 @@
 #  pragma system_header
 #endif // no system header
 
+#include <thrust/detail/execution_policy.h>
+#include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/hip/detail/execution_policy.h>
 
 #if !THRUST_COMPILER(NVRTC)
 #  include <thrust/system/hip/error.h>
@@ -67,6 +68,8 @@
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
+template <class>
+struct execution_policy;
 
 inline THRUST_HOST_DEVICE hipStream_t default_stream()
 {
@@ -324,3 +327,6 @@ THRUST_HOST_DEVICE inline void throw_on_error(hipError_t status, char const* msg
 } // namespace hip_rocprim
 
 THRUST_NAMESPACE_END
+
+// util.h only forward-declares execution_policy; bring in the full definitions (and par) for includers relying on it.
+#include <thrust/system/hip/detail/execution_policy.h>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/execution_policy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/execution_policy.h
index e90e5395d994..7c411215bccc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/execution_policy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/execution_policy.h
@@ -37,4 +37,3 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/system/hip/detail/execution_policy.h>
-#include <thrust/system/hip/detail/par.h>

From f771d745805c907ae3eded13e97e358f8c746619 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Thu, 29 Oct 2026 15:22:46 -0400
Subject: [PATCH 33/48] chore(rocthrust): CCCL 106665c64f4 parity - SPDX
 headers in remaining benchmark counterparts

Related upstream commit: 106665c64f4 Use SPDX license identifiers in CUB (NVIDIA/cccl#6441)
Related local port commit: 6339d0100cf

The local port marked these upstream files NOLOCAL, but rocThrust has
counterparts under different names, which kept the long-form BSD header:
- set_operations/base.cuh   -> benchmark/bench/set_operations/base.hpp
- set_operations/by_key.cuh -> benchmark/bench/set_operations/by_key.hpp
- vectorized_search/base.cu -> benchmark/bench/vectorized_search/basic.cu
- transform/{babelstream,fib}.cu -> benchmark/bench/transform/basic.cu

Take upstream's SPDX header, keeping the AMD Modifications line as an
SPDX-FileCopyrightText line, as the local port did for the other
benchmarks. The AMD-only MIT-licensed set_operations/*.cu files are
unchanged.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../benchmark/bench/set_operations/base.hpp   | 30 ++-----------------
 .../benchmark/bench/set_operations/by_key.hpp | 30 ++-----------------
 .../benchmark/bench/transform/basic.cu        | 30 ++-----------------
 .../bench/vectorized_search/basic.cu          | 30 ++-----------------
 4 files changed, 12 insertions(+), 108 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/base.hpp b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/base.hpp
index 8c8214e0c3a6..8b81ad9f706e 100644
--- a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/base.hpp
+++ b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/base.hpp
@@ -1,30 +1,6 @@
-/******************************************************************************
- * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
+// SPDX-FileCopyrightText: Copyright (c) 2011-2023, NVIDIA CORPORATION. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-License-Identifier: BSD-3
 
 #pragma once
 
diff --git a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/by_key.hpp b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/by_key.hpp
index 8b8e5f062c77..21a026a55e4a 100644
--- a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/by_key.hpp
+++ b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/set_operations/by_key.hpp
@@ -1,30 +1,6 @@
-/******************************************************************************
- * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
+// SPDX-FileCopyrightText: Copyright (c) 2011-2023, NVIDIA CORPORATION. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-License-Identifier: BSD-3
 
 #pragma once
 
diff --git a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/transform/basic.cu b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/transform/basic.cu
index e96824daf69d..1324aeb5aaa5 100644
--- a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/transform/basic.cu
+++ b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/transform/basic.cu
@@ -1,30 +1,6 @@
-/******************************************************************************
- * Copyright (c) 2024, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
+// SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-License-Identifier: BSD-3
 
 // Benchmark utils
 #include "bench_utils.hpp"
diff --git a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/vectorized_search/basic.cu b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/vectorized_search/basic.cu
index 1eb3eeb36cd2..afedf3157b80 100644
--- a/projects/hipccl/hipccl3/rocthrust/benchmark/bench/vectorized_search/basic.cu
+++ b/projects/hipccl/hipccl3/rocthrust/benchmark/bench/vectorized_search/basic.cu
@@ -1,30 +1,6 @@
-/******************************************************************************
- * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
+// SPDX-FileCopyrightText: Copyright (c) 2011-2023, NVIDIA CORPORATION. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-License-Identifier: BSD-3
 
 // Benchmark utils
 #include "bench_utils.hpp"

From 713e0472b04d935a65c99fd52b81a6da5bb7fc31 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Thu, 29 Oct 2026 16:23:58 -0400
Subject: [PATCH 34/48] refactor(rocthrust): CCCL 5197e4b8a58 parity - condense
 hip copy implementation

Related upstream commit: 5197e4b8a58 Refactor and condense thrust::copy implementation (NVIDIA/cccl#5491)
Related local port commit: f0a16da7fc7

The local port only condensed the CUDA backend. Apply the same refactor to
the HIP backend: fold hip/detail/internal/copy_cross_system.h and
hip/detail/internal/copy_device_to_device.h into hip/detail/copy.h, in a
single __copy namespace mirroring upstream:

- trivial_cross_system_copy_n (H->D and D->H overloads)
- non_trivial_cross_system_copy_n (H->D, and D->H under the HIP compiler)
- cross_system_copy_n, which returns early for n == 0 and selects the
  trivial or non-trivial path with if constexpr on
  is_indirectly_trivially_relocate_to_v instead of true_type/false_type
  tag dispatch
- device_to_device, likewise using if constexpr

cross_system_copy is removed; the cross-system copy() overload now calls
cross_system_copy_n with the computed distance, as upstream does. The HIP
host/device workaround structs in copy()/copy_n() are kept.

Not ported: upstream's device_to_device unwraps cuda::zip_transform_iterator
into cub_transform_many. hip_rocprim::transform has no multi-input
transform entry point to forward to, so non-trivial D->D copies still go
through hip_rocprim::transform with identity. Upstream's
proclaim_copyable_arguments wrapper is also omitted because the HIP
transform does not use address-stability information.

The removed detail headers were only included by hip/detail/copy.h.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/system/hip/detail/copy.h | 153 ++++++++++++-
 .../hip/detail/internal/copy_cross_system.h   | 210 ------------------
 .../detail/internal/copy_device_to_device.h   |  98 --------
 3 files changed, 150 insertions(+), 311 deletions(-)
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
index da5c7b91951a..70bc55b210e1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
@@ -40,8 +40,12 @@
 #include <thrust/system/hip/config.h>
 
 #include <thrust/advance.h>
+#include <thrust/detail/raw_pointer_cast.h>
+#include <thrust/detail/temporary_array.h>
 #include <thrust/system/hip/detail/cross_system.h>
 #include <thrust/system/hip/detail/execution_policy.h>
+#include <thrust/system/hip/detail/util.h>
+#include <thrust/type_traits/is_trivially_relocatable.h>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -65,6 +69,7 @@ template <class System1, class System2, class InputIterator, class OutputIterato
 OutputIterator THRUST_HOST
 copy(cross_system<System1, System2> systems, InputIterator first, InputIterator last, OutputIterator result);
 
+// Forward declare since we need it in the implementation non_trivial_cross_system_copy_n
 template <class System, class InputIterator, class Size, class OutputIterator>
 OutputIterator THRUST_HOST_DEVICE
 copy_n(execution_policy<System>& system, InputIterator first, Size n, OutputIterator result);
@@ -73,15 +78,157 @@ template <class System1, class System2, class InputIterator, class Size, class O
 OutputIterator THRUST_HOST
 copy_n(cross_system<System1, System2> systems, InputIterator first, Size n, OutputIterator result);
 
+#if THRUST_HAS_HIP_COMPILER()
+// Forward declare to work around a cyclic include, since "hip/detail/transform.h" includes this header
+template <class Derived, class InputIt, class OutputIt, class TransformOp>
+OutputIt THRUST_HIP_FUNCTION
+transform(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, TransformOp transform_op);
+#endif
+
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END
 
-#include <thrust/system/hip/detail/internal/copy_cross_system.h>
-#include <thrust/system/hip/detail/internal/copy_device_to_device.h>
+#include <thrust/system/hip/detail/transform.h>
+#include <thrust/system/hip/detail/uninitialized_copy.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
+namespace __copy
+{
+template <class H, class D, class T, class Size>
+THRUST_HIP_HOST_FUNCTION void trivial_cross_system_copy_n(
+  thrust::cpp::execution_policy<H>&, thrust::hip_rocprim::execution_policy<D>& device_s, T* dst, T const* src, Size n)
+{
+  hipError_t status = hip_rocprim::trivial_copy_to_device(dst, src, n, hip_rocprim::stream(device_s));
+  hip_rocprim::throw_on_error(status, "__copy::trivial_device_copy H->D: failed");
+}
+
+template <class D, class H, class T, class Size>
+THRUST_HIP_HOST_FUNCTION void trivial_cross_system_copy_n(
+  thrust::hip_rocprim::execution_policy<D>& device_s, thrust::cpp::execution_policy<H>&, T* dst, T const* src, Size n)
+{
+  hipError_t status = hip_rocprim::trivial_copy_from_device(dst, src, n, hip_rocprim::stream(device_s));
+  hip_rocprim::throw_on_error(status, "trivial_device_copy D->H failed");
+}
+
+// non-trivial H->D copy
+template <class H, class D, class InputIt, class Size, class OutputIt>
+OutputIt THRUST_HOST non_trivial_cross_system_copy_n(
+  thrust::cpp::execution_policy<H>& host_s,
+  thrust::hip_rocprim::execution_policy<D>& device_s,
+  InputIt first,
+  Size num_items,
+  OutputIt result)
+{
+  // get type of the input data
+  using InputTy = thrust::detail::it_value_t<InputIt>;
+
+  // copy input data into host temp storage
+  thrust::detail::temporary_array<InputTy, H> temp(host_s, num_items);
+  for (Size idx = 0; idx != num_items; idx++)
+  {
+    ::new (static_cast<void*>(temp.data().get() + idx)) InputTy(*first);
+    ++first;
+  }
+
+  // allocate device temporary storage
+  thrust::detail::temporary_array<InputTy, D> d_in_ptr(device_s, num_items);
+
+  // trivial copy data from host to device
+  hipError_t status = hip_rocprim::trivial_copy_to_device(
+    d_in_ptr.data().get(), temp.data().get(), num_items, hip_rocprim::stream(device_s));
+  hip_rocprim::throw_on_error(status, "__copy:: H->D: failed");
+
+  // device->device copy
+  return hip_rocprim::copy_n(device_s, d_in_ptr.data(), num_items, result);
+}
+
+#if THRUST_HAS_HIP_COMPILER()
+// non-trivial copy D->H, only supported with HIP compiler
+// because copy ctor must have __device__ annotations
+template <class D, class H, class InputIt, class Size, class OutputIt>
+OutputIt THRUST_HOST non_trivial_cross_system_copy_n(
+  thrust::hip_rocprim::execution_policy<D>& device_s,
+  thrust::cpp::execution_policy<H>& host_s,
+  InputIt first,
+  Size num_items,
+  OutputIt result)
+{
+  // get type of the input data
+  using InputTy = thrust::detail::it_value_t<InputIt>;
+
+  // allocate device temp storage
+  thrust::detail::temporary_array<InputTy, D> d_in_ptr(device_s, num_items);
+
+  // uninitialized copy into temp device storage
+  hip_rocprim::uninitialized_copy_n(device_s, first, num_items, d_in_ptr.data());
+
+  // allocate host temp storage
+  thrust::detail::temporary_array<InputTy, H> temp(host_s, num_items);
+
+  // trivial copy from device to host
+  hipError_t status = hip_rocprim::trivial_copy_from_device(
+    temp.data().get(), d_in_ptr.data().get(), num_items, hip_rocprim::stream(device_s));
+  hip_rocprim::throw_on_error(status, "__copy:: D->H: failed");
+
+  // host->host copy
+  return thrust::copy_n(host_s, temp.data(), num_items, result);
+}
+#endif
+
+template <class System1, class System2, class InputIt, class Size, class OutputIt>
+OutputIt THRUST_HOST cross_system_copy_n(cross_system<System1, System2> systems, InputIt first, Size n, OutputIt result)
+{
+  if (n == 0)
+  {
+    return result;
+  }
+
+  if constexpr (is_indirectly_trivially_relocate_to_v<InputIt, OutputIt>)
+  {
+    using InputTy = thrust::detail::it_value_t<InputIt>;
+    trivial_cross_system_copy_n(
+      derived_cast(systems.sys1),
+      derived_cast(systems.sys2),
+      reinterpret_cast<InputTy*>(thrust::raw_pointer_cast(&*result)),
+      reinterpret_cast<InputTy const*>(thrust::raw_pointer_cast(&*first)),
+      n);
+    return result + n;
+  }
+  else
+  {
+    return non_trivial_cross_system_copy_n(derived_cast(systems.sys1), derived_cast(systems.sys2), first, n, result);
+  }
+}
+
+#if THRUST_HAS_HIP_COMPILER()
+template <class Derived, class InputIt, class OutputIt>
+OutputIt THRUST_HIP_RUNTIME_FUNCTION
+device_to_device(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
+{
+  if constexpr (is_indirectly_trivially_relocate_to_v<InputIt, OutputIt>)
+  {
+    using InputTy = thrust::detail::it_value_t<InputIt>;
+    const auto n  = _THRUST_STD::distance(first, last);
+    if (n > 0)
+    {
+      hipError_t status = trivial_copy_device_to_device(
+        policy,
+        reinterpret_cast<InputTy*>(thrust::raw_pointer_cast(&*result)),
+        reinterpret_cast<InputTy const*>(thrust::raw_pointer_cast(&*first)),
+        n);
+      hip_rocprim::throw_on_error(status, "__copy:: D->D: failed");
+    }
+    return result + n;
+  }
+  else
+  {
+    return hip_rocprim::transform(policy, first, last, result, _THRUST_STD::identity{});
+  }
+}
+#endif
+} // namespace __copy
 
 #if THRUST_HAS_HIP_COMPILER()
 // D->D copy requires HIP compiler
@@ -147,7 +294,7 @@ template <class System1, class System2, class InputIterator, class OutputIterato
 OutputIterator THRUST_HOST
 copy(cross_system<System1, System2> systems, InputIterator first, InputIterator last, OutputIterator result)
 {
-  return __copy::cross_system_copy(systems, first, last, result);
+  return __copy::cross_system_copy_n(systems, first, _THRUST_STD::distance(first, last), result);
 } // end copy()
 
 template <class System1, class System2, class InputIterator, class Size, class OutputIterator>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h
deleted file mode 100644
index 933bf4bbc366..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditionu and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-// XXX
-// this file must not be included on its own, ever,
-// but must be part of include in thrust/system/hip/detail/copy.h
-
-#include <thrust/system/hip/config.h>
-
-#include <thrust/advance.h>
-#include <thrust/detail/raw_pointer_cast.h>
-#include <thrust/detail/temporary_array.h>
-#include <thrust/distance.h>
-#include <thrust/system/hip/detail/uninitialized_copy.h>
-#include <thrust/system/hip/detail/util.h>
-#include <thrust/type_traits/is_trivially_relocatable.h>
-
-THRUST_NAMESPACE_BEGIN
-namespace hip_rocprim
-{
-
-namespace __copy
-{
-
-template <class H, class D, class T, class Size>
-THRUST_HIP_HOST_FUNCTION void trivial_device_copy(
-  thrust::cpp::execution_policy<H>&,
-  thrust::hip_rocprim::execution_policy<D>& device_s,
-  T* dst,
-  T const* src,
-  Size count)
-{
-  hipError_t status;
-  status = hip_rocprim::trivial_copy_to_device(dst, src, count, hip_rocprim::stream(device_s));
-  hip_rocprim::throw_on_error(status, "__copy::trivial_device_copy H->D: failed");
-}
-
-template <class D, class H, class T, class Size>
-THRUST_HIP_HOST_FUNCTION void trivial_device_copy(
-  thrust::hip_rocprim::execution_policy<D>& device_s,
-  thrust::cpp::execution_policy<H>&,
-  T* dst,
-  T const* src,
-  Size count)
-{
-  hipError_t status;
-  status = hip_rocprim::trivial_copy_from_device(dst, src, count, hip_rocprim::stream(device_s));
-  hip_rocprim::throw_on_error(status, "trivial_device_copy D->H failed");
-}
-
-template <class System1, class System2, class InputIt, class Size, class OutputIt>
-OutputIt THRUST_HOST cross_system_copy_n(
-  thrust::execution_policy<System1>& sys1,
-  thrust::execution_policy<System2>& sys2,
-  InputIt begin,
-  Size n,
-  OutputIt result,
-  _THRUST_STD::true_type) // trivial copy
-
-{
-  using InputTy = thrust::detail::it_value_t<InputIt>;
-  if (n > 0)
-  {
-    trivial_device_copy(
-      derived_cast(sys1),
-      derived_cast(sys2),
-      reinterpret_cast<InputTy*>(thrust::raw_pointer_cast(&*result)),
-      reinterpret_cast<InputTy const*>(thrust::raw_pointer_cast(&*begin)),
-      n);
-  }
-
-  return result + n;
-}
-
-// non-trivial H->D copy
-template <class H, class D, class InputIt, class Size, class OutputIt>
-OutputIt THRUST_HOST cross_system_copy_n(
-  thrust::cpp::execution_policy<H>& host_s,
-  thrust::hip_rocprim::execution_policy<D>& device_s,
-  InputIt first,
-  Size num_items,
-  OutputIt result,
-  _THRUST_STD::false_type) // non-trivial copy
-{
-  // get type of the input data
-  using InputTy = thrust::detail::it_value_t<InputIt>;
-
-  // copy input data into host temp storage
-  InputIt last = first;
-  _THRUST_STD::advance(last, num_items);
-  thrust::detail::temporary_array<InputTy, H> temp(host_s, num_items);
-
-  for (Size idx = 0; idx != num_items; idx++)
-  {
-    ::new (static_cast<void*>(temp.data().get() + idx)) InputTy(*first);
-    ++first;
-  }
-
-  // allocate device temporary storage
-  thrust::detail::temporary_array<InputTy, D> d_in_ptr(device_s, num_items);
-
-  // trivial copy data from host to device
-  hipError_t status = hip_rocprim::trivial_copy_to_device(
-    d_in_ptr.data().get(), temp.data().get(), num_items, hip_rocprim::stream(device_s));
-  hip_rocprim::throw_on_error(status, "__copy:: H->D: failed");
-
-  // device->device copy
-  OutputIt ret = hip_rocprim::copy_n(device_s, d_in_ptr.data(), num_items, result);
-
-  return ret;
-}
-
-#if THRUST_HAS_HIP_COMPILER()
-// non-trivial copy D->H, only supported with NVCC compiler
-// because copy ctor must have  __device__ annotations, which is nvcc-only
-// feature
-template <class D, class H, class InputIt, class Size, class OutputIt>
-OutputIt THRUST_HOST cross_system_copy_n(
-  thrust::hip_rocprim::execution_policy<D>& device_s,
-  thrust::cpp::execution_policy<H>& host_s,
-  InputIt first,
-  Size num_items,
-  OutputIt result,
-  _THRUST_STD::false_type) // non-trivial copy
-
-{
-  // get type of the input data
-  using InputTy = thrust::detail::it_value_t<InputIt>;
-
-  // allocate device temp storage
-  thrust::detail::temporary_array<InputTy, D> d_in_ptr(device_s, num_items);
-
-  // uninitialized copy into temp device storage
-  hip_rocprim::uninitialized_copy_n(device_s, first, num_items, d_in_ptr.data());
-
-  // allocate host temp storage
-  thrust::detail::temporary_array<InputTy, H> temp(host_s, num_items);
-
-  // trivial copy from device to host
-  hipError_t status;
-  status = hip_rocprim::trivial_copy_from_device(
-    temp.data().get(), d_in_ptr.data().get(), num_items, hip_rocprim::stream(device_s));
-  hip_rocprim::throw_on_error(status, "__copy:: D->H: failed");
-
-  // host->host copy
-  OutputIt ret = thrust::copy_n(host_s, temp.data(), num_items, result);
-
-  return ret;
-}
-#endif
-
-template <class System1, class System2, class InputIt, class Size, class OutputIt>
-OutputIt THRUST_HOST cross_system_copy_n(cross_system<System1, System2> systems, InputIt begin, Size n, OutputIt result)
-{
-  return cross_system_copy_n(
-    derived_cast(systems.sys1),
-    derived_cast(systems.sys2),
-    begin,
-    n,
-    result,
-    typename is_indirectly_trivially_relocatable_to<InputIt, OutputIt>::type());
-}
-
-template <class System1, class System2, class InputIterator, class OutputIterator>
-OutputIterator THRUST_HOST
-cross_system_copy(cross_system<System1, System2> systems, InputIterator begin, InputIterator end, OutputIterator result)
-{
-  return cross_system_copy_n(systems, begin, _THRUST_STD::distance(begin, end), result);
-}
-
-} // namespace __copy
-
-} // namespace hip_rocprim
-THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h
deleted file mode 100644
index f3560b0693ee..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#if THRUST_HAS_HIP_COMPILER()
-#  include <thrust/system/hip/config.h>
-
-#  include <thrust/distance.h>
-#  include <thrust/functional.h>
-#  include <thrust/system/hip/detail/execution_policy.h>
-#  include <thrust/system/hip/detail/transform.h>
-#  include <thrust/system/hip/detail/util.h>
-#  include <thrust/type_traits/is_trivially_relocatable.h>
-
-THRUST_NAMESPACE_BEGIN
-namespace hip_rocprim
-{
-// Need a forward declaration here to work around a cyclic include, since "hip/detail/transform.h" includes this header
-template <class Derived, class InputIt, class OutputIt, class TransformOp>
-OutputIt THRUST_HIP_FUNCTION
-transform(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, TransformOp transform_op);
-
-namespace __copy
-{
-template <class Derived, class InputIt, class OutputIt>
-OutputIt THRUST_HIP_RUNTIME_FUNCTION device_to_device(
-  execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, _THRUST_STD::true_type)
-{
-  using InputTy = thrust::detail::it_value_t<InputIt>;
-  const auto n  = _THRUST_STD::distance(first, last);
-  if (n > 0)
-  {
-    hipError_t status;
-    status = trivial_copy_device_to_device(
-      policy,
-      reinterpret_cast<InputTy*>(thrust::raw_pointer_cast(&*result)),
-      reinterpret_cast<InputTy const*>(thrust::raw_pointer_cast(&*first)),
-      n);
-    hip_rocprim::throw_on_error(status, "__copy:: D->D: failed");
-  }
-
-  return result + n;
-}
-
-template <class Derived, class InputIt, class OutputIt>
-OutputIt THRUST_HIP_RUNTIME_FUNCTION device_to_device(
-  execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, _THRUST_STD::false_type)
-{
-  return hip_rocprim::transform(policy, first, last, result, _THRUST_STD::identity{});
-}
-
-template <class Derived, class InputIt, class OutputIt>
-OutputIt THRUST_HIP_RUNTIME_FUNCTION
-device_to_device(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
-{
-  return device_to_device(
-    policy, first, last, result, typename is_indirectly_trivially_relocatable_to<InputIt, OutputIt>::type());
-}
-} // namespace __copy
-
-} // namespace hip_rocprim
-THRUST_NAMESPACE_END
-#endif

From 8a3e676d5f1b5f331155b02ddd5393b7d65fac86 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Thu, 29 Oct 2026 18:31:48 -0400
Subject: [PATCH 35/48] refactor(rocthrust): CCCL 4b10fd26255 parity - match
 upstream include cleanup

Related upstream commit: 4b10fd26255 Cleanup includes in thrust (NVIDIA/cccl#6547)
Related local port commit: ee821bedf93

Bring the include structure of thrust/ in line with upstream v3.2.1 now
that libhipcxx is mandatory:

- Apply the upstream granular libcu++ include regions to the files touched
  by #6547 (umbrella <cuda/std/X> headers replaced by __X/*.h headers).
- Remove the ::internal:: type-trait aliases from detail/type_traits.h and
  use _THRUST_STD:: directly, matching upstream.
- Drop dead !_THRUST_HAS_DEVICE_SYSTEM_STD fallback code (thrust::swap
  fallback, aligned_storage_size fallback, actor argument variant,
  raw_reference_cast apply branch, iter_swap/swap_ranges fallbacks).
- Replace umbrella includes in the hip backend with granular headers and
  add direct includes for libcu++ symbols used by hip backend files.

Local adaptations kept: thrust/detail/memory_wrapper.h, __host_stdlib/
stdexcept, hip hints in #if 0 blocks, THRUST_COMPILER(NVRTC),
_CCCL_CUDA_COMPILATION(), the [NON-CCCL PARITY] cstddef include in
type_traits.h, erfcinv includes, and the find.h tuple umbrella.

The libcxx_wrapper directory and tests are left for a separate effort.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl/hipccl3/rocthrust/thrust/advance.h |  5 ++-
 .../rocthrust/thrust/allocate_unique.h        | 31 ++++++++--------
 .../rocthrust/thrust/detail/alignment.h       | 15 ++------
 .../detail/allocator/allocator_traits.h       |  9 +++--
 .../detail/allocator/copy_construct_range.h   |  2 --
 .../detail/allocator/value_initialize_range.h |  2 ++
 .../detail/allocator_aware_execution_policy.h |  8 ++---
 .../thrust/detail/contiguous_storage.h        | 11 ++----
 .../thrust/detail/contiguous_storage.inl      |  3 +-
 .../thrust/detail/functional/actor.h          | 25 +++----------
 .../thrust/detail/functional/operators.h      |  3 +-
 .../thrust/detail/internal_functional.h       | 11 ++++--
 .../thrust/detail/memory_algorithms.h         | 13 ++-----
 .../hipccl3/rocthrust/thrust/detail/pointer.h |  9 +++--
 .../thrust/detail/random_bijection.h          |  1 -
 .../thrust/detail/raw_reference_cast.h        | 12 +++----
 .../rocthrust/thrust/detail/reference.h       | 10 +++---
 .../rocthrust/thrust/detail/temporary_array.h |  2 --
 .../thrust/detail/temporary_array.inl         |  6 ++--
 .../rocthrust/thrust/detail/type_deduction.h  |  5 +--
 .../rocthrust/thrust/detail/type_traits.h     | 35 +++++++------------
 .../detail/type_traits/has_member_function.h  |  8 ++---
 .../detail/type_traits/is_call_possible.h     |  4 +--
 .../detail/type_traits/is_commutative.h       | 18 +++++-----
 .../type_traits/iterator/is_output_iterator.h |  4 ++-
 .../thrust/detail/type_traits/minimum_type.h  |  4 ++-
 .../detail/type_traits/pointer_traits.h       | 15 +++++---
 .../rocthrust/thrust/detail/vector_base.h     |  9 +++--
 .../rocthrust/thrust/detail/vector_base.inl   | 26 +++++++-------
 .../hipccl3/rocthrust/thrust/device_vector.h  |  2 +-
 .../hipccl3/rocthrust/thrust/distance.h       |  4 +--
 .../hipccl3/rocthrust/thrust/functional.h     | 13 ++++---
 .../hipccl3/rocthrust/thrust/host_vector.h    |  2 +-
 .../thrust/iterator/constant_iterator.h       |  2 +-
 .../detail/iterator_facade_category.h         |  6 ++--
 .../detail/tuple_of_iterator_references.h     |  4 +--
 .../thrust/iterator/iterator_categories.h     |  2 +-
 .../thrust/iterator/reverse_iterator.h        |  2 +-
 .../thrust/iterator/shuffle_iterator.h        |  7 +++-
 .../rocthrust/thrust/iterator/zip_iterator.h  | 10 ++++--
 .../hipccl3/rocthrust/thrust/mr/validator.h   |  2 +-
 .../hipccl/hipccl3/rocthrust/thrust/pair.h    |  5 ++-
 .../random/detail/normal_distribution_base.h  |  4 ++-
 .../detail/uniform_real_distribution.inl      |  2 +-
 .../random/detail/xor_combine_engine_max.h    |  3 +-
 .../thrust/random/xor_combine_engine.h        |  2 +-
 .../hipccl/hipccl3/rocthrust/thrust/swap.h    | 34 +-----------------
 .../rocthrust/thrust/system/cpp/pointer.h     |  2 +-
 .../thrust/system/cuda/detail/generate.h      |  2 --
 .../system/cuda/detail/transform_reduce.h     |  2 --
 .../system/cuda/detail/transform_scan.h       |  2 --
 .../system/cuda/detail/uninitialized_copy.h   |  2 --
 .../system/cuda/detail/uninitialized_fill.h   |  2 --
 .../system/detail/generic/binary_search.inl   |  4 +--
 .../thrust/system/detail/generic/copy_if.inl  | 10 +++---
 .../thrust/system/detail/generic/equal.inl    |  2 +-
 .../thrust/system/detail/generic/generate.inl |  3 +-
 .../system/detail/generic/partition.inl       |  4 ++-
 .../system/detail/generic/reduce_by_key.inl   |  6 ++--
 .../thrust/system/detail/generic/reverse.inl  |  6 ++--
 .../system/detail/generic/select_system.h     |  5 ++-
 .../thrust/system/detail/generic/sort.inl     |  5 ++-
 .../system/detail/generic/swap_ranges.inl     |  8 +----
 .../thrust/system/detail/generic/tabulate.inl |  4 ++-
 .../system/detail/generic/transform_scan.inl  | 10 +++---
 .../thrust/system/detail/generic/unique.inl   |  3 +-
 .../system/detail/sequential/binary_search.h  |  6 ++--
 .../system/detail/sequential/iter_swap.h      |  8 +----
 .../detail/sequential/stable_merge_sort.h     |  2 ++
 .../detail/sequential/stable_radix_sort.h     |  2 +-
 .../system/hip/detail/adjacent_difference.h   |  2 +-
 .../thrust/system/hip/detail/binary_search.h  |  1 +
 .../rocthrust/thrust/system/hip/detail/copy.h |  4 +++
 .../thrust/system/hip/detail/copy_if.h        |  1 +
 .../thrust/system/hip/detail/count.h          |  2 ++
 .../thrust/system/hip/detail/dispatch.h       | 12 +++----
 .../thrust/system/hip/detail/equal.h          |  2 ++
 .../thrust/system/hip/detail/extrema.h        |  4 +--
 .../rocthrust/thrust/system/hip/detail/fill.h |  2 ++
 .../thrust/system/hip/detail/for_each.h       |  2 ++
 .../thrust/system/hip/detail/gather.h         |  2 ++
 .../thrust/system/hip/detail/generate.h       |  2 ++
 .../thrust/system/hip/detail/inner_product.h  |  2 ++
 .../thrust/system/hip/detail/iter_swap.h      |  8 +----
 .../thrust/system/hip/detail/merge.h          |  2 ++
 .../thrust/system/hip/detail/partition.h      |  2 ++
 .../thrust/system/hip/detail/reduce.h         |  1 +
 .../thrust/system/hip/detail/reduce_by_key.h  |  7 ++--
 .../thrust/system/hip/detail/remove.h         |  2 ++
 .../thrust/system/hip/detail/reverse.h        |  4 ++-
 .../rocthrust/thrust/system/hip/detail/scan.h |  2 ++
 .../thrust/system/hip/detail/scan_by_key.h    |  2 ++
 .../thrust/system/hip/detail/scatter.h        |  2 ++
 .../thrust/system/hip/detail/set_operations.h |  2 ++
 .../rocthrust/thrust/system/hip/detail/sort.h |  3 ++
 .../thrust/system/hip/detail/swap_ranges.h    |  9 +++--
 .../system/hip/detail/temporary_buffer.h      |  5 ++-
 .../system/hip/detail/transform_reduce.h      |  1 +
 .../thrust/system/hip/detail/transform_scan.h |  9 +++--
 .../system/hip/detail/uninitialized_fill.h    |  1 +
 .../thrust/system/hip/detail/unique.h         |  3 ++
 .../thrust/system/hip/detail/unique_by_key.h  |  3 ++
 .../rocthrust/thrust/system/hip/error.h       |  2 ++
 .../rocthrust/thrust/system/hip/pointer.h     |  2 ++
 .../rocthrust/thrust/system/omp/detail/copy.h |  2 +-
 .../thrust/system/omp/detail/for_each.h       |  3 +-
 .../thrust/system/omp/detail/reduce.h         |  3 +-
 .../thrust/system/omp/detail/reduce_by_key.h  |  1 -
 .../rocthrust/thrust/system/omp/detail/scan.h |  2 --
 .../rocthrust/thrust/system/omp/pointer.h     |  2 +-
 .../rocthrust/thrust/system/tbb/detail/copy.h |  2 +-
 .../thrust/system/tbb/detail/copy_if.h        |  5 ++-
 .../thrust/system/tbb/detail/for_each.h       |  4 ++-
 .../thrust/system/tbb/detail/reduce.h         |  3 +-
 .../system/tbb/detail/reduce_intervals.h      | 11 ++----
 .../rocthrust/thrust/system/tbb/detail/sort.h |  3 +-
 .../rocthrust/thrust/system/tbb/pointer.h     |  2 +-
 .../hipccl3/rocthrust/thrust/transform.h      |  2 +-
 .../thrust/type_traits/integer_sequence.h     |  9 ++---
 .../type_traits/is_contiguous_iterator.h      |  9 +++--
 .../type_traits/is_trivially_relocatable.h    | 17 +++------
 .../type_traits/unwrap_contiguous_iterator.h  |  2 ++
 122 files changed, 343 insertions(+), 361 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/advance.h b/projects/hipccl/hipccl3/rocthrust/thrust/advance.h
index 958dd2459abf..3fac8598a643 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/advance.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/advance.h
@@ -30,7 +30,10 @@
 #  pragma system_header
 #endif // no system header
 
-#include _THRUST_STD_INCLUDE(iterator)
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/iterator_traits.h)
+#include _THRUST_STD_INCLUDE(__iterator/next.h)
+#include _THRUST_STD_INCLUDE(__iterator/prev.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h
index 5448a7f51f08..314020218d52 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h
@@ -19,9 +19,10 @@
 #include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/detail/type_deduction.h>
-#include <thrust/detail/type_traits.h> // for internal::remove_cvref_t
 
-#include _THRUST_STD_INCLUDE(utility)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
+#include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 THRUST_NAMESPACE_BEGIN
 
@@ -65,7 +66,7 @@ struct allocator_delete final
 
   void operator()(pointer p)
   {
-    using traits = detail::allocator_traits<::internal::remove_cvref_t<Allocator>>;
+    using traits = detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>;
     typename traits::allocator_type alloc_T(alloc_);
 
     if (nullptr != detail::pointer_traits<pointer>::get(p))
@@ -141,7 +142,7 @@ struct array_allocator_delete final
 
   void operator()(pointer p)
   {
-    using traits = detail::allocator_traits<::internal::remove_cvref_t<Allocator>>;
+    using traits = detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>;
     typename traits::allocator_type alloc_T(get_allocator());
     if (nullptr != detail::pointer_traits<pointer>::get(p))
     {
@@ -200,14 +201,14 @@ THRUST_HOST_DEVICE tagged_deleter<Pointer, Lambda> make_tagged_deleter(Lambda&&
 //! Creates a \p std::unique_ptr holding a new object of type \p T, constructed with \p args, using \p alloc as the
 //! allocator.
 template <typename T, typename Allocator, typename... Args>
-THRUST_HOST std::unique_ptr<
-  T,
-  allocator_delete<
-    T,
-    typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
+THRUST_HOST
+std::unique_ptr<T,
+                allocator_delete<T,
+                                 typename detail::allocator_traits<
+                                   _THRUST_STD::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
 allocate_unique(Allocator const& alloc, Args&&... args)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
@@ -229,10 +230,10 @@ THRUST_HOST std::unique_ptr<
   T,
   uninitialized_allocator_delete<
     T,
-    typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
+    typename detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
 uninitialized_allocate_unique(Allocator const& alloc)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
@@ -256,7 +257,7 @@ THRUST_HOST std::unique_ptr<
                            Allocator>::type>::type>::template rebind_traits<T>::allocator_type>>
 allocate_unique_n(Allocator const& alloc, Size n, Args&&... args)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
@@ -278,10 +279,10 @@ THRUST_HOST std::unique_ptr<
   T[],
   uninitialized_array_allocator_delete<
     T,
-    typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
+    typename detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
 uninitialized_allocate_unique_n(Allocator const& alloc, Size n)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<_THRUST_STD::remove_cvref_t<Allocator>>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/alignment.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/alignment.h
index ddcbd4bf0ece..bef96bd91f51 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/alignment.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/alignment.h
@@ -29,14 +29,9 @@
 #  pragma system_header
 #endif // no system header
 
+#include _THRUST_LIBCXX_INCLUDE(__cmath/ceil_div.h)
+#include _THRUST_STD_INCLUDE(__type_traits/alignment_of.h)
 #include _THRUST_STD_INCLUDE(cstddef) // For `std::size_t` and `std::max_align_t`.
-#include _THRUST_STD_INCLUDE(type_traits) // For `std::alignment_of`.
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(cmath)
-#elif _THRUST_USE_ROCPRIM
-#  include <rocprim/detail/various.hpp>
-#endif
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
@@ -80,13 +75,7 @@ THRUST_HOST_DEVICE T aligned_reinterpret_cast(U u)
 
 THRUST_HOST_DEVICE inline _THRUST_STD::size_t aligned_storage_size(_THRUST_STD::size_t n, _THRUST_STD::size_t align)
 {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   return _THRUST_LIBCXX::ceil_div(n, align) * align;
-#elif _THRUST_USE_ROCPRIM
-  return ::rocprim::detail::ceiling_div(n, align) * align;
-#else
-  return (n / align + (n % align > 0 ? 1 : 0)) * align;
-#endif
 }
 } // end namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h
index 4a6ae0d54094..7f6c0826c287 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h
@@ -39,8 +39,13 @@
 #include <thrust/detail/type_traits/is_call_possible.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_empty.h)
+#include _THRUST_STD_INCLUDE(__type_traits/make_unsigned.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
+#include _THRUST_STD_INCLUDE(__type_traits/void_t.h)
 #include _THRUST_STD_INCLUDE(limits)
-#include _THRUST_STD_INCLUDE(type_traits)
 
 #include <new>
 
@@ -401,7 +406,7 @@ struct allocator_traits
 
   using size_type = typename eval_if<allocator_traits_detail::has_size_type<allocator_type>::value,
                                      allocator_traits_detail::nested_size_type<allocator_type>,
-                                     ::internal::make_unsigned<difference_type>>::type;
+                                     _THRUST_STD::make_unsigned<difference_type>>::type;
 
   using propagate_on_container_copy_assignment =
     typename eval_if<allocator_traits_detail::has_propagate_on_container_copy_assignment<allocator_type>::value,
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
index bcd9dbfd1f0f..97cfc068bcb9 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
@@ -26,13 +26,11 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/advance.h>
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/copy.h>
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
-#include <thrust/distance.h>
 #include <thrust/for_each.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/zip_iterator.h>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h
index ad475be802e3..e959f74c17f3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/value_initialize_range.h
@@ -32,6 +32,8 @@
 #include <thrust/for_each.h>
 #include <thrust/uninitialized_fill.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/is_trivially_default_constructible.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator_aware_execution_policy.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator_aware_execution_policy.h
index 66e7e9a21e57..316980fa356c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator_aware_execution_policy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator_aware_execution_policy.h
@@ -28,11 +28,9 @@
 #include <thrust/detail/alignment.h>
 #include <thrust/detail/execute_with_allocator_fwd.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <utility>
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_reference.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.h
index 04174affcc69..65fb539fda67 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.h
@@ -29,11 +29,10 @@
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/execution_policy.h>
 #include <thrust/iterator/detail/normal_iterator.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/swap.h>
-#endif
 
-#include _THRUST_STD_INCLUDE(utility)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
+#include _THRUST_STD_INCLUDE(__utility/swap.h)
+
 #include _THRUST_STD_INCLUDE(__host_stdlib/stdexcept)
 
 THRUST_NAMESPACE_BEGIN
@@ -117,11 +116,7 @@ class contiguous_storage
   THRUST_EXEC_CHECK_DISABLE
   THRUST_HOST_DEVICE void swap(contiguous_storage& other)
   {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     using _THRUST_STD::swap;
-#else
-    using thrust::swap;
-#endif
     swap(m_begin, other.m_begin);
     swap(m_size, other.m_size);
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.inl
index 0e068fe9e11a..89468795341a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/contiguous_storage.inl
@@ -33,7 +33,8 @@
 #include <thrust/detail/allocator/value_initialize_range.h>
 #include <thrust/detail/contiguous_storage.h>
 
-#include _THRUST_STD_INCLUDE(utility)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
+#include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 #include <nv/target>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/actor.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/actor.h
index ada3e3dad189..b1e56795fc9c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/actor.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/actor.h
@@ -36,15 +36,12 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/type_deduction.h>
-#include <thrust/detail/type_traits.h> // for internal::decay_t
 #include <thrust/tuple.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-#include _THRUST_STD_INCLUDE(utility)
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <tuple>
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/decay.h)
+#include _THRUST_STD_INCLUDE(__type_traits/integral_constant.h)
+#include _THRUST_STD_INCLUDE(__utility/declval.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::functional
@@ -81,7 +78,6 @@ struct is_actor<actor<T>> : _THRUST_STD::true_type
 {};
 
 // a node selecting and returning one of the arguments to the entire expression template
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <unsigned int Pos>
 struct argument
 {
@@ -92,17 +88,6 @@ struct argument
     return thrust::get<Pos>(thrust::tuple<Ts&&...>{THRUST_FWD(args)...});
   }
 };
-#else
-template <unsigned int Pos>
-struct argument
-{
-  template <typename... Ts>
-  THRUST_HOST_DEVICE auto eval(Ts&&... args) const -> decltype(::std::get<Pos>(::std::forward_as_tuple(args...)))
-  {
-    return ::std::get<Pos>(::std::forward_as_tuple(args...));
-  }
-};
-#endif
 
 template <unsigned int Pos>
 struct placeholder
@@ -197,7 +182,7 @@ struct value
 };
 
 template <typename T>
-THRUST_HOST_DEVICE auto make_actor(T&& x) -> actor<value<::internal::decay_t<T>>>
+THRUST_HOST_DEVICE auto make_actor(T&& x) -> actor<value<_THRUST_STD::decay_t<T>>>
 {
   return {{THRUST_FWD(x)}};
 }
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/operators.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/operators.h
index 4d664a97ad52..7a4f958286d3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/operators.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/functional/operators.h
@@ -37,7 +37,8 @@
 #include <thrust/functional.h>
 #include <thrust/tuple.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail::functional
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
index f0f6682266c8..f14052665f13 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
@@ -31,7 +31,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 #include <thrust/detail/memory_wrapper.h> // for ::new
 #include <thrust/detail/raw_reference_cast.h>
 #include <thrust/detail/static_assert.h>
@@ -44,9 +43,15 @@
 #include _THRUST_LIBCXX_INCLUDE(__iterator/discard_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/tabulate_output_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/transform_input_output_iterator.h)
+#include _THRUST_LIBCXX_INCLUDE(__iterator/transform_output_iterator.h)
 #include _THRUST_STD_INCLUDE(__new/device_new.h)
-
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__tuple_dir/get.h)
+#include _THRUST_STD_INCLUDE(__tuple_dir/tuple_element.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_const.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_reference.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h
index ddfbbdec2e71..00801c0ca44f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h
@@ -23,16 +23,9 @@
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__memory/addressof.h)
-#endif
-
-#include <utility>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
-#include <new>
+#include _THRUST_STD_INCLUDE(__memory/addressof.h)
+#include _THRUST_STD_INCLUDE(__new/device_new.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
 
 #include <nv/target>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h
index 2e4701529a09..04e2e325e428 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/pointer.h
@@ -38,11 +38,16 @@
 #include <thrust/iterator/iterator_adaptor.h>
 #include <thrust/iterator/iterator_traversal_tags.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/is_reference.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_void.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cv.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 #include _THRUST_STD_INCLUDE(cstddef)
-#include _THRUST_STD_INCLUDE(type_traits)
 
 #if !THRUST_COMPILER(NVRTC)
-#include <ostream>
+#  include <ostream>
 #endif // !THRUST_COMPILER(NVRTC)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h
index 28aee2b88998..781e96edba8d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/random_bijection.h
@@ -23,7 +23,6 @@
 
 #include <thrust/random.h>
 
-#include _THRUST_STD_INCLUDE(__algorithm/max.h)
 #include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
 #include _THRUST_STD_INCLUDE(__type_traits/is_integral.h)
 #include _THRUST_STD_INCLUDE(__utility/forward.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/raw_reference_cast.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/raw_reference_cast.h
index df72c46bf092..df73c69b048e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/raw_reference_cast.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/raw_reference_cast.h
@@ -31,8 +31,12 @@
 #include <thrust/detail/type_traits/has_nested_type.h>
 #include <thrust/tuple.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-#include _THRUST_STD_INCLUDE(utility)
+#include _THRUST_STD_INCLUDE(__tuple_dir/apply.h)
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cv.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
+#include _THRUST_STD_INCLUDE(__utility/forward.h)
 
 // the order of declarations and definitions in this file is totally goofy
 // this header defines raw_reference_cast, which has a few overloads towards the bottom of the file
@@ -172,11 +176,7 @@ THRUST_HOST_DEVICE auto raw_reference_cast(detail::tuple_of_iterator_references<
   if constexpr (detail::can_unwrap<detail::tuple_of_iterator_references<Ts...>>)
   {
     using ResultTuple = tuple<typename detail::raw_reference_detail::raw_reference_tuple_helper<Ts>::type...>;
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     return _THRUST_STD::apply(
-#else
-    return THRUST_NS_QUALIFIER::apply(
-#endif
       [](auto&&... refs) {
         return ResultTuple{raw_reference_cast(_THRUST_STD::forward<decltype(refs)>(refs))...};
       },
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/reference.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/reference.h
index 133770c988ec..299118c48002 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/reference.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/reference.h
@@ -31,14 +31,14 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/reference_forward_declaration.h>
-#include <thrust/detail/type_traits.h> // for internal::remove_cvref_t
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/memory.h>
 #include <thrust/system/detail/generic/select_system.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(type_traits)
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
 
 #include <ostream>
 
@@ -91,7 +91,7 @@ class reference
 
 public:
   using pointer    = Pointer;
-  using value_type = ::internal::remove_cvref_t<Element>;
+  using value_type = _THRUST_STD::remove_cvref_t<Element>;
 
   reference(reference const&) = default;
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
index e35324d6b2de..5b3f2ba6793d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
@@ -30,8 +30,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.inl
index 3e1494d44fd4..64610acebaa6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.inl
@@ -28,12 +28,10 @@
 
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/distance.h>
 #include <thrust/system/detail/generic/select_system.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_trivially_copy_constructible.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_deduction.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_deduction.h
index 31a0d177ceb1..321e7ab21659 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_deduction.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_deduction.h
@@ -19,10 +19,7 @@
 
 #include <thrust/detail/preprocessor.h>
 
-#include _THRUST_STD_INCLUDE(utility)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(type_traits)
-#endif
+#include _THRUST_STD_INCLUDE(__utility/forward.h)
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
index 8cfe07629aeb..2c76658fb3b0 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits.h
@@ -32,26 +32,17 @@
 #  pragma system_header
 #endif // no system header
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
-
-// TODO(libhipcxx): remove this namespace once libhipcxx gets ready
-namespace internal
-{
-using _THRUST_STD::is_arithmetic;
-using _THRUST_STD::make_unsigned;
-
-template <typename T>
-using make_unsigned_t = _THRUST_STD::make_unsigned_t<T>;
-
-template <typename T>
-using decay_t = _THRUST_STD::decay_t<T>;
-template <typename T>
-using remove_cvref = _THRUST_STD::remove_cvref<T>;
-template <typename T>
-using remove_cvref_t = _THRUST_STD::remove_cvref_t<T>;
-} // namespace internal
+#include _THRUST_STD_INCLUDE(__functional/invoke.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conjunction.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/integral_constant.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_arithmetic.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_integral.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
+// [NON-CCCL PARITY BEGIN]
+#include _THRUST_STD_INCLUDE(cstddef)
+// [NON-CCCL PARITY END]
 
 THRUST_NAMESPACE_BEGIN
 
@@ -75,7 +66,7 @@ struct is_non_bool_integral<bool> : public false_type
 {};
 
 template <typename T>
-struct is_non_bool_arithmetic : public ::internal::is_arithmetic<T>
+struct is_non_bool_arithmetic : public _THRUST_STD::is_arithmetic<T>
 {};
 template <>
 struct is_non_bool_arithmetic<bool> : public false_type
@@ -128,7 +119,7 @@ struct disable_if_convertible : disable_if<_THRUST_STD::is_convertible<T1, T2>::
 {};
 
 template <typename T>
-struct is_numeric : ::internal::_And<_THRUST_STD::is_convertible<int, T>, _THRUST_STD::is_convertible<T, int>>
+struct is_numeric : _THRUST_STD::_And<_THRUST_STD::is_convertible<int, T>, _THRUST_STD::is_convertible<T, int>>
 {}; // end is_numeric
 
 struct largest_available_float
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/has_member_function.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/has_member_function.h
index d3d10aefbdea..95e4b004cfd6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/has_member_function.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/has_member_function.h
@@ -28,10 +28,10 @@
 
 #include <thrust/detail/type_traits.h>
 
-#include <utility> // for std::declval
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_void.h)
+#include _THRUST_STD_INCLUDE(__utility/declval.h)
 
 #define __THRUST_DEFINE_HAS_MEMBER_FUNCTION(trait_name, member_function_name)                                          \
   template <typename T, typename Signature, typename = void>                                                           \
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_call_possible.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_call_possible.h
index de8a523d8d3e..0e4d1b7ed10a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_call_possible.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_call_possible.h
@@ -29,9 +29,7 @@
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/has_member_function.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
 
 // inspired by Roman Perepelitsa's presentation from comp.lang.c++.moderated
 // based on the implementation here: http://www.rsdn.ru/forum/cpp/2759773.1.aspx
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_commutative.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_commutative.h
index 3a7c396a8798..a498250a3db9 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_commutative.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/is_commutative.h
@@ -37,31 +37,31 @@ struct is_commutative : public _THRUST_STD::false_type
 {};
 
 template <typename T>
-struct is_commutative<typename _THRUST_STD::plus<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_STD::plus<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_STD::multiplies<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_STD::multiplies<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_LIBCXX::minimum<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_LIBCXX::minimum<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_LIBCXX::maximum<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_LIBCXX::maximum<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_STD::logical_or<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_STD::logical_or<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_STD::logical_and<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_STD::logical_and<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_STD::bit_or<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_STD::bit_or<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_STD::bit_and<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_STD::bit_and<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 template <typename T>
-struct is_commutative<typename _THRUST_STD::bit_xor<T>> : public ::internal::is_arithmetic<T>
+struct is_commutative<typename _THRUST_STD::bit_xor<T>> : public _THRUST_STD::is_arithmetic<T>
 {};
 } // end namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h
index 6606b074adb9..e46f062e3389 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h
@@ -29,7 +29,9 @@
 #include <thrust/iterator/detail/any_assign.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_void.h)
+#include _THRUST_STD_INCLUDE(__type_traits/void_t.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/minimum_type.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/minimum_type.h
index 377b6fdfa96c..4526f0ecf9d4 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/minimum_type.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/minimum_type.h
@@ -26,7 +26,9 @@
 #  pragma system_header
 #endif // no system header
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/pointer_traits.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/pointer_traits.h
index 12d330b1aea5..910371b5ca27 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/pointer_traits.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/type_traits/pointer_traits.h
@@ -25,15 +25,20 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/has_nested_type.h>
 #include <thrust/detail/type_traits/is_metafunction_defined.h>
 #include <thrust/detail/type_traits/is_thrust_pointer.h>
 #include <thrust/iterator/iterator_traits.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conjunction.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_void.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 #include _THRUST_STD_INCLUDE(cstddef)
-#include _THRUST_STD_INCLUDE(type_traits)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
@@ -292,15 +297,15 @@ struct is_pointer_system_convertible : _THRUST_STD::is_convertible<iterator_syst
 
 template <typename FromPtr, typename ToPtr>
 struct is_pointer_convertible
-    : ::internal::_And<
+    : _THRUST_STD::_And<
         _THRUST_STD::is_convertible<typename pointer_element<FromPtr>::type*, typename pointer_element<ToPtr>::type*>,
         is_pointer_system_convertible<FromPtr, ToPtr>>
 {};
 
 template <typename FromPtr, typename ToPtr>
 struct is_void_pointer_system_convertible
-    : ::internal::_And<_THRUST_STD::is_same<typename pointer_element<FromPtr>::type, void>,
-                       is_pointer_system_convertible<FromPtr, ToPtr>>
+    : _THRUST_STD::_And<_THRUST_STD::is_same<typename pointer_element<FromPtr>::type, void>,
+                        is_pointer_system_convertible<FromPtr, ToPtr>>
 {};
 
 // avoid inspecting traits of the arguments if they aren't known to be pointers
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h
index b0ed2c2bd86e..4d7024d41efa 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.h
@@ -33,20 +33,19 @@
 #endif // no system header
 
 #include <thrust/detail/contiguous_storage.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/normal_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 
 #include _THRUST_STD_INCLUDE(__iterator/iterator_traits.h)
+#include _THRUST_STD_INCLUDE(__iterator/reverse_iterator.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
+#include _THRUST_STD_INCLUDE(__utility/swap.h)
 #include _THRUST_STD_INCLUDE(initializer_list)
-#include _THRUST_STD_INCLUDE(iterator)
-#include _THRUST_STD_INCLUDE(utility)
 
 #include <vector>
 
-#include _THRUST_STD_INCLUDE(initializer_list)
-
 THRUST_NAMESPACE_BEGIN
 
 struct default_init_t
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl
index d1a63e5931d2..aca2a2b2499a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/vector_base.inl
@@ -26,25 +26,27 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/advance.h>
 #include <thrust/detail/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/detail/overlapped_copy.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/vector_base.h>
-#include <thrust/distance.h>
 #include <thrust/equal.h>
 #include <thrust/iterator/iterator_traits.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#endif
-#include _THRUST_STD_INCLUDE(type_traits)
+
+#include _THRUST_STD_INCLUDE(__algorithm/max.h)
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__iterator/next.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_integral.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_trivially_constructible.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
+#include _THRUST_STD_INCLUDE(initializer_list)
 
 #include <stdexcept>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/device_vector.h b/projects/hipccl/hipccl3/rocthrust/thrust/device_vector.h
index 2e4ac69d453a..a02617919b3e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/device_vector.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/device_vector.h
@@ -33,8 +33,8 @@
 #include <thrust/detail/vector_base.h>
 #include <thrust/device_allocator.h>
 
+#include _THRUST_STD_INCLUDE(__utility/move.h)
 #include _THRUST_STD_INCLUDE(initializer_list)
-#include _THRUST_STD_INCLUDE(utility)
 
 #include <vector>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/distance.h b/projects/hipccl/hipccl3/rocthrust/thrust/distance.h
index c9ed0b1ebd8c..4afe345f5fb6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/distance.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/distance.h
@@ -29,9 +29,9 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 
-#include _THRUST_STD_INCLUDE(iterator)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__iterator/iterator_traits.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/functional.h b/projects/hipccl/hipccl3/rocthrust/thrust/functional.h
index ee3d83666188..f48ca6bea437 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/functional.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/functional.h
@@ -31,12 +31,15 @@
 #endif // no system header
 
 #include <thrust/detail/functional/actor.h>
-#include <thrust/detail/libcxx_wrapper/__functional/maximum.h>
-#include <thrust/detail/libcxx_wrapper/__functional/minimum.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/not_fn.h>
 
-#include _THRUST_LIBCXX_INCLUDE(functional)
-#include _THRUST_STD_INCLUDE(functional)
+#include _THRUST_LIBCXX_INCLUDE(__functional/maximum.h)
+#include _THRUST_LIBCXX_INCLUDE(__functional/minimum.h)
+#include _THRUST_STD_INCLUDE(__functional/not_fn.h)
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
+#include _THRUST_STD_INCLUDE(__type_traits/decay.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_constructible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_move_constructible.h)
+#include _THRUST_STD_INCLUDE(__utility/forward.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h b/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h
index 0178b6c6a9f1..bd2927d81345 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h
@@ -33,8 +33,8 @@
 #include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/vector_base.h>
 
+#include _THRUST_STD_INCLUDE(__utility/move.h)
 #include _THRUST_STD_INCLUDE(initializer_list)
-#include _THRUST_STD_INCLUDE(utility)
 
 #include <vector>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/constant_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/constant_iterator.h
index 836883436bab..769694dbc176 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/constant_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/constant_iterator.h
@@ -32,8 +32,8 @@
 #include <thrust/iterator/iterator_adaptor.h>
 #include <thrust/iterator/iterator_facade.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 #include _THRUST_STD_INCLUDE(cstdint)
-#include _THRUST_STD_INCLUDE(type_traits)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h
index 3b122e711d08..1b874f44ebeb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/iterator_facade_category.h
@@ -35,9 +35,11 @@
 #include <thrust/iterator/iterator_categories.h>
 #include <thrust/iterator/iterator_traversal_tags.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/iterator_traits.h)
 #include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
-#include _THRUST_STD_INCLUDE(iterator)
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
index f771b29f4ef1..ed9ee602357f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
@@ -31,10 +31,10 @@
 #include <thrust/detail/reference_forward_declaration.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
 #include _THRUST_STD_INCLUDE(__utility/pair.h)
-
 #include _THRUST_STD_INCLUDE(tuple)
-#include _THRUST_STD_INCLUDE(type_traits)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_categories.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_categories.h
index a4997ace56f5..b0e16b75abc6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_categories.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/iterator_categories.h
@@ -42,7 +42,7 @@
 #include <thrust/iterator/detail/iterator_category_with_system_and_traversal.h>
 #include <thrust/iterator/iterator_traversal_tags.h>
 
-#include _THRUST_STD_INCLUDE(iterator)
+#include _THRUST_STD_INCLUDE(__iterator/iterator_traits.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/reverse_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/reverse_iterator.h
index 3577172a965a..f8e35e3d3d2c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/reverse_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/reverse_iterator.h
@@ -40,7 +40,7 @@
 #  pragma system_header
 #endif // no system header
 
-#include _THRUST_STD_INCLUDE(iterator)
+#include _THRUST_STD_INCLUDE(__iterator/reverse_iterator.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/shuffle_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/shuffle_iterator.h
index 8c3abcf7f0a0..11446bee9b01 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/shuffle_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/shuffle_iterator.h
@@ -33,7 +33,12 @@
 #include <thrust/iterator/iterator_adaptor.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#include <cuda/std/type_traits>
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_constructible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_integral.h)
+#include _THRUST_STD_INCLUDE(__utility/forward.h)
+#include _THRUST_STD_INCLUDE(cstdint)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h
index 401f3bd236da..a35324653946 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/zip_iterator.h
@@ -38,7 +38,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/advance.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/minimum_system.h>
 #include <thrust/iterator/detail/tuple_of_iterator_references.h>
@@ -46,9 +45,14 @@
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/type_traits/integer_sequence.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_constructible.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__utility/declval.h)
+#include _THRUST_STD_INCLUDE(__utility/forward.h)
 #include _THRUST_STD_INCLUDE(tuple)
-#include _THRUST_STD_INCLUDE(type_traits)
-#include _THRUST_STD_INCLUDE(utility)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/mr/validator.h b/projects/hipccl/hipccl3/rocthrust/thrust/mr/validator.h
index aa96fcfba600..c5ef13247666 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/mr/validator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/mr/validator.h
@@ -29,7 +29,7 @@
 #include <thrust/detail/config/memory_resource.h>
 #include <thrust/mr/memory_resource.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/is_base_of.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace mr
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/pair.h b/projects/hipccl/hipccl3/rocthrust/thrust/pair.h
index 400fddf58263..8be518a3fd87 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/pair.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/pair.h
@@ -31,7 +31,10 @@
 #  pragma system_header
 #endif // no system header
 
-#include _THRUST_STD_INCLUDE(utility)
+#include _THRUST_STD_INCLUDE(__tuple_dir/get.h)
+#include _THRUST_STD_INCLUDE(__tuple_dir/tuple_element.h)
+#include _THRUST_STD_INCLUDE(__tuple_dir/tuple_size.h)
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h
index a4b93e51975f..81f83d7e47ef 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/normal_distribution_base.h
@@ -35,7 +35,9 @@
 #endif // no system header
 #include <thrust/random/uniform_real_distribution.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/logarithms.h)
+#include _THRUST_STD_INCLUDE(__cmath/roots.h)
+#include _THRUST_STD_INCLUDE(__cmath/trigonometric_functions.h)
 #include _THRUST_STD_INCLUDE(limits)
 
 #if THRUST_HAS_HIP_COMPILER()
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/uniform_real_distribution.inl b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/uniform_real_distribution.inl
index d037a334a2b9..218585671198 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/uniform_real_distribution.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/uniform_real_distribution.inl
@@ -28,7 +28,7 @@
 
 #include <thrust/random/uniform_real_distribution.h>
 
-#include _THRUST_STD_INCLUDE(cmath)
+#include _THRUST_STD_INCLUDE(__cmath/lerp.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h
index 17c3671d060b..16f380791fdc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/detail/xor_combine_engine_max.h
@@ -30,10 +30,9 @@
 
 #include _THRUST_STD_INCLUDE(__algorithm/max.h)
 #include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#include _THRUST_STD_INCLUDE(cstddef)
 #include _THRUST_STD_INCLUDE(limits)
 
-#include <cstddef>
-
 THRUST_NAMESPACE_BEGIN
 namespace random::detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/random/xor_combine_engine.h b/projects/hipccl/hipccl3/rocthrust/thrust/random/xor_combine_engine.h
index 72caa788436a..4647f35a2ff0 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/random/xor_combine_engine.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/random/xor_combine_engine.h
@@ -36,8 +36,8 @@
 #include <thrust/random/detail/random_core_access.h>
 #include <thrust/random/detail/xor_combine_engine_max.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 #include _THRUST_STD_INCLUDE(cstddef) // for size_t
-#include _THRUST_STD_INCLUDE(type_traits)
 
 #include <iostream>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/swap.h b/projects/hipccl/hipccl3/rocthrust/thrust/swap.h
index cc4369b0b0c4..d60e2b746dd5 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/swap.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/swap.h
@@ -31,43 +31,11 @@
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(utility)
-#endif
+#include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 THRUST_NAMESPACE_BEGIN
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 using _THRUST_STD::swap;
-#else
-/*! \p swap assigns the contents of \c a to \c b and the
- *  contents of \c b to \c a. This is used as a primitive operation
- *  by many other algorithms.
- *
- *  \param a The first value of interest. After completion,
- *           the value of b will be returned here.
- *  \param b The second value of interest. After completion,
- *           the value of a will be returned here.
- *
- *  \tparam Assignable is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>.
- *
- *  The following code snippet demonstrates how to use \p swap to
- *  swap the contents of two variables.
- *
- *  \code
- *  #include <thrust/swap.h>
- *  ...
- *  int x = 1;
- *  int y = 2;
- *  thrust::swap(x,h);
- *
- *  // x == 2, y == 1
- *  \endcode
- */
-template <typename Assignable1, typename Assignable2>
-THRUST_HOST_DEVICE inline void swap(Assignable1& a, Assignable2& b);
-#endif
 
 /*! \addtogroup copying
  *  \{
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cpp/pointer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cpp/pointer.h
index e77e3fe11261..9deae3b95090 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cpp/pointer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cpp/pointer.h
@@ -32,7 +32,7 @@
 #include <thrust/detail/reference.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::cpp
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/generate.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/generate.h
index 2b735b8f6a65..438d50c0930e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/generate.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/generate.h
@@ -21,8 +21,6 @@
 #  include <cuda/std/__iterator/distance.h>
 #  include <cuda/std/tuple>
 
-#  include <iterator>
-
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_reduce.h
index 2ea45edad72b..15a4e53da6fe 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_reduce.h
@@ -57,8 +57,6 @@
 #  include <cuda/std/__iterator/distance.h>
 #  include <cuda/std/cstdint>
 
-#  include <iterator>
-
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_scan.h
index 53c308fbeb79..433ae1b96424 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform_scan.h
@@ -44,8 +44,6 @@
 #  include <cuda/std/__iterator/distance.h>
 #  include <cuda/std/__type_traits/remove_cvref.h>
 
-#  include <iterator>
-
 THRUST_NAMESPACE_BEGIN
 
 namespace cuda_cub
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h
index b57d2ab4ef1e..797b29155ee2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h
@@ -49,8 +49,6 @@
 #  include <cuda/std/__type_traits/is_trivially_copy_assignable.h>
 #  include <cuda/std/__type_traits/is_trivially_copy_constructible.h>
 
-#  include <iterator>
-
 THRUST_NAMESPACE_BEGIN
 
 namespace cuda_cub
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h
index 3d256ac2567d..51985422a049 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h
@@ -47,8 +47,6 @@
 #  include <cuda/std/__type_traits/is_trivially_assignable.h>
 #  include <cuda/std/__type_traits/is_trivially_constructible.h>
 
-#  include <iterator>
-
 THRUST_NAMESPACE_BEGIN
 
 namespace cuda_cub
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl
index a9510be8f325..b5c461f80d49 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/binary_search.inl
@@ -29,14 +29,14 @@
 #include <thrust/detail/function.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/distance.h>
 #include <thrust/for_each.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/system/detail/generic/scalar/binary_search.h>
 #include <thrust/system/detail/generic/select_system.h>
 
-#include _THRUST_STD_INCLUDE(functional)
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/copy_if.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/copy_if.inl
index 649cbe104b27..451d74108e86 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/copy_if.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/copy_if.inl
@@ -29,7 +29,6 @@
 #include <thrust/detail/internal_functional.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/distance.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/scan.h>
@@ -37,12 +36,11 @@
 #include <thrust/system/detail/generic/copy_if.h>
 #include <thrust/transform.h>
 
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__type_traits/make_unsigned.h)
 #include _THRUST_STD_INCLUDE(limits)
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <limits>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
@@ -129,7 +127,7 @@ THRUST_HOST_DEVICE OutputIterator copy_if(
 
   // create an unsigned version of n (we know n is positive from the comparison above)
   // to avoid a warning in the compare below
-  ::internal::make_unsigned_t<difference_type> unsigned_n(n);
+  _THRUST_STD::make_unsigned_t<difference_type> unsigned_n(n);
 
   // use 32-bit indices when possible (almost always)
   if (sizeof(difference_type) > sizeof(unsigned int) && unsigned_n > _THRUST_STD::numeric_limits<unsigned int>::max())
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/equal.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/equal.inl
index ca1de159fd2a..08d6b550815a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/equal.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/equal.inl
@@ -29,7 +29,7 @@
 #include <thrust/mismatch.h>
 #include <thrust/system/detail/generic/equal.h>
 
-#include _THRUST_STD_INCLUDE(functional)
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/generate.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/generate.inl
index bcf9cb9eadbd..20b0eddbea80 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/generate.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/generate.inl
@@ -28,7 +28,8 @@
 
 #include <thrust/for_each.h>
 
-#include _THRUST_STD_INCLUDE(utility)
+#include _THRUST_STD_INCLUDE(__utility/forward.h)
+#include _THRUST_STD_INCLUDE(__utility/move.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl
index 51dd971614ec..206a93af7750 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/partition.inl
@@ -25,7 +25,7 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/advance.h>
+
 #include <thrust/count.h>
 #include <thrust/detail/internal_functional.h>
 #include <thrust/detail/temporary_array.h>
@@ -36,6 +36,8 @@
 #include <thrust/sort.h>
 #include <thrust/system/detail/generic/partition.h>
 
+#include _THRUST_STD_INCLUDE(__functional/not_fn.h)
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
 #include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
index cbfcb5f5a7d2..00767264695b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
@@ -36,10 +36,8 @@
 #include <thrust/scatter.h>
 #include <thrust/transform.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(iterator)
-#endif
-
+#include _THRUST_STD_INCLUDE(__functional/not_fn.h)
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
 #include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
 #include _THRUST_STD_INCLUDE(limits)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reverse.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reverse.inl
index 941e47842f27..40f32296c99f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reverse.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/reverse.inl
@@ -25,14 +25,14 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/advance.h>
 #include <thrust/detail/copy.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/swap.h>
 #include <thrust/system/detail/generic/reverse.h>
 
-#include _THRUST_STD_INCLUDE(iterator)
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__iterator/reverse_iterator.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/select_system.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/select_system.h
index 9876741e267b..3fde4f5bb1d7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/select_system.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/select_system.h
@@ -32,7 +32,10 @@
 #include <thrust/iterator/detail/device_system_tag.h>
 #include <thrust/iterator/detail/minimum_system.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/void_t.h)
+#include _THRUST_STD_INCLUDE(__utility/declval.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/sort.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/sort.inl
index a94efd076cd7..092ccb2469e9 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/sort.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/sort.inl
@@ -26,7 +26,6 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/internal_functional.h>
-#include <thrust/distance.h>
 #include <thrust/find.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
@@ -34,6 +33,10 @@
 #include <thrust/system/detail/generic/sort.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/swap_ranges.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/swap_ranges.inl
index bb1522c2751e..cdc503aa3fc3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/swap_ranges.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/swap_ranges.inl
@@ -31,9 +31,7 @@
 #include <thrust/system/detail/generic/swap_ranges.h>
 #include <thrust/tuple.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(utility)
-#endif
+#include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
@@ -48,11 +46,7 @@ struct swap_pair_elements
   THRUST_HOST_DEVICE void operator()(Tuple t)
   {
     // use unqualified swap to allow ADL to catch any user-defined swap
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
     using _THRUST_STD::swap;
-#else
-    using thrust::swap;
-#endif
     swap(thrust::get<0>(t), thrust::get<1>(t));
   }
 }; // end swap_pair_elements
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/tabulate.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/tabulate.inl
index 965ff8b4c66e..79a079b7bc22 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/tabulate.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/tabulate.inl
@@ -25,12 +25,14 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/distance.h>
+
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/tabulate.h>
 #include <thrust/transform.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/transform_scan.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/transform_scan.inl
index dc2b5a641441..0e9ca5d75601 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/transform_scan.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/transform_scan.inl
@@ -30,9 +30,7 @@
 #include <thrust/scan.h>
 #include <thrust/system/detail/generic/transform_scan.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(type_traits)
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
@@ -53,7 +51,7 @@ THRUST_HOST_DEVICE OutputIterator transform_inclusive_scan(
   // Use the input iterator's value type per https://wg21.link/P0571
   using InputType  = thrust::detail::it_value_t<InputIterator>;
   using ResultType = thrust::detail::invoke_result_t<UnaryFunction, InputType>;
-  using ValueType  = ::internal::remove_cvref_t<ResultType>;
+  using ValueType  = _THRUST_STD::remove_cvref_t<ResultType>;
 
   thrust::transform_iterator<UnaryFunction, InputIterator, ValueType> _first(first, unary_op);
   thrust::transform_iterator<UnaryFunction, InputIterator, ValueType> _last(last, unary_op);
@@ -78,7 +76,7 @@ THRUST_HOST_DEVICE OutputIterator transform_inclusive_scan(
 {
   using InputType  = thrust::detail::it_value_t<InputIterator>;
   using ResultType = thrust::detail::invoke_result_t<UnaryFunction, InputType>;
-  using ValueType  = ::internal::remove_cvref_t<ResultType>;
+  using ValueType  = _THRUST_STD::remove_cvref_t<ResultType>;
 
   thrust::transform_iterator<UnaryFunction, InputIterator, ValueType> _first(first, unary_op);
   thrust::transform_iterator<UnaryFunction, InputIterator, ValueType> _last(last, unary_op);
@@ -102,7 +100,7 @@ THRUST_HOST_DEVICE OutputIterator transform_exclusive_scan(
   AssociativeOperator binary_op)
 {
   // Use the initial value type per https://wg21.link/P0571
-  using ValueType = ::internal::remove_cvref_t<InitialValueType>;
+  using ValueType = _THRUST_STD::remove_cvref_t<InitialValueType>;
 
   thrust::transform_iterator<UnaryFunction, InputIterator, ValueType> _first(first, unary_op);
   thrust::transform_iterator<UnaryFunction, InputIterator, ValueType> _last(last, unary_op);
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique.inl
index 146de0751a56..890aae916ef9 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/unique.inl
@@ -30,13 +30,14 @@
 #include <thrust/detail/internal_functional.h>
 #include <thrust/detail/range/head_flags.h>
 #include <thrust/detail/temporary_array.h>
-#include <thrust/distance.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/unique.h>
 #include <thrust/transform.h>
 #include <thrust/unique.h>
 
+#include _THRUST_STD_INCLUDE(__functional/operations.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::generic
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/binary_search.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/binary_search.h
index 722f9087df8e..8bd401e65c48 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/binary_search.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/binary_search.h
@@ -30,10 +30,12 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/advance.h>
 #include <thrust/detail/function.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/system/detail/sequential/execution_policy.h>
+
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/iter_swap.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/iter_swap.h
index ddbe1349d8ea..fda7673fe420 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/iter_swap.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/iter_swap.h
@@ -28,9 +28,7 @@
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(utility)
-#endif
+#include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
@@ -38,11 +36,7 @@ namespace system::detail::sequential
 template <typename DerivedPolicy, typename Pointer1, typename Pointer2>
 THRUST_HOST_DEVICE void iter_swap(sequential::execution_policy<DerivedPolicy>&, Pointer1 a, Pointer2 b)
 {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || !_THRUST_USE_ROCPRIM
   using _THRUST_STD::swap;
-#else
-  using thrust::swap;
-#endif
   swap(*thrust::raw_pointer_cast(a), *thrust::raw_pointer_cast(b));
 } // end iter_swap()
 } // namespace system::detail::sequential
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
index e080d564d885..ef56a93b1d95 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
@@ -35,6 +35,8 @@
 
 #include _THRUST_STD_INCLUDE(__algorithm/min.h)
 
+#include <nv/target>
+
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h
index e4bd4f589bcd..36ed01f3d544 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h
@@ -35,9 +35,9 @@
 #include <thrust/scatter.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__utility/declval.h)
 #include _THRUST_STD_INCLUDE(cstdint)
 #include _THRUST_STD_INCLUDE(limits)
-#include _THRUST_STD_INCLUDE(utility)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::detail::sequential
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h
index d3828ca5978f..9400ec297e8e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/adjacent_difference.h
@@ -50,7 +50,7 @@
 #  include <thrust/type_traits/is_contiguous_iterator.h>
 #  include <thrust/type_traits/unwrap_contiguous_iterator.h>
 
-#  include _THRUST_STD_INCLUDE(type_traits)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 
 // rocprim include
 #  include <rocprim/rocprim.hpp>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h
index 758363b54e7f..043e4e53c0e1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/binary_search.h
@@ -36,6 +36,7 @@
 #  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/execution_policy.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
index 70bc55b210e1..a2b820e4c8c5 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
@@ -47,6 +47,10 @@
 #include <thrust/system/hip/detail/util.h>
 #include <thrust/type_traits/is_trivially_relocatable.h>
 
+#include _THRUST_STD_INCLUDE(__functional/identity.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#include _THRUST_STD_INCLUDE(__iterator/next.h)
+
 THRUST_NAMESPACE_BEGIN
 
 template <typename DerivedPolicy, typename InputIt, typename OutputIt>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h
index e05e4a2bec43..3868feaf35de 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy_if.h
@@ -56,6 +56,7 @@
 #  include <thrust/system/hip/detail/general/temp_storage.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/count.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/count.h
index 8a74f95014a4..86f9081b31fa 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/count.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/count.h
@@ -45,6 +45,8 @@
 #  include <thrust/system/hip/detail/reduce.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h
index 45f51267ecde..c6167bddc1be 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/dispatch.h
@@ -29,12 +29,12 @@
 
 #include <thrust/detail/preprocessor.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(cstdint)
-#  include _THRUST_STD_INCLUDE(limits)
-#  include _THRUST_STD_INCLUDE(type_traits)
-#  include _THRUST_STD_INCLUDE(__host_stdlib/stdexcept)
-#endif
+#include _THRUST_STD_INCLUDE(__type_traits/enable_if.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_arithmetic.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_unsigned.h)
+#include _THRUST_STD_INCLUDE(cstdint)
+#include _THRUST_STD_INCLUDE(limits)
+#include _THRUST_STD_INCLUDE(__host_stdlib/stdexcept)
 
 #include <string>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/equal.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/equal.h
index f10bbae673e8..ff4703b6d003 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/equal.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/equal.h
@@ -42,6 +42,8 @@
 
 #  include <thrust/system/hip/detail/mismatch.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h
index cc2b481fb826..3eaff0098dfc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/extrema.h
@@ -54,8 +54,8 @@
 // rocprim include
 #  include <rocprim/rocprim.hpp>
 
-#  include _THRUST_STD_INCLUDE(iterator)
-
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__utility/pair.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/fill.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/fill.h
index 61ca4457f676..26866019b1fd 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/fill.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/fill.h
@@ -42,6 +42,8 @@
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/for_each.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/for_each.h
index 38155547e977..9a71c2ec87d1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/for_each.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/for_each.h
@@ -45,6 +45,8 @@
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 THRUST_NAMESPACE_BEGIN
 
 namespace hip_rocprim
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/gather.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/gather.h
index c1ff765f9f14..eb3bd8728cea 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/gather.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/gather.h
@@ -41,6 +41,8 @@
 #  include <thrust/iterator/permutation_iterator.h>
 #  include <thrust/system/hip/detail/transform.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/identity.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h
index 22b94a82d655..f8bddc829763 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h
@@ -43,6 +43,8 @@
 #  include <thrust/distance.h>
 #  include <thrust/system/hip/detail/for_each.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 #  include <iterator>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/inner_product.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/inner_product.h
index 35c9ecd8b56e..9ac39d6a8489 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/inner_product.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/inner_product.h
@@ -44,6 +44,8 @@
 #  include <thrust/system/hip/detail/reduce.h>
 #  include <thrust/zip_function.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 // rocPRIM includes
 #  include <rocprim/rocprim.hpp>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h
index aaa0032fab9d..d1fc18ce94b8 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h
@@ -35,9 +35,7 @@
 #  include <thrust/swap.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(utility)
-#  endif
+#  include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
@@ -56,11 +54,7 @@ inline THRUST_HOST_DEVICE void iter_swap(thrust::hip::execution_policy<DerivedPo
 
     THRUST_DEVICE inline static void device_path(Pointer1 a, Pointer2 b)
     {
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
       using _THRUST_STD::swap;
-#  else
-      using thrust::swap;
-#  endif
       swap(*thrust::raw_pointer_cast(a), *thrust::raw_pointer_cast(b));
     }
   };
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h
index 0c586d7eeb7d..a62ebc1a5d9a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/merge.h
@@ -46,6 +46,8 @@
 #  include <thrust/system/hip/detail/dispatch.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__utility/pair.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocPRIM includes
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
index e30f0d9b1789..94ca7eb7d183 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/partition.h
@@ -52,6 +52,8 @@
 #  include <thrust/system/hip/detail/uninitialized_copy.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__utility/pair.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocprim include
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h
index d29e40ca7f7b..79d4a7ae80fb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce.h
@@ -52,6 +52,7 @@
 #  include <thrust/system/hip/detail/get_value.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocprim include
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
index d3d99e7dda4b..97ad7f3a60ab 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reduce_by_key.h
@@ -54,11 +54,10 @@
 #  include <thrust/system/hip/detail/get_value.h>
 #  include <thrust/system/hip/detail/util.h>
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(iterator)
-#  endif
-
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
+#  include _THRUST_STD_INCLUDE(__utility/pair.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocprim include
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/remove.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/remove.h
index 96b1913c2287..e215d462103f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/remove.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/remove.h
@@ -40,6 +40,8 @@
 #if THRUST_HAS_HIP_COMPILER()
 #  include <thrust/system/hip/detail/copy_if.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/not_fn.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reverse.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reverse.h
index 4ccb8dce1e84..39ec63ba3ff1 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reverse.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/reverse.h
@@ -59,7 +59,9 @@ THRUST_NAMESPACE_END
 #  include <thrust/system/hip/detail/copy.h>
 #  include <thrust/system/hip/detail/swap_ranges.h>
 
-#  include _THRUST_STD_INCLUDE(iterator)
+#  include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__iterator/reverse_iterator.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h
index 6c8c91706aa5..2f9b92c08f32 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan.h
@@ -47,6 +47,8 @@
 #  include <thrust/iterator/iterator_traits.h>
 #  include <thrust/system/hip/detail/dispatch.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocprim include
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h
index 8d932671b717..58d99a9b77cb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scan_by_key.h
@@ -51,6 +51,8 @@
 #  include <thrust/type_traits/is_contiguous_iterator.h>
 #  include <thrust/type_traits/unwrap_contiguous_iterator.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocprim include
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h
index 93579a6d69b4..c06ab89079ce 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h
@@ -41,6 +41,8 @@
 #  include <thrust/iterator/permutation_iterator.h>
 #  include <thrust/system/hip/detail/transform.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/identity.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
index f7df168052e1..fe33d538f942 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/set_operations.h
@@ -53,6 +53,8 @@
 #  include _THRUST_STD_INCLUDE(__algorithm/max.h)
 #  include _THRUST_STD_INCLUDE(__algorithm/min.h)
 #  include _THRUST_STD_INCLUDE(__bit/popcount.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__utility/pair.h)
 
 #  include <rocprim/rocprim.hpp>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
index ae9bef1e9bd5..5457751189bf 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/sort.h
@@ -51,6 +51,9 @@
 #  include <thrust/system/hip/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__type_traits/integral_constant.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 #  include <functional>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/swap_ranges.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/swap_ranges.h
index 2930973a94c8..5f94f4ce3f17 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/swap_ranges.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/swap_ranges.h
@@ -44,11 +44,10 @@
 #  include <thrust/system/hip/detail/transform.h>
 #  include <thrust/type_traits/is_trivially_relocatable.h>
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_LIBCXX_INCLUDE(functional)
-#    include _THRUST_STD_INCLUDE(algorithm)
-#    include _THRUST_STD_INCLUDE(iterator)
-#  endif
+#  include _THRUST_LIBCXX_INCLUDE(__functional/address_stability.h)
+#  include _THRUST_STD_INCLUDE(__algorithm/iter_swap.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
index ecc87fd34d15..d02452c86fdc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/temporary_buffer.h
@@ -31,9 +31,8 @@
 #include <thrust/system/detail/bad_alloc.h>
 #include <thrust/system/hip/detail/execution_policy.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
+#include _THRUST_STD_INCLUDE(__utility/pair.h)
+#include _THRUST_STD_INCLUDE(cstddef)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h
index 0ff3678509e2..9bcf465712d8 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_reduce.h
@@ -52,6 +52,7 @@
 #  include <thrust/system/hip/detail/reduce.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 #  include <iterator>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_scan.h
index a529b70fb897..a6c13978c205 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform_scan.h
@@ -35,6 +35,9 @@
 #  include <thrust/iterator/transform_iterator.h>
 #  include <thrust/system/hip/detail/scan.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
+
 #  include <iterator> // IWYU pragma: export
 
 // rocprim include
@@ -57,7 +60,7 @@ OutputIt THRUST_HOST_DEVICE transform_inclusive_scan(
   // Use the transformed input iterator's value type per https://wg21.link/P0571
   using input_type  = thrust::detail::it_value_t<InputIt>;
   using result_type = thrust::detail::invoke_result_t<TransformOp, input_type>;
-  using value_type  = ::internal::remove_cvref_t<result_type>;
+  using value_type  = _THRUST_STD::remove_cvref_t<result_type>;
 
   using size_type              = thrust::detail::it_difference_t<InputIt>;
   size_type num_items          = static_cast<size_type>(_THRUST_STD::distance(first, last));
@@ -78,7 +81,7 @@ OutputIt THRUST_HOST_DEVICE transform_inclusive_scan(
 {
   using input_type  = thrust::detail::it_value_t<InputIt>;
   using result_type = thrust::detail::invoke_result_t<TransformOp, input_type>;
-  using value_type  = ::internal::remove_cvref_t<result_type>;
+  using value_type  = _THRUST_STD::remove_cvref_t<result_type>;
 
   using size_type              = thrust::detail::it_difference_t<InputIt>;
   size_type num_items          = static_cast<size_type>(_THRUST_STD::distance(first, last));
@@ -99,7 +102,7 @@ OutputIt THRUST_HOST_DEVICE transform_exclusive_scan(
   ScanOp scan_op)
 {
   // Use the initial value type per https://wg21.link/P0571
-  using result_type = ::internal::remove_cvref_t<InitialValueType>;
+  using result_type = _THRUST_STD::remove_cvref_t<InitialValueType>;
 
   using size_type              = thrust::detail::it_difference_t<InputIt>;
   size_type num_items          = static_cast<size_type>(_THRUST_STD::distance(first, last));
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
index a08ecddcb034..323738e1ab8c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
@@ -43,6 +43,7 @@
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(__new/device_new.h)
 
 #  include <iterator>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h
index e3a4006f3928..4ebe82f5c2c7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique.h
@@ -51,6 +51,9 @@
 #  include <thrust/system/hip/detail/get_value.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__iterator/next.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocPRIM includes
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
index 9409acc40f09..87a3487a8de7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/unique_by_key.h
@@ -51,6 +51,9 @@
 #  include <thrust/system/hip/detail/get_value.h>
 #  include <thrust/system/hip/detail/util.h>
 
+#  include _THRUST_STD_INCLUDE(__functional/operations.h)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__utility/pair.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 // rocPRIM includes
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/error.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/error.h
index d45e55faca38..54d4d3e95eef 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/error.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/error.h
@@ -33,6 +33,8 @@
 #include <thrust/detail/type_traits.h>
 #include <thrust/system/error_code.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/integral_constant.h)
+
 THRUST_NAMESPACE_BEGIN
 
 namespace system
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/pointer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/pointer.h
index cc816c38c45b..e95613231f60 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/pointer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/pointer.h
@@ -34,6 +34,8 @@
 #include <thrust/detail/reference.h>
 #include <thrust/system/hip/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
+
 #include <type_traits>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/copy.h
index 3b0c07ddaea3..dc38ff8b262e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/copy.h
@@ -18,7 +18,7 @@
 #include <thrust/system/detail/sequential/copy.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::omp::detail
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/for_each.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/for_each.h
index e3986379493f..7cdb950bfae3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/for_each.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/for_each.h
@@ -20,12 +20,13 @@
 
 #include <thrust/detail/function.h>
 #include <thrust/detail/static_assert.h>
-#include <thrust/distance.h>
 #include <thrust/for_each.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 #include <thrust/system/omp/detail/pragma_omp.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::omp::detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce.h
index c6623abf44a7..395d3febea95 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce.h
@@ -18,12 +18,13 @@
 #endif // no system header
 
 #include <thrust/detail/temporary_array.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/omp/detail/default_decomposition.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 #include <thrust/system/omp/detail/reduce_intervals.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 THRUST_NAMESPACE_BEGIN
 namespace system::omp::detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h
index 755b3da0ce2d..5c78aa2f92d3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/reduce_by_key.h
@@ -17,7 +17,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/distance.h>
 #include <thrust/system/detail/generic/reduce_by_key.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
index e5bf833e65bf..f11ed0f77f60 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/detail/scan.h
@@ -22,8 +22,6 @@
 #include <thrust/system/omp/detail/pragma_omp.h>
 
 #include _THRUST_LIBCXX_INCLUDE(__cmath/ceil_div.h)
-#include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#include _THRUST_STD_INCLUDE(__algorithm/min.h)
 #include _THRUST_STD_INCLUDE(__functional/invoke.h)
 #include _THRUST_STD_INCLUDE(__iterator/advance.h)
 #include _THRUST_STD_INCLUDE(__iterator/distance.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/pointer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/pointer.h
index e263b3695564..a71475e8b057 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/pointer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/omp/pointer.h
@@ -34,7 +34,7 @@
 #include <thrust/detail/reference.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::omp
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy.h
index ac6bf1f3601d..5faba0b48c91 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy.h
@@ -18,7 +18,7 @@
 #include <thrust/system/detail/sequential/copy.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::tbb::detail
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy_if.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy_if.h
index ed5f9fea86a8..1084daf49c33 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy_if.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/copy_if.h
@@ -12,11 +12,14 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
+
 #include <thrust/detail/function.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/advance.h)
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_scan.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/for_each.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/for_each.h
index 9de0f70e5b10..9b4c0636678b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/for_each.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/for_each.h
@@ -12,12 +12,14 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
+
 #include <thrust/detail/seq.h>
 #include <thrust/detail/static_assert.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce.h
index d01a3806d152..3be8fc1e310b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce.h
@@ -18,11 +18,12 @@
 #endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/detail/static_assert.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/reduce.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_reduce.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_intervals.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_intervals.h
index 6bdd0d067136..3f5df03b7df2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_intervals.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/reduce_intervals.h
@@ -18,14 +18,9 @@
 #include <thrust/system/cpp/memory.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#  include _THRUST_STD_INCLUDE(cassert)
-#  include _THRUST_STD_INCLUDE(type_traits)
-#else
-#  include <thrust/detail/algorithm_wrapper.h>
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#include _THRUST_STD_INCLUDE(__type_traits/decay.h)
+#include _THRUST_STD_INCLUDE(cassert)
 
 #include <tbb/parallel_for.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/sort.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/sort.h
index 01f017e17b49..d3d005c936b7 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/sort.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/detail/sort.h
@@ -15,12 +15,13 @@
 #include <thrust/detail/copy.h>
 #include <thrust/detail/seq.h>
 #include <thrust/detail/temporary_array.h>
-#include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/merge.h>
 #include <thrust/sort.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__iterator/distance.h)
+
 #include <tbb/parallel_invoke.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/pointer.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/pointer.h
index f055f243bf68..8870de11ca9f 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/pointer.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/tbb/pointer.h
@@ -20,7 +20,7 @@
 #include <thrust/detail/reference.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace system::tbb
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/transform.h b/projects/hipccl/hipccl3/rocthrust/thrust/transform.h
index d843240fcf07..8b7a376395a9 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/transform.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/transform.h
@@ -34,7 +34,7 @@
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
 
-#include <cuda/std/iterator>
+#include _THRUST_STD_INCLUDE(__iterator/incrementable_traits.h)
 
 // Include all active backend system implementations (generic, sequential, host and device)
 #include <thrust/system/detail/generic/transform.h>
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/integer_sequence.h b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/integer_sequence.h
index 00096403f67f..6d35faeba166 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/integer_sequence.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/integer_sequence.h
@@ -32,13 +32,8 @@
 #  pragma system_header
 #endif // no system header
 
-#include _THRUST_STD_INCLUDE(utility)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(cstdint)
-#  include _THRUST_STD_INCLUDE(type_traits)
-#else
-#  include <cstddef>
-#endif
+#include _THRUST_STD_INCLUDE(__utility/integer_sequence.h)
+#include _THRUST_STD_INCLUDE(cstdint)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h
index 96defbdb1c11..59d17ccc3493 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_contiguous_iterator.h
@@ -33,11 +33,10 @@
 #endif // no system header
 #include <thrust/detail/type_traits/is_thrust_pointer.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER > 2020
-#  include _THRUST_STD_INCLUDE(iterator)
-#else
-#  include <type_traits>
-#endif
+#include _THRUST_STD_INCLUDE(__iterator/concepts.h)
+#include _THRUST_STD_INCLUDE(__type_traits/integral_constant.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_pointer.h)
+#include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_trivially_relocatable.h b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_trivially_relocatable.h
index 27f4cffdb72f..e97f6c0f1ccb 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_trivially_relocatable.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/is_trivially_relocatable.h
@@ -37,18 +37,11 @@
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__fwd/pair.h)
-#  include _THRUST_STD_INCLUDE(__fwd/tuple.h)
-#  include _THRUST_STD_INCLUDE(__type_traits/conjunction.h)
-#endif
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#  include <tuple>
-#  include <utility>
-#endif
+#include _THRUST_STD_INCLUDE(__fwd/pair.h)
+#include _THRUST_STD_INCLUDE(__fwd/tuple.h)
+#include _THRUST_STD_INCLUDE(__type_traits/conjunction.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_same.h)
+#include _THRUST_STD_INCLUDE(__type_traits/is_trivially_copyable.h)
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/unwrap_contiguous_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/unwrap_contiguous_iterator.h
index aa9efc2aa0cd..33a81029d53e 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/unwrap_contiguous_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/type_traits/unwrap_contiguous_iterator.h
@@ -22,6 +22,8 @@
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
+#include _THRUST_STD_INCLUDE(__utility/declval.h)
+
 THRUST_NAMESPACE_BEGIN
 
 //! Converts a contiguous iterator to its underlying raw pointer.

From 464aa44c790a1de8304abec538ac3752eee11422 Mon Sep 17 00:00:00 2001
From: Wayne Franz <wayfranz@amd.com>
Date: Fri, 30 Oct 2026 11:49:07 -0400
Subject: [PATCH 36/48] refactor(rocthrust): CCCL ab99d87e866 parity - move
 nvhpc header wrappers to libhipcxx

Related upstream commit: ab99d87e866 Move nvhpc header wrappers to libcudacxx. (NVIDIA/cccl#6167)
Related local port commit: 48c541b

Apply the thrust/thrust portion of upstream CCCL commit ab99d87e866
("Move nvhpc header wrappers to libcudacxx (#6167)"): delete the local
thrust::detail::{algorithm,memory,numeric}_wrapper.h nvhpc include-cycle
guards and pull the equivalents in from libhipcxx instead.

Since rocThrust treats libhipcxx as a hard dependency, the upstream
include of <cuda/std/__cccl/{algorithm,memory}_wrapper.h> is wrapped in
the _THRUST_STD_INCLUDE macro, and further updated to the paths CCCL
uses as of v3.4.0: <cuda/std/__host_stdlib/{algorithm,memory}> (the
__cccl/*_wrapper.h headers were themselves renamed upstream). No
numeric_wrapper.h include existed in any of the touched files.

thrust/detail/allocator/allocator_traits.h was deleted entirely further
upstream in favor of using cuda::std::allocator_traits directly; that is
a separate, unrelated refactor and is not part of this change - the file
and its callers are kept as-is here, with only its own wrapper include
updated.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../hipccl3/rocthrust/test/test_utils.hpp     |  8 +---
 .../hipccl3/rocthrust/thrust/addressof.h      |  6 +--
 .../rocthrust/thrust/allocate_unique.h        |  2 +-
 .../thrust/detail/algorithm_wrapper.h         | 37 -----------------
 .../detail/allocator/allocator_traits.h       |  2 +-
 .../detail/allocator/copy_construct_range.h   |  2 +-
 .../thrust/detail/allocator/destroy_range.h   |  3 +-
 .../detail/allocator/fill_construct_range.h   |  3 +-
 .../thrust/detail/internal_functional.h       |  2 +-
 .../std/__memory/construct_at.h               |  2 +-
 .../thrust/detail/memory_algorithms.h         |  2 +-
 .../rocthrust/thrust/detail/memory_wrapper.h  | 40 -------------------
 .../rocthrust/thrust/detail/numeric_wrapper.h | 37 -----------------
 .../rocthrust/thrust/detail/temporary_array.h |  2 +-
 .../hipccl/hipccl3/rocthrust/thrust/extrema.h | 10 +----
 .../hipccl3/rocthrust/thrust/host_vector.h    |  2 +-
 .../rocthrust/thrust/mr/disjoint_pool.h       |  2 +-
 .../hipccl/hipccl3/rocthrust/thrust/mr/pool.h |  2 +-
 .../thrust/system/detail/generic/find.inl     |  7 +---
 19 files changed, 19 insertions(+), 152 deletions(-)
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/detail/algorithm_wrapper.h
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_wrapper.h
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/thrust/detail/numeric_wrapper.h

diff --git a/projects/hipccl/hipccl3/rocthrust/test/test_utils.hpp b/projects/hipccl/hipccl3/rocthrust/test/test_utils.hpp
index fee7a8819b90..8d265d83c278 100644
--- a/projects/hipccl/hipccl3/rocthrust/test/test_utils.hpp
+++ b/projects/hipccl/hipccl3/rocthrust/test/test_utils.hpp
@@ -37,13 +37,7 @@
 
 #include <gtest/gtest.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#else
-#  include <thrust/detail/algorithm_wrapper.h>
-
-#  include <limits>
-#endif
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
 
 #define TEST_EVENT_WAIT(e) test_event_wait(e)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/addressof.h b/projects/hipccl/hipccl3/rocthrust/thrust/addressof.h
index cf3e948596a4..cf5a692c9538 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/addressof.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/addressof.h
@@ -15,11 +15,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__memory/addressof.h)
-#else
-#  include <thrust/detail/memory_wrapper.h>
-#endif
+#include _THRUST_STD_INCLUDE(__memory/addressof.h)
 
 THRUST_NAMESPACE_BEGIN
 using _THRUST_STD::addressof;
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h b/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h
index 314020218d52..4344f1cf7d66 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/allocate_unique.h
@@ -16,10 +16,10 @@
 #endif // no system header
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/memory_algorithms.h>
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/detail/type_deduction.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
 #include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
 #include _THRUST_STD_INCLUDE(__utility/move.h)
 #include _THRUST_STD_INCLUDE(__utility/swap.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/algorithm_wrapper.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/algorithm_wrapper.h
deleted file mode 100644
index c732e106c1df..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/algorithm_wrapper.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright 2020 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-// When a compiler uses Thrust as part of its implementation of Standard C++
-// algorithms, a cycle of included files may result when Thrust code tries to
-// use a standard algorithm.  Having a macro that is defined only when Thrust
-// is including an algorithms-related header gives the compiler a chance to
-// detect and break the cycle of includes.
-
-#define THRUST_INCLUDING_ALGORITHMS_HEADER
-#include <algorithm>
-#undef THRUST_INCLUDING_ALGORITHMS_HEADER
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h
index 7f6c0826c287..8ea0ab2f3534 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/allocator_traits.h
@@ -31,7 +31,6 @@
 #endif // no system header
 
 #include <thrust/detail/allocator/allocator_traits.h>
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/type_deduction.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/has_member_function.h>
@@ -39,6 +38,7 @@
 #include <thrust/detail/type_traits/is_call_possible.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
 #include _THRUST_STD_INCLUDE(__type_traits/add_lvalue_reference.h)
 #include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
 #include _THRUST_STD_INCLUDE(__type_traits/is_empty.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
index 97cfc068bcb9..015135fafbf6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/copy_construct_range.h
@@ -29,13 +29,13 @@
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/copy.h>
 #include <thrust/detail/execution_policy.h>
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/for_each.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/tuple.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
 #include _THRUST_STD_INCLUDE(__iterator/advance.h)
 #include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h
index b18b57423bde..5c86d96bd962 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/destroy_range.h
@@ -28,10 +28,11 @@
 
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/allocator/destroy_range.h>
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/for_each.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
+
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h
index b86b2ae17193..62dcabe7c669 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/allocator/fill_construct_range.h
@@ -27,12 +27,13 @@
 #endif // no system header
 
 #include <thrust/detail/allocator/allocator_traits.h>
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/for_each.h>
 #include <thrust/uninitialized_fill.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
+
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
index f14052665f13..584f31956923 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/internal_functional.h
@@ -31,7 +31,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/memory_wrapper.h> // for ::new
 #include <thrust/detail/raw_reference_cast.h>
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/type_traits.h>
@@ -44,6 +43,7 @@
 #include _THRUST_LIBCXX_INCLUDE(__iterator/tabulate_output_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/transform_input_output_iterator.h)
 #include _THRUST_LIBCXX_INCLUDE(__iterator/transform_output_iterator.h)
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory) // for ::new
 #include _THRUST_STD_INCLUDE(__new/device_new.h)
 #include _THRUST_STD_INCLUDE(__tuple_dir/get.h)
 #include _THRUST_STD_INCLUDE(__tuple_dir/tuple_element.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/libcxx_wrapper/std/__memory/construct_at.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/libcxx_wrapper/std/__memory/construct_at.h
index 67f816cb37a2..d2de771c634b 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/libcxx_wrapper/std/__memory/construct_at.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/libcxx_wrapper/std/__memory/construct_at.h
@@ -22,9 +22,9 @@
 #  include <thrust/detail/libcxx_wrapper/std/__cccl/dialect.h>
 #  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
 #  include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
-#  include <thrust/detail/memory_wrapper.h>
 
 #  include <iterator>
+#  include <memory>
 #  include <type_traits>
 #  include <utility>
 #endif
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h
index 00801c0ca44f..97221ddd67fd 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_algorithms.h
@@ -19,10 +19,10 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/allocator/allocator_traits.h>
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
 #include _THRUST_STD_INCLUDE(__memory/addressof.h)
 #include _THRUST_STD_INCLUDE(__new/device_new.h)
 #include _THRUST_STD_INCLUDE(__type_traits/remove_cvref.h)
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_wrapper.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_wrapper.h
deleted file mode 100644
index 831038a98e74..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/memory_wrapper.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright 2020 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-// When a compiler uses Thrust as part of its implementation of Standard C++
-// algorithms, a cycle of included files may result when Thrust code tries to
-// use a standard algorithm.  Having a macro that is defined only when Thrust
-// is including an algorithms-related header gives the compiler a chance to
-// detect and break the cycle of includes.  (<memory> declares several standard
-// algorithms, including all of the uninitialized_* algorithms.  "_ALGORITHMS_"
-// in the macro name is meant generically, not as a specific reference to
-// the header <algorithms>.)
-
-#define THRUST_INCLUDING_ALGORITHMS_HEADER
-#include <memory>
-#undef THRUST_INCLUDING_ALGORITHMS_HEADER
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/numeric_wrapper.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/numeric_wrapper.h
deleted file mode 100644
index 24a5202b5204..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/numeric_wrapper.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright 2021 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-// When a compiler uses Thrust as part of its implementation of Standard C++
-// algorithms, a cycle of included files may result when Thrust code tries to
-// use a standard algorithm.  Having a macro that is defined only when Thrust
-// is including an algorithms-related header gives the compiler a chance to
-// detect and break the cycle of includes.
-
-#define THRUST_INCLUDING_ALGORITHMS_HEADER
-#include <numeric>
-#undef THRUST_INCLUDING_ALGORITHMS_HEADER
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
index 5b3f2ba6793d..b224c15da43c 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/detail/temporary_array.h
@@ -43,10 +43,10 @@ THRUST_NAMESPACE_END
 #include <thrust/detail/allocator/no_throw_allocator.h>
 #include <thrust/detail/allocator/temporary_allocator.h>
 #include <thrust/detail/contiguous_storage.h>
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/iterator/detail/tagged_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
 #include _THRUST_STD_INCLUDE(__type_traits/is_convertible.h)
 #include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h b/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h
index 7594b6829981..07e0f689667a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/extrema.h
@@ -31,15 +31,9 @@
 #endif // no system header
 #include <thrust/detail/execution_policy.h>
 
+#include _THRUST_STD_INCLUDE(__algorithm/max.h)
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
 #include _THRUST_STD_INCLUDE(__utility/pair.h)
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#endif
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h b/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h
index bd2927d81345..fe929c5c1d97 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/host_vector.h
@@ -30,9 +30,9 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/vector_base.h>
 
+#include _THRUST_STD_INCLUDE(__host_stdlib/memory)
 #include _THRUST_STD_INCLUDE(__utility/move.h)
 #include _THRUST_STD_INCLUDE(initializer_list)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h b/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h
index f787cce50137..d48c41e06719 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/mr/disjoint_pool.h
@@ -34,7 +34,6 @@
 #include <thrust/detail/config.h>
 
 #include <thrust/binary_search.h>
-#include <thrust/detail/algorithm_wrapper.h>
 #include <thrust/detail/seq.h>
 #include <thrust/find.h>
 #include <thrust/host_vector.h>
@@ -46,6 +45,7 @@
 #include _THRUST_LIBCXX_INCLUDE(__cmath/pow2.h)
 #include _THRUST_STD_INCLUDE(__algorithm/max.h)
 #include _THRUST_STD_INCLUDE(__algorithm/min.h)
+#include _THRUST_STD_INCLUDE(__host_stdlib/algorithm)
 #include _THRUST_STD_INCLUDE(cassert)
 #include _THRUST_STD_INCLUDE(cstdint)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h b/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h
index a3dfe8cb3e33..08d6113f59f2 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/mr/pool.h
@@ -32,7 +32,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/algorithm_wrapper.h>
 #include <thrust/host_vector.h>
 #include <thrust/mr/allocator.h>
 #include <thrust/mr/memory_resource.h>
@@ -40,6 +39,7 @@
 
 #include _THRUST_LIBCXX_INCLUDE(__cmath/ilog.h)
 #include _THRUST_LIBCXX_INCLUDE(__cmath/pow2.h)
+#include _THRUST_STD_INCLUDE(__host_stdlib/algorithm)
 #include _THRUST_STD_INCLUDE(cassert)
 #include _THRUST_STD_INCLUDE(cstdint)
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/find.inl b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/find.inl
index 3135a681b276..801da7e7adb8 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/find.inl
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/detail/generic/find.inl
@@ -32,13 +32,8 @@
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/reduce.h>
 #include <thrust/tuple.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#endif
+#include _THRUST_STD_INCLUDE(__algorithm/min.h)
 
 // Contributed by Erich Elsen
 

From 5f4df36898668c9e5fdd0a1e95163bfa935278a5 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:54:11 -0400
Subject: [PATCH 37/48] refactor(rocthrust): CCCL 76fc4572271 parity - extend
 and refactor hip transform overloads

Related upstream commit: 76fc4572271 Extend and refactor transform overloads in CUDA system (NVIDIA/cccl#5238)
Upstream: https://github.com/NVIDIA/cccl/commit/76fc4572271f62469de27b74b69b56fa4628cd7a
Related local port commit: 208d3c3145d

The local port only changed the CUDA backend; the HIP counterpart was left
behind as performance-only. Apply the same overload set to
hip/detail/transform.h:

- add transform_n (unary and binary), transform_if_n (unary, unary with
  stencil, binary with stencil), taking
  _THRUST_STD::iter_difference_t<InputIt> counts as upstream does. HIP
  calls to thrust::transform_n/transform_if_n no longer fall back to the
  generic implementation.
- transform/transform_if call __transform::unary/binary directly with
  _THRUST_STD::distance instead of bouncing through the stencil-less
  transform_if overload, and order the overloads like upstream.
- construct the functors with braces, drop the trailing "// struct"
  comments and the section banners, and replace thrust/distance.h with
  the libhipcxx __iterator includes.

The HIP backend keeps parallel_for instead of rocprim::transform, because
thrust::transform allows the functor to modify its input.

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/hip/detail/transform.h      | 196 +++++++++++++-----
 1 file changed, 140 insertions(+), 56 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform.h
index b72593bb2616..6bc9d8b1bc4d 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/transform.h
@@ -40,14 +40,16 @@
 #if THRUST_HAS_HIP_COMPILER()
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/distance.h>
 #  include <thrust/iterator/zip_iterator.h>
 #  include <thrust/system/hip/detail/dispatch.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 #  include <thrust/zip_function.h>
 
 #  include _THRUST_LIBCXX_INCLUDE(functional)
+#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
+#  include _THRUST_STD_INCLUDE(__iterator/incrementable_traits.h)
 #  include _THRUST_STD_INCLUDE(cstdint)
 
 THRUST_NAMESPACE_BEGIN
@@ -94,7 +96,7 @@ struct unary_transform_f
       output[idx] = op(raw_reference_cast(input[idx]));
     }
   }
-}; // struct unary_transform_stencil_f
+};
 
 template <class InputIt, class OutputIt, class TransformOp, class Predicate>
 struct unary_transform_f<InputIt, OutputIt, no_stencil_tag, TransformOp, Predicate>
@@ -120,7 +122,7 @@ struct unary_transform_f<InputIt, OutputIt, no_stencil_tag, TransformOp, Predica
       output[idx] = op(raw_reference_cast(input[idx]));
     }
   }
-}; // struct unary_transform_f
+};
 
 template <class InputIt1, class InputIt2, class OutputIt, class StencilIt, class TransformOp, class Predicate>
 struct binary_transform_f
@@ -151,7 +153,7 @@ struct binary_transform_f
       output[idx] = op(raw_reference_cast(input1[idx]), raw_reference_cast(input2[idx]));
     }
   }
-}; // struct binary_transform_stencil_f
+};
 
 template <class InputIt1, class InputIt2, class OutputIt, class TransformOp, class Predicate>
 struct binary_transform_f<InputIt1, InputIt2, OutputIt, no_stencil_tag, TransformOp, Predicate>
@@ -180,7 +182,7 @@ struct binary_transform_f<InputIt1, InputIt2, OutputIt, no_stencil_tag, Transfor
       output[idx] = op(raw_reference_cast(input1[idx]), raw_reference_cast(input2[idx]));
     }
   }
-}; // struct binary_transform_f
+};
 
 // EAN 2024-10-04: when force-inlined, gcc's optimizer will generate bad code
 // for this function:
@@ -204,8 +206,7 @@ OutputIt THRUST_HOST_DEVICE inline unary(
   // We use 'parallel_for' instead of 'rocprim::transform', since 'thrust::transform' allows
   // the function to modify the input iterator! 'rocprim::transform' does not write any
   // effects on the input iterator back to memory.
-  hip_rocprim::parallel_for(policy, unary_transform_t(items, result, stencil, transform_op, predicate), num_items);
-
+  hip_rocprim::parallel_for(policy, unary_transform_t{items, result, stencil, transform_op, predicate}, num_items);
   return result + num_items;
 }
 
@@ -240,100 +241,183 @@ OutputIt THRUST_HOST_DEVICE inline binary(
   // the function to modify the input iterator! 'rocprim::transform' does not write any
   // effects on the input iterator back to memory.
   hip_rocprim::parallel_for(
-    policy, binary_transform_t(items1, items2, result, stencil, transform_op, predicate), num_items);
-
+    policy, binary_transform_t{items1, items2, result, stencil, transform_op, predicate}, num_items);
   return result + num_items;
 }
 
 } // namespace __transform
 
-//-------------------------
-// Thrust API entry points
-//-------------------------
-
-//-------------------------
 //  one input data stream
-//-------------------------
 
-template <class Derived, class InputIt, class OutputIt, class StencilInputIt, class TransformOp, class Predicate>
-OutputIt THRUST_HIP_FUNCTION transform_if(
+template <typename Derived, typename InputIt, typename OutputIt, typename TransformOp>
+THRUST_HIP_FUNCTION OutputIt
+transform(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, TransformOp transform_op)
+{
+  return __transform::unary(
+    policy,
+    first,
+    result,
+    _THRUST_STD::distance(first, last),
+    __transform::no_stencil_tag{},
+    transform_op,
+    __transform::always_true_predicate{});
+}
+
+template <typename Derived, typename InputIt, typename OutputIt, typename TransformOp>
+THRUST_HIP_FUNCTION OutputIt transform_n(
+  execution_policy<Derived>& policy,
+  InputIt first,
+  _THRUST_STD::iter_difference_t<InputIt> num_items,
+  OutputIt result,
+  TransformOp transform_op)
+{
+  return __transform::unary(
+    policy, first, result, num_items, __transform::no_stencil_tag{}, transform_op, __transform::always_true_predicate{});
+}
+
+template <typename Derived, typename InputIt, typename OutputIt, typename TransformOp, typename Predicate>
+THRUST_HIP_FUNCTION OutputIt transform_if(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
-  StencilInputIt stencil,
   OutputIt result,
   TransformOp transform_op,
   Predicate predicate)
 {
-  using size_type     = thrust::detail::it_difference_t<InputIt>;
-  size_type num_items = static_cast<size_type>(_THRUST_STD::distance(first, last));
-  return __transform::unary(policy, first, result, num_items, stencil, transform_op, predicate);
-} // func transform_if
+  return __transform::unary(
+    policy, first, result, _THRUST_STD::distance(first, last), __transform::no_stencil_tag{}, transform_op, predicate);
+}
 
-template <class Derived, class InputIt, class OutputIt, class TransformOp, class Predicate>
-OutputIt THRUST_HIP_FUNCTION transform_if(
+template <typename Derived, typename InputIt, typename OutputIt, typename TransformOp, typename Predicate>
+THRUST_HIP_FUNCTION OutputIt transform_if_n(
+  execution_policy<Derived>& policy,
+  InputIt first,
+  _THRUST_STD::iter_difference_t<InputIt> count,
+  OutputIt result,
+  TransformOp transform_op,
+  Predicate predicate)
+{
+  return __transform::unary(policy, first, result, count, __transform::no_stencil_tag{}, transform_op, predicate);
+}
+
+//  one input data stream + stencil
+
+template <class Derived, class InputIt, class OutputIt, class StencilInputIt, class TransformOp, class Predicate>
+THRUST_HIP_FUNCTION OutputIt transform_if(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
+  StencilInputIt stencil,
   OutputIt result,
   TransformOp transform_op,
   Predicate predicate)
 {
-  return hip_rocprim::transform_if(policy, first, last, __transform::no_stencil_tag(), result, transform_op, predicate);
-} // func transform_if
+  return __transform::unary(policy, first, result, _THRUST_STD::distance(first, last), stencil, transform_op, predicate);
+}
 
-template <class Derived, class InputIt, class OutputIt, class TransformOp>
-OutputIt THRUST_HIP_FUNCTION
-transform(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, TransformOp transform_op)
+template <typename Derived,
+          typename InputIt,
+          typename StencilInputIt,
+          typename OutputIt,
+          typename TransformOp,
+          typename Predicate>
+THRUST_HIP_FUNCTION OutputIt transform_if_n(
+  execution_policy<Derived>& policy,
+  InputIt first,
+  _THRUST_STD::iter_difference_t<InputIt> num_items,
+  StencilInputIt stencil,
+  OutputIt result,
+  TransformOp transform_op,
+  Predicate predicate)
 {
-  return hip_rocprim::transform_if(policy, first, last, result, transform_op, __transform::always_true_predicate());
-} // func transform
+  return __transform::unary(policy, first, result, num_items, stencil, transform_op, predicate);
+}
 
-//-------------------------
 // two input data streams
-//-------------------------
 
-template <class Derived,
-          class InputIt1,
-          class InputIt2,
-          class StencilInputIt,
-          class OutputIt,
-          class TransformOp,
-          class Predicate>
-OutputIt THRUST_HIP_FUNCTION transform_if(
+template <typename Derived, typename InputIt1, typename InputIt2, typename OutputIt, typename BinaryTransformOp>
+THRUST_HIP_FUNCTION OutputIt transform(
   execution_policy<Derived>& policy,
   InputIt1 first1,
   InputIt1 last1,
   InputIt2 first2,
-  StencilInputIt stencil,
   OutputIt result,
-  TransformOp transform_op,
-  Predicate predicate)
+  BinaryTransformOp transform_op)
 {
-  using size_type     = thrust::detail::it_difference_t<InputIt1>;
-  size_type num_items = static_cast<size_type>(_THRUST_STD::distance(first1, last1));
-  return __transform::binary(policy, first1, first2, result, num_items, stencil, transform_op, predicate);
-} // func transform_if
+  return __transform::binary(
+    policy,
+    first1,
+    first2,
+    result,
+    _THRUST_STD::distance(first1, last1),
+    __transform::no_stencil_tag{},
+    transform_op,
+    __transform::always_true_predicate{});
+}
 
-template <class Derived, class InputIt1, class InputIt2, class OutputIt, class TransformOp>
-OutputIt THRUST_HIP_FUNCTION transform(
+template <typename Derived, typename InputIt1, typename InputIt2, typename OutputIt, typename BinaryTransformOp>
+THRUST_HIP_FUNCTION OutputIt transform_n(
   execution_policy<Derived>& policy,
   InputIt1 first1,
-  InputIt1 last1,
+  _THRUST_STD::iter_difference_t<InputIt1> num_items,
   InputIt2 first2,
   OutputIt result,
-  TransformOp transform_op)
+  BinaryTransformOp transform_op)
 {
-  return hip_rocprim::transform_if(
+  return __transform::binary(
     policy,
     first1,
-    last1,
     first2,
-    __transform::no_stencil_tag(),
     result,
+    num_items,
+    __transform::no_stencil_tag{},
     transform_op,
-    __transform::always_true_predicate());
+    __transform::always_true_predicate{});
+}
+
+// two input data streams + stencil
+
+template <typename Derived,
+          typename InputIt1,
+          typename InputIt2,
+          typename StencilInputIt,
+          typename OutputIt,
+          typename BinaryTransformOp,
+          typename Predicate>
+THRUST_HIP_FUNCTION OutputIt transform_if(
+  execution_policy<Derived>& policy,
+  InputIt1 first1,
+  InputIt1 last1,
+  InputIt2 first2,
+  StencilInputIt stencil,
+  OutputIt result,
+  BinaryTransformOp transform_op,
+  Predicate predicate)
+{
+  return __transform::binary(
+    policy, first1, first2, result, _THRUST_STD::distance(first1, last1), stencil, transform_op, predicate);
 }
+
+template <typename Derived,
+          typename InputIt1,
+          typename InputIt2,
+          typename StencilInputIt,
+          typename OutputIt,
+          typename BinaryTransformOp,
+          typename Predicate>
+THRUST_HIP_FUNCTION OutputIt transform_if_n(
+  execution_policy<Derived>& policy,
+  InputIt1 first1,
+  _THRUST_STD::iter_difference_t<InputIt1> num_items,
+  InputIt2 first2,
+  StencilInputIt stencil,
+  OutputIt result,
+  BinaryTransformOp transform_op,
+  Predicate predicate)
+{
+  return __transform::binary(policy, first1, first2, result, num_items, stencil, transform_op, predicate);
+}
+
 } // namespace hip_rocprim
 
 THRUST_NAMESPACE_END

From 134f79ba17d3fe08cf4290613f54ea34af966f2e Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:54:39 -0400
Subject: [PATCH 38/48] refactor(rocthrust): CCCL e93c9c33537 parity - hip
 generate_n writes through parallel_for

Related upstream commit: e93c9c33537 Port thrust::generate[_n] to cub::DeviceTransform::Fill (NVIDIA/cccl#5807)
Upstream: https://github.com/NVIDIA/cccl/commit/e93c9c33537953b530b92ab2cfc5799fd6645ca6
Related local port commit: 575e1bf55e8

The local port only changed the CUDA backend; the HIP counterpart was left
behind as performance-only. Upstream stops routing generate_n through
for_each_n with a generate_f functor that const_casts each element, and
writes the generated values straight to the output instead
(cub::DeviceTransform with no inputs).

rocPRIM has no zero-input transform, so hip/detail/generate.h does the same
with parallel_for and a __generate::functor that assigns
result[idx] = generator(). This drops the const_cast and the per-element
reference dereference through for_each_f. parallel_for still synchronizes
when the policy requires it, which covers the stream synchronization
upstream added in d91b32f1bf6 (NVIDIA/cccl#5889).

Also as upstream: THRUST_EXEC_CHECK_DISABLE on generate_n, the generate_f
functor and the "for_each" comments are removed, and the includes switch
from thrust/distance.h and for_each.h to execution_policy.h, parallel_for.h,
util.h and _THRUST_STD_INCLUDE(iterator).

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/hip/detail/generate.h       | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h
index f8bddc829763..46017ed5ad0a 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/generate.h
@@ -40,45 +40,44 @@
 #if THRUST_HAS_HIP_COMPILER()
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/distance.h>
-#  include <thrust/system/hip/detail/for_each.h>
+#  include <thrust/system/hip/detail/execution_policy.h>
+#  include <thrust/system/hip/detail/parallel_for.h>
+#  include <thrust/system/hip/detail/util.h>
 
-#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
-
-#  include <iterator>
+#  include _THRUST_STD_INCLUDE(iterator)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
 
-// for_each functor
-template <class Generator>
-struct generate_f
+namespace __generate
+{
+// generate functor
+template <class OutputIt, class Generator>
+struct functor
 {
+  OutputIt result;
   Generator generator;
 
-  THRUST_HIP_FUNCTION
-  generate_f(Generator generator_)
-      : generator(generator_)
-  {}
-
-  template <class T>
-  THRUST_HIP_DEVICE_FUNCTION void operator()(T const& value)
+  template <class Size>
+  THRUST_HIP_DEVICE_FUNCTION void operator()(Size idx)
   {
-    T& lvalue = const_cast<T&>(value);
-    lvalue    = generator();
+    result[idx] = generator();
   }
-};
+}; // struct functor
 
-// for_each_n
+} // namespace __generate
+
+THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class OutputIt, class Size, class Generator>
 OutputIt THRUST_HOST_DEVICE
 generate_n(execution_policy<Derived>& policy, OutputIt result, Size count, Generator generator)
 {
-  return hip_rocprim::for_each_n(policy, result, count, generate_f<Generator>(generator));
+  hip_rocprim::parallel_for(policy, __generate::functor<OutputIt, Generator>{result, generator}, count);
+
+  return result + count;
 }
 
-// for_each
 template <class Derived, class OutputIt, class Generator>
 void THRUST_HOST_DEVICE generate(execution_policy<Derived>& policy, OutputIt first, OutputIt last, Generator generator)
 {

From 8d0854cdfb3b642709127c07e24576e919ec56cf Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:55:58 -0400
Subject: [PATCH 39/48] refactor(rocthrust): CCCL 50929671faf parity - hip
 uninitialized_fill_n delegates to fill_n for trivial types

Related upstream commit: 50929671faf Use DeviceTransform::Fill in uninitialized_fill[_n] when possible (NVIDIA/cccl#5813)
Upstream: https://github.com/NVIDIA/cccl/commit/50929671faf48fc2eca59aaa93b3414ea785433b
Related local port commit: e592f3505bf

The local port took the CUDA side of this commit but left the HIP backend
always constructing elements with placement new through parallel_for.
Mirror upstream in thrust/system/hip/detail/uninitialized_fill.h: when the
value type is trivially constructible and trivially assignable from T, there
is no constructor side effect to preserve, so delegate to hip_rocprim::fill_n.
Otherwise keep the existing placement-new functor.

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../system/hip/detail/uninitialized_fill.h       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
index 323738e1ab8c..2157bc467d68 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
@@ -40,11 +40,13 @@
 #if THRUST_HAS_HIP_COMPILER()
 #  include <thrust/distance.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
+#  include <thrust/system/hip/detail/fill.h>
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
 
 #  include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #  include _THRUST_STD_INCLUDE(__new/device_new.h)
+#  include _THRUST_STD_INCLUDE(type_traits)
 
 #  include <iterator>
 
@@ -77,7 +79,19 @@ template <class Derived, class Iterator, class Size, class T>
 Iterator THRUST_HOST_DEVICE
 uninitialized_fill_n(execution_policy<Derived>& policy, Iterator first, Size count, T const& x)
 {
-  hip_rocprim::parallel_for(policy, __uninitialized_fill::functor<Iterator, T>{first, x}, count);
+  // if the output type is trivially constructible from the input, it has no side effect, and we can skip placement new
+  // and calling a constructor. Furthermore, if assigning the input value to an output element is also trivial, there is
+  // no copy constructor which could have a side effect and we can delegate to fill_n.
+  using value_t = thrust::detail::it_value_t<Iterator>;
+  if constexpr (_THRUST_STD::is_trivially_constructible_v<value_t, T const&>
+                && _THRUST_STD::is_trivially_assignable_v<value_t, T const&>)
+  {
+    hip_rocprim::fill_n(policy, first, count, x);
+  }
+  else
+  {
+    hip_rocprim::parallel_for(policy, __uninitialized_fill::functor<Iterator, T>{first, x}, count);
+  }
   return first + count;
 }
 

From 1100c0b60c85ffc57a6cb08b2ddff991cc5991eb Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:56:36 -0400
Subject: [PATCH 40/48] refactor(rocthrust): CCCL 49b642e53dd parity - hip
 iter_swap launches a custom kernel

Related upstream commit: 49b642e53dd Use a custom `iter_swap` kernel in Thrust (NVIDIA/cccl#5843)
Upstream: https://github.com/NVIDIA/cccl/commit/49b642e53ddb973848bf540b9895bb2ba84a5e3d
Related local port commit: eedd8e8cfce

The local port updated the CUDA backend only. Mirror upstream in
thrust/system/hip/detail/iter_swap.h: the host path no longer goes through
thrust::swap_ranges (and drops the thrust/swap.h include) but launches a
single-thread detail::iter_swap_kernel on the policy's stream, checks the
launch and calls synchronize_optional. The device path swaps in place with
_THRUST_STD::swap. The war_nvbugs_881631 struct becomes host_path with
upstream's comment explaining why the host path sits outside the target
switch. The triple_chevron launch maps to hipLaunchKernelGGL, as in
parallel_for.h.

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/hip/detail/iter_swap.h      | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h
index d1fc18ce94b8..f012af166cbc 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/iter_swap.h
@@ -32,34 +32,46 @@
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/raw_pointer_cast.h>
-#  include <thrust/swap.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
+#  include <thrust/system/hip/detail/util.h>
 
 #  include _THRUST_STD_INCLUDE(__utility/swap.h)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
+namespace detail
+{
+template <typename Pointer1, typename Pointer2>
+ROCPRIM_KERNEL void iter_swap_kernel(Pointer1 a, Pointer2 b)
+{
+  using _THRUST_STD::swap;
+  swap(*raw_pointer_cast(a), *raw_pointer_cast(b));
+}
+} // namespace detail
 
 template <typename DerivedPolicy, typename Pointer1, typename Pointer2>
-inline THRUST_HOST_DEVICE void iter_swap(thrust::hip::execution_policy<DerivedPolicy>&, Pointer1 a, Pointer2 b)
+inline THRUST_HOST_DEVICE void iter_swap(thrust::hip::execution_policy<DerivedPolicy>& exec, Pointer1 a, Pointer2 b)
 {
-  // XXX war nvbugs/881631
-  struct war_nvbugs_881631
+  // Because of https://docs.nvidia.com/cuda/cuda-c-programming-guide/#cuda-arch point 2., if a call from a __host__
+  // __device__ function leads to the template instantiation of a __global__ function, then this instantiation needs to
+  // happen regardless of whether __CUDA_ARCH__ is defined. Therefore, we make the host path visible outside the
+  // _THRUST_IF_TARGET switch. See also NVBug 881631.
+  struct host_path
   {
-    THRUST_HOST inline static void host_path(Pointer1 a, Pointer2 b)
-    {
-      thrust::swap_ranges(a, a + 1, b);
-    }
-
-    THRUST_DEVICE inline static void device_path(Pointer1 a, Pointer2 b)
+    THRUST_HOST void operator()(execution_policy<DerivedPolicy>& exec, Pointer1 a, Pointer2 b) const
     {
-      using _THRUST_STD::swap;
-      swap(*thrust::raw_pointer_cast(a), *thrust::raw_pointer_cast(b));
+      hipLaunchKernelGGL(
+        HIP_KERNEL_NAME(detail::iter_swap_kernel<Pointer1, Pointer2>), dim3(1), dim3(1), 0, stream(exec), a, b);
+      throw_on_error(hipPeekAtLastError(), "iter_swap: calling iter_swap_kernel failed");
+      throw_on_error(synchronize_optional(exec), "iter_swap: sync failed");
     }
   };
 
-  _THRUST_IF_TARGET(_THRUST_IS_HOST, (war_nvbugs_881631::host_path(a, b);), (war_nvbugs_881631::device_path(a, b);));
+  _THRUST_IF_TARGET(_THRUST_IS_HOST,
+                    (host_path{}(exec, a, b);),
+                    (using _THRUST_STD::swap; //
+                     swap(*thrust::raw_pointer_cast(a), *thrust::raw_pointer_cast(b));));
 
 } // end iter_swap()
 

From c8a9d257b86dfe616f47e8357f608324555e034d Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:57:03 -0400
Subject: [PATCH 41/48] refactor(rocthrust): CCCL 2f39a342b93 parity - refactor
 hip execution policies like cuda

Related upstream commit: 2f39a342b93 Refactor Thrust execution policies (NVIDIA/cccl#5821)
Upstream: https://github.com/NVIDIA/cccl/commit/2f39a342b931ed4803793345775816731bfd2836
Related local port commit: 7544a6b3715
Related local parity commit: 2b563b33e95

2b563b33e95 already folded par.h/par_to_seq.h into
thrust/system/hip/detail/execution_policy.h. This commit applies the rest of
upstream's cuda execution_policy.h refactor to the hip file:
- tag derives from thrust::detail::allocator_aware_execution_policy<execution_policy>,
  and execution_policy<Derived>::operator tag() returns {};
- execute_on_stream{,_nosync,_deterministic,_nosync_deterministic} use
  `= default` default constructors and construct the injected base class
  name instead of a base_t alias;
- par_t, par_nosync_t, par_det_t and par_det_nosync_t drop their
  user-written constexpr default constructors and base_t aliases;
- the public types sit in the execution_policies Doxygen group, with
  upstream's comments adapted to HIP and a usage example on par;
- `namespace system::hip`, and system::hip::detail no longer re-exports
  execution_policy and tag, matching upstream's system::cuda::detail.

The AMD-only deterministic stream bases are unchanged.

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../system/hip/detail/execution_policy.h      | 91 ++++++++-----------
 1 file changed, 40 insertions(+), 51 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h
index 62cc94f646d5..8806660678a3 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/execution_policy.h
@@ -48,13 +48,20 @@
 #include <thrust/version.h>
 
 THRUST_NAMESPACE_BEGIN
-
 namespace hip_rocprim
 {
+//! \addtogroup execution_policies
+//! \{
+
 // note: the tag and execution policy need to be defined in the same namespace as the algorithms for ADL to find them
 
+//! \p thrust::hip::tag is a type representing Thrust's HIP backend system in C++'s type system.
+//! Iterators "tagged" with a type which is convertible to \p hip::tag assert that they may be
+//! "dispatched" to algorithm implementations in the \p hip system.
 struct tag;
 
+//! \p thrust::hip::execution_policy is the base class for all Thrust parallel execution
+//! policies which are derived from Thrust's HIP backend system.
 template <class>
 struct execution_policy;
 
@@ -66,7 +73,7 @@ struct execution_policy<tag> : thrust::execution_policy<tag>
 
 struct tag
     : execution_policy<tag>
-    , detail::allocator_aware_execution_policy<hip_rocprim::execution_policy>
+    , thrust::detail::allocator_aware_execution_policy<execution_policy>
 {};
 
 template <class Derived>
@@ -77,7 +84,7 @@ struct execution_policy : thrust::execution_policy<Derived>
   // allow conversion to tag when it is not a successor
   THRUST_HOST_DEVICE operator tag() const
   {
-    return tag();
+    return {};
   }
 };
 
@@ -139,52 +146,42 @@ struct execute_on_stream_nosync_base : execution_policy<Derived>
 
 struct execute_on_stream : execute_on_stream_base<execute_on_stream>
 {
-  using base_t = execute_on_stream_base<execute_on_stream>;
+  execute_on_stream() = default;
 
-  THRUST_HOST_DEVICE execute_on_stream()
-      : base_t() {};
   THRUST_HOST_DEVICE execute_on_stream(hipStream_t stream)
-      : base_t(stream) {};
+      : execute_on_stream_base(stream) {};
 };
 
 struct execute_on_stream_nosync : execute_on_stream_nosync_base<execute_on_stream_nosync>
 {
-  using base_t = execute_on_stream_nosync_base<execute_on_stream_nosync>;
+  execute_on_stream_nosync() = default;
 
-  THRUST_HOST_DEVICE execute_on_stream_nosync()
-      : base_t() {};
   THRUST_HOST_DEVICE execute_on_stream_nosync(hipStream_t stream)
-      : base_t(stream) {};
+      : execute_on_stream_nosync_base(stream) {};
 };
 
+//! Execution policy type, optionally prescribing with HIP stream to use for execution.
+//! @see thrust::hip::par
 struct par_t
     : execution_policy<par_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_base>
 {
-  using base_t = execution_policy<par_t>;
-
-  THRUST_HOST_DEVICE constexpr par_t()
-      : base_t()
-  {}
-
   using stream_attachment_type = execute_on_stream;
 
+  //! Sets the stream on which to execute algorithm with this policy.
   THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
   {
     return execute_on_stream(stream);
   }
 };
 
+//! Execution policy type, optionally prescribing with HIP stream to use for execution. Omits any optional stream
+//! synchronization. The HIP stream is still synchronized when required for algorithmic correctness.
+//! @see thrust::hip::par_nosync
 struct par_nosync_t
     : execution_policy<par_nosync_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_base>
 {
-  using base_t = execution_policy<par_nosync_t>;
-
-  THRUST_HOST_DEVICE constexpr par_nosync_t()
-      : base_t()
-  {}
-
   using stream_attachment_type = execute_on_stream_nosync;
 
   THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
@@ -223,24 +220,16 @@ struct execute_on_stream_deterministic_base : execute_on_stream_base<Derived>
 
 struct execute_on_stream_deterministic : execute_on_stream_deterministic_base<execute_on_stream_deterministic>
 {
-  using base_t = execute_on_stream_deterministic_base<execute_on_stream_deterministic>;
+  execute_on_stream_deterministic() = default;
 
-  THRUST_HOST_DEVICE execute_on_stream_deterministic()
-      : base_t() {};
   THRUST_HOST_DEVICE execute_on_stream_deterministic(hipStream_t stream)
-      : base_t(stream) {};
+      : execute_on_stream_deterministic_base(stream) {};
 };
 
 struct par_det_t
     : execution_policy<par_det_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_deterministic_base>
 {
-  using base_t = execution_policy<par_det_t>;
-
-  THRUST_HOST_DEVICE constexpr par_det_t()
-      : base_t()
-  {}
-
   using stream_attachment_type = execute_on_stream_deterministic;
 
   THRUST_HIP_RUNTIME_FUNCTION
@@ -279,24 +268,16 @@ struct execute_on_stream_nosync_deterministic_base : execute_on_stream_nosync_ba
 struct execute_on_stream_nosync_deterministic
     : execute_on_stream_nosync_deterministic_base<execute_on_stream_nosync_deterministic>
 {
-  using base_t = execute_on_stream_nosync_deterministic_base<execute_on_stream_nosync_deterministic>;
+  execute_on_stream_nosync_deterministic() = default;
 
-  THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic()
-      : base_t() {};
   THRUST_HOST_DEVICE execute_on_stream_nosync_deterministic(hipStream_t stream)
-      : base_t(stream) {};
+      : execute_on_stream_nosync_deterministic_base(stream) {};
 };
 
 struct par_det_nosync_t
     : execution_policy<par_det_nosync_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_deterministic_base>
 {
-  using base_t = execution_policy<par_det_nosync_t>;
-
-  THRUST_HOST_DEVICE constexpr par_det_nosync_t()
-      : base_t()
-  {}
-
   using stream_attachment_type = execute_on_stream_nosync_deterministic;
 
   THRUST_HIP_RUNTIME_FUNCTION
@@ -312,6 +293,17 @@ struct par_det_nosync_t
   }
 };
 
+//! HIP execution policy type with optional stream selection.
+//!
+//! @code
+//! #include <thrust/reduce.h>
+//! #include <thrust/system/hip/execution_policy.h>
+//!
+//! thrust::device_vector<int> vec{ 0, 1, 2 };
+//! hipStream_t stream = ...;
+//! const auto sum = thrust::reduce(thrust::hip::par.on(stream), vec.begin(), vec.end());
+//! @endcode
+//! @see thrust::hip::par_t
 THRUST_GLOBAL_CONSTANT par_t par;
 
 /*! \p thrust::hip::par_nosync is a parallel execution policy targeting Thrust's CUDA device backend.
@@ -364,6 +356,9 @@ THRUST_GLOBAL_CONSTANT par_t par;
 THRUST_GLOBAL_CONSTANT par_nosync_t par_nosync;
 THRUST_GLOBAL_CONSTANT par_det_t par_det;
 THRUST_GLOBAL_CONSTANT par_det_nosync_t par_det_nosync;
+
+//! \}
+
 template <class Policy>
 auto THRUST_HOST_DEVICE cvt_to_seq(Policy&) -> thrust::detail::seq_t
 {
@@ -376,9 +371,7 @@ auto THRUST_HOST_DEVICE cvt_to_seq(Policy&) -> thrust::detail::seq_t
 
 // aliases:
 
-namespace system
-{
-namespace hip
+namespace system::hip
 {
 using thrust::hip_rocprim::execution_policy;
 using thrust::hip_rocprim::par;
@@ -388,15 +381,12 @@ using thrust::hip_rocprim::par_nosync;
 using thrust::hip_rocprim::tag;
 namespace detail
 {
-using thrust::hip_rocprim::execution_policy;
 using thrust::hip_rocprim::par_det_nosync_t;
 using thrust::hip_rocprim::par_det_t;
 using thrust::hip_rocprim::par_nosync_t;
 using thrust::hip_rocprim::par_t;
-using thrust::hip_rocprim::tag;
 } // namespace detail
-} // namespace hip
-} // namespace system
+} // namespace system::hip
 
 namespace hip
 {
@@ -407,5 +397,4 @@ using thrust::hip_rocprim::par_det_nosync;
 using thrust::hip_rocprim::par_nosync;
 using thrust::hip_rocprim::tag;
 } // namespace hip
-
 THRUST_NAMESPACE_END

From 0c5bd5a6cb8b6ad130a6daed265a968d046ca3b7 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:57:25 -0400
Subject: [PATCH 42/48] refactor(rocthrust): CCCL 36ec00be03f parity - hip
 device_to_device proclaims copyable arguments

Related upstream commit: 36ec00be03f Ensure non-trivial thrust::copy from D2D uses UBLKCP (NVIDIA/cccl#5954)
Upstream: https://github.com/NVIDIA/cccl/commit/36ec00be03f0351e9dc605ea2e30703ff2e18fc6
Related local port commit: 31847ac0609
Related local parity commit: 713e0472b04

713e0472b04 left the proclaim_copyable_arguments wrapper out of the HIP
backend. Add it, as upstream does for CUDA: the non-trivial branch of
__copy::device_to_device in thrust/system/hip/detail/copy.h now passes
_THRUST_LIBCXX::proclaim_copyable_arguments(_THRUST_STD::identity{}) to
hip_rocprim::transform, so the transform may copy its arguments instead of
reading them in place.

Upstream needs no new include for this. Here copy.h and transform.h include
each other, so copy.h includes __functional/address_stability.h itself.

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
index a2b820e4c8c5..cbdad32ff634 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
@@ -47,6 +47,7 @@
 #include <thrust/system/hip/detail/util.h>
 #include <thrust/type_traits/is_trivially_relocatable.h>
 
+#include _THRUST_LIBCXX_INCLUDE(__functional/address_stability.h)
 #include _THRUST_STD_INCLUDE(__functional/identity.h)
 #include _THRUST_STD_INCLUDE(__iterator/distance.h)
 #include _THRUST_STD_INCLUDE(__iterator/next.h)
@@ -228,7 +229,8 @@ device_to_device(execution_policy<Derived>& policy, InputIt first, InputIt last,
   }
   else
   {
-    return hip_rocprim::transform(policy, first, last, result, _THRUST_STD::identity{});
+    return hip_rocprim::transform(
+      policy, first, last, result, _THRUST_LIBCXX::proclaim_copyable_arguments(_THRUST_STD::identity{}));
   }
 }
 #endif

From 24eca2ad0cb554c13627dd80116c65c588d4f4be Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:57:40 -0400
Subject: [PATCH 43/48] refactor(rocthrust): CCCL fe943f23ced parity - hip
 scatter and scatter_if proclaim copyable arguments

Related upstream commit: fe943f23ced Ensure thrust::scatter_if uses UBLKCP (NVIDIA/cccl#5952)
Upstream: https://github.com/NVIDIA/cccl/commit/fe943f23ced9c85d7a70a65b95075b239291aa82
Related local port commit: cd933708ddc

The local port updated the CUDA backend only. Mirror upstream in
thrust/system/hip/detail/scatter.h: scatter, the predicated scatter_if and
the stencil-only scatter_if overload now wrap _THRUST_STD::identity{} in
_THRUST_LIBCXX::proclaim_copyable_arguments, so the transform may copy its
arguments instead of reading them in place. The hip stencil-only overload
never had the stray Predicate template parameter that upstream removes.

The file now includes __functional/address_stability.h explicitly instead
of relying on transform.h to bring it in.

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../thrust/system/hip/detail/scatter.h        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h
index c06ab89079ce..7ef4952c4032 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/scatter.h
@@ -41,6 +41,7 @@
 #  include <thrust/iterator/permutation_iterator.h>
 #  include <thrust/system/hip/detail/transform.h>
 
+#  include _THRUST_LIBCXX_INCLUDE(__functional/address_stability.h)
 #  include _THRUST_STD_INCLUDE(__functional/identity.h)
 
 THRUST_NAMESPACE_BEGIN
@@ -51,7 +52,12 @@ template <class Derived, class ItemsIt, class MapIt, class ResultIt>
 void THRUST_HOST_DEVICE
 scatter(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, MapIt map, ResultIt result)
 {
-  hip_rocprim::transform(policy, first, last, thrust::make_permutation_iterator(result, map), _THRUST_STD::identity{});
+  hip_rocprim::transform(
+    policy,
+    first,
+    last,
+    thrust::make_permutation_iterator(result, map),
+    _THRUST_LIBCXX::proclaim_copyable_arguments(_THRUST_STD::identity{}));
 }
 
 template <class Derived, class ItemsIt, class MapIt, class StencilIt, class ResultIt, class Predicate>
@@ -65,14 +71,21 @@ void THRUST_HOST_DEVICE scatter_if(
   Predicate predicate)
 {
   hip_rocprim::transform_if(
-    policy, first, last, stencil, thrust::make_permutation_iterator(result, map), _THRUST_STD::identity{}, predicate);
+    policy,
+    first,
+    last,
+    stencil,
+    thrust::make_permutation_iterator(result, map),
+    _THRUST_LIBCXX::proclaim_copyable_arguments(_THRUST_STD::identity{}),
+    predicate);
 }
 
 template <class Derived, class ItemsIt, class MapIt, class StencilIt, class ResultIt>
 void THRUST_HOST_DEVICE scatter_if(
   execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, MapIt map, StencilIt stencil, ResultIt result)
 {
-  hip_rocprim::scatter_if(policy, first, last, map, stencil, result, _THRUST_STD::identity{});
+  hip_rocprim::scatter_if(
+    policy, first, last, map, stencil, result, _THRUST_LIBCXX::proclaim_copyable_arguments(_THRUST_STD::identity{}));
 }
 
 } // namespace hip_rocprim

From 010df58d2cc21afb500bd858e6c747260b72ffab Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Fri, 30 Oct 2026 18:57:53 -0400
Subject: [PATCH 44/48] refactor(rocthrust): CCCL ad70011e990 parity - hip
 tabulate uses transform_n with copyable arguments

Related upstream commit: ad70011e990 Support fancy iterators in vectorized transform and port thrust::tabulate to it (NVIDIA/cccl#6012)
Upstream: https://github.com/NVIDIA/cccl/commit/ad70011e99032cb909b2767315af668bff12b292
Related local port commit: 39a06d7ed09
Related local parity commit: 46985060251

46985060251 turned hip tabulate into a transform over a counting_iterator,
but called transform(begin, begin + count, ...) with the bare tabulate_op.
Finish matching upstream in thrust/system/hip/detail/tabulate.h: call
hip_rocprim::transform_n (added by the 76fc4572271 parity commit) on
_THRUST_LIBCXX::counting_iterator<size_type>{} and count, and wrap
tabulate_op in _THRUST_LIBCXX::proclaim_copyable_arguments.

Includes follow upstream: __functional/address_stability.h and the
_THRUST_STD iterator header replace __iterator/distance.h and
__iterator/incrementable_traits.h. The counting_iterator include stays, since
upstream only gets it through transform.h.

Not compiled, tests not run

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/thrust/system/hip/detail/tabulate.h    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h
index 587dfc327e36..5a1336b657af 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/tabulate.h
@@ -43,9 +43,9 @@
 #  include <thrust/system/hip/detail/transform.h>
 #  include <thrust/system/hip/execution_policy.h>
 
+#  include _THRUST_LIBCXX_INCLUDE(__functional/address_stability.h)
 #  include _THRUST_LIBCXX_INCLUDE(__iterator/counting_iterator.h)
-#  include _THRUST_STD_INCLUDE(__iterator/distance.h)
-#  include _THRUST_STD_INCLUDE(__iterator/incrementable_traits.h)
+#  include _THRUST_STD_INCLUDE(iterator)
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
@@ -56,8 +56,12 @@ tabulate(execution_policy<Derived>& policy, Iterator first, Iterator last, Tabul
 {
   using size_type  = _THRUST_STD::iter_difference_t<Iterator>;
   const auto count = _THRUST_STD::distance(first, last);
-  const auto begin = _THRUST_LIBCXX::counting_iterator<size_type>{};
-  hip_rocprim::transform(policy, begin, begin + count, first, tabulate_op);
+  hip_rocprim::transform_n(
+    policy,
+    _THRUST_LIBCXX::counting_iterator<size_type>{},
+    count,
+    first,
+    _THRUST_LIBCXX::proclaim_copyable_arguments(tabulate_op));
 }
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END

From 6b1e52985a97de11c89fd6cf32f554b0296b8919 Mon Sep 17 00:00:00 2001
From: Nara Prasetya <nara@streamhpc.com>
Date: Mon, 2 Nov 2026 12:49:00 +0000
Subject: [PATCH 45/48] fix(rocthrust): break hip include cycles, use
 _THRUST_STD::type_identity in counting_iterator

---
 .../hipccl3/rocthrust/thrust/iterator/counting_iterator.h     | 4 ++--
 .../hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h  | 2 +-
 .../hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h  | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h
index e9d5a1c5ebbe..8d0b76d0cfab 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/iterator/counting_iterator.h
@@ -71,9 +71,9 @@ struct make_counting_iterator_base
                                   _THRUST_STD::type_identity<any_system_tag>,
                                   _THRUST_STD::type_identity<System>>::type;
 
-  using traversal = replace_if_use_default<Traversal, ::internal::type_identity<random_access_traversal_tag>>;
+  using traversal = replace_if_use_default<Traversal, _THRUST_STD::type_identity<random_access_traversal_tag>>;
   using difference =
-    replace_if_use_default<Difference, ::internal::type_identity<counting_iterator_difference_type<Incrementable>>>;
+    replace_if_use_default<Difference, _THRUST_STD::type_identity<counting_iterator_difference_type<Incrementable>>>;
 
   // our implementation departs from Boost's in that counting_iterator::dereference
   // returns a copy of its counter, rather than a reference to it. returning a reference
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
index cbdad32ff634..5b2c76ac57f6 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/copy.h
@@ -41,7 +41,6 @@
 
 #include <thrust/advance.h>
 #include <thrust/detail/raw_pointer_cast.h>
-#include <thrust/detail/temporary_array.h>
 #include <thrust/system/hip/detail/cross_system.h>
 #include <thrust/system/hip/detail/execution_policy.h>
 #include <thrust/system/hip/detail/util.h>
@@ -93,6 +92,7 @@ transform(execution_policy<Derived>& policy, InputIt first, InputIt last, Output
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END
 
+#include <thrust/detail/temporary_array.h>
 #include <thrust/system/hip/detail/transform.h>
 #include <thrust/system/hip/detail/uninitialized_copy.h>
 
diff --git a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h
index 4cb6fa5a2121..0cbd7c7af0ff 100644
--- a/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h
+++ b/projects/hipccl/hipccl3/rocthrust/thrust/system/hip/detail/util.h
@@ -39,7 +39,6 @@
 
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/iterator/iterator_traits.h>
 
 #if !THRUST_COMPILER(NVRTC)
 #  include <thrust/system/hip/error.h>

From b43af494e3fc88e58a6ba2ed41b7bb75b8455ab9 Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Tue, 3 Nov 2026 16:33:56 -0500
Subject: [PATCH 46/48] chore(rocthrust): remove CCCL 3.2 sync scratch files

todo-rocthrust.md and cccl-investigation-v3.2.1.md are working files of the
CCCL sync skills and were not meant to be checked in (added in 787f309ae76).

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../rocthrust/cccl-investigation-v3.2.1.md    | 165 ----
 .../hipccl3/rocthrust/todo-rocthrust.md       | 705 ------------------
 2 files changed, 870 deletions(-)
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/cccl-investigation-v3.2.1.md
 delete mode 100644 projects/hipccl/hipccl3/rocthrust/todo-rocthrust.md

diff --git a/projects/hipccl/hipccl3/rocthrust/cccl-investigation-v3.2.1.md b/projects/hipccl/hipccl3/rocthrust/cccl-investigation-v3.2.1.md
deleted file mode 100644
index 14f45afbe20a..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/cccl-investigation-v3.2.1.md
+++ /dev/null
@@ -1,165 +0,0 @@
-# CCCL → rocThrust Sync Investigation: v3.1.0 → v3.2.1
-
-What changes in rocThrust when syncing CCCL v3.1.0 → v3.2.1, and
-what work that implies. No code has been ported yet.
-
-## Summary
-
-- **JIRA ticket**: none
-- **Base branch**: `users/matyas-streamhpc/hipccl/rocthrust_cccl31` (the unmerged CCCL 3.1 sync, 86 commits ahead of `origin/develop`)
-- **Baseline**: `v3.1.0` (confirmed by the human). `libcxx.h` on the base branch still requires libcu++/libhipcxx 3.0; this sync raises it to 3.2.
-- **Target**: `v3.2.1` — tags covered: `v3.1.1 v3.1.2 v3.1.3 v3.1.4 v3.2.0 v3.2.1`
-- **Upstream commits to port**: 136 touching `thrust/` (810 files changed). 8 are already on the base branch via the 3.1.0 backports, and 2 more are partly there (see §1).
-- **Maintenance-branch drift**: `branch/3.2.x` has one commit past v3.2.1 that touches `thrust/`, [`21b3532227f`](https://github.com/NVIDIA/cccl/commit/21b3532227f) "Bump branch/3.2.x to 3.2.2" ([PR #7651](https://github.com/NVIDIA/cccl/pull/7651)). It's a version bump for an untagged release and is deliberately left out.
-
-v3.2 adds little new public Thrust API. It is mostly a large internal restructuring of Thrust. The ADL dispatch layer is inlined and `system/detail/adl/` is deleted. Execution policies, the allocator internals, and the OMP/TBB/sequential backends are rewritten, and most `*.inl` files are folded into headers. `thrust::pair` and other Thrust facilities are replaced internally by `cuda::std::` and `cuda::` equivalents. On top of that come repo-wide clang-format, SPDX-license and include-cleanup sweeps. The CUDA backend moves several algorithms onto `cub::DeviceTransform`; that part is NVIDIA-only for rocThrust's HIP/rocPRIM backend but must still land in `thrust/system/cuda/`. The main risk is the dependency on libcu++ 3.2 features. These include `cuda::zip_iterator`, `cuda::zip_transform_iterator`, `cuda::transform_input_output_iterator` and new `_CCCL_*` macros. The bundled libhipcxx is still at CCCL 3.0.2 and has none of them. libhipcxx will be bumped to at least 3.2, so these commits are ported directly and `libcxx.h` requires 3.2. The genuinely new features are OMP/TBB parallel scan and the new iterator interop. The fixes that matter for HIP are the memcpy-kind, memory-resource free and `shuffle` fixes.
-
----
-
-## 1. New features
-
-v3.1.1–v3.1.4 were cut from `branch/3.1.x`. Their only Thrust content is three fixes (`<new>` for clang-cuda, `offset_iterator` tests, `detect_wrong_difference`), and the main-line originals of all three are in this range, listed under v3.2.0. v3.2.1's only Thrust change is the version bump. Everything below is v3.2.0.
-
-#### Already on the base branch
-
-The 3.1.0 backports already brought in these commits, so they should be ticked N/A after checking that nothing is missing:
-- [`7825c40c8a6`](https://github.com/NVIDIA/cccl/commit/7825c40c8a6) PDL macro ([PR #5316](https://github.com/NVIDIA/cccl/pull/5316))
-- [`daf84b3d7f5`](https://github.com/NVIDIA/cccl/commit/daf84b3d7f5) and [`2e8d11a0e36`](https://github.com/NVIDIA/cccl/commit/2e8d11a0e36) `unique` via `DeviceSelect::Unique` ([PR #5396](https://github.com/NVIDIA/cccl/pull/5396), [PR #5566](https://github.com/NVIDIA/cccl/pull/5566))
-- [`d7fbce513a7`](https://github.com/NVIDIA/cccl/commit/d7fbce513a7) `unique` with non-const `equality_op` ([PR #5652](https://github.com/NVIDIA/cccl/pull/5652))
-- [`d046198a7ee`](https://github.com/NVIDIA/cccl/commit/d046198a7ee) `malloc<void>` ([PR #5698](https://github.com/NVIDIA/cccl/pull/5698))
-- [`0b700f32b1e`](https://github.com/NVIDIA/cccl/commit/0b700f32b1e) extended-float forward declarations ([PR #5846](https://github.com/NVIDIA/cccl/pull/5846))
-- [`9fbba017026`](https://github.com/NVIDIA/cccl/commit/9fbba017026) `device_reference` nullptr ([PR #4226](https://github.com/NVIDIA/cccl/pull/4226))
-- [`57b16c2fc64`](https://github.com/NVIDIA/cccl/commit/57b16c2fc64) `__clz` ([PR #6099](https://github.com/NVIDIA/cccl/pull/6099))
-
-Two commits were only partly backported by the 3.1 "iterator fixes" backport ([PR #5977](https://github.com/NVIDIA/cccl/pull/5977)). Only the remainder of each needs porting:
-- [`e2dda739257`](https://github.com/NVIDIA/cccl/commit/e2dda739257) ([PR #5928](https://github.com/NVIDIA/cccl/pull/5928)): roughly 6 of 10 changed lines are already present.
-- [`9e73f14e8f1`](https://github.com/NVIDIA/cccl/commit/9e73f14e8f1) ([PR #5929](https://github.com/NVIDIA/cccl/pull/5929)): roughly 16 of 24 changed lines are already present.
-
-### v3.2.0
-
-#### New API
-- **`cuda::zip_iterator` / `cuda::zip_function` interop** ([PR #5429](https://github.com/NVIDIA/cccl/pull/5429), [PR #6039](https://github.com/NVIDIA/cccl/pull/6039)) — Thrust specializes `iterator_system`/`iterator_traversal` for `cuda::zip_iterator`, and `thrust::transform` unwraps `cuda::zip_iterator`/`zip_function`. **To do:** add `_THRUST_LIBCXX::` specializations under `_THRUST_HAS_DEVICE_SYSTEM_STD`, as the 3.1 branch did for `permutation_iterator`. The types come from libhipcxx ≥ 3.2.
-- **`cuda::transform_input_output_iterator` interop** ([PR #5113](https://github.com/NVIDIA/cccl/pull/5113)) — the same kind of trait specializations, plus tests. **To do:** port the same way as the zip iterators above.
-- **`cuda::zip_transform_iterator` interop** ([PR #5982](https://github.com/NVIDIA/cccl/pull/5982)) — trait specializations, `thrust::copy` support, and a new benchmark. **To do:** port the same way; the benchmark is covered in §3.
-- **Parallel scan for the OMP and TBB backends** ([PR #6178](https://github.com/NVIDIA/cccl/pull/6178), with the follow-up fix [PR #6704](https://github.com/NVIDIA/cccl/pull/6704)) — `inclusive_scan`/`exclusive_scan`/`*_by_key` now run in parallel under OMP and TBB. **To do:** port into `system/omp/` and `system/tbb/`, after the OMP/TBB restructuring in §4.
-- **`transform_n` / `transform_if_n` overloads and a `DeviceTransform`-based `transform_if` in the CUDA system** ([PR #5238](https://github.com/NVIDIA/cccl/pull/5238), [PR #5198](https://github.com/NVIDIA/cccl/pull/5198)). **To do:** port into `system/cuda/`. Check whether `system/hip/detail/transform.h` needs matching overloads; the generic `transform_n` is already on the base branch.
-- **New `sum_columns` example** ([PR #4462](https://github.com/NVIDIA/cccl/pull/4462)) — rocThrust already has `sum_rows.cu`. **To do:** add `examples/sum_columns.cu` and update `sum_rows.cu`.
-
-#### Behavior changes
-- **CUDA algorithms routed through `cub::DeviceTransform`**: `fill`/`fill_n` ([PR #5805](https://github.com/NVIDIA/cccl/pull/5805)), `uninitialized_fill` ([PR #5813](https://github.com/NVIDIA/cccl/pull/5813)), `generate` ([PR #5807](https://github.com/NVIDIA/cccl/pull/5807)), `tabulate` ([PR #6012](https://github.com/NVIDIA/cccl/pull/6012)), `scatter_if` ([PR #5952](https://github.com/NVIDIA/cccl/pull/5952)), and non-trivial device-to-device `copy` ([PR #5954](https://github.com/NVIDIA/cccl/pull/5954)). In addition, `uninitialized_copy` now uses `copy` ([PR #5181](https://github.com/NVIDIA/cccl/pull/5181)), and `copy` ([PR #5491](https://github.com/NVIDIA/cccl/pull/5491)), `find` ([PR #6019](https://github.com/NVIDIA/cccl/pull/6019)), `mismatch` ([PR #6018](https://github.com/NVIDIA/cccl/pull/6018)) and `iter_swap` ([PR #5843](https://github.com/NVIDIA/cccl/pull/5843)) are rewritten. **To do:** port into `system/cuda/` only. The HIP disposition is "no change: performance-only", unless a commit also changes behavior.
-- **Trivial copies use `cudaMemcpyDefault`** ([PR #7006](https://github.com/NVIDIA/cccl/pull/7006) via [PR #7134](https://github.com/NVIDIA/cccl/pull/7134)) — this makes copies correct when host and device pointers are swapped or the memory is managed. **To do:** switch `system/hip/detail/util.h` (lines 201 and 226) to `hipMemcpyDefault`, and port the new test as a HIP test.
-- **`thrust::shuffle` bijection reworked to match libcu++'s Feistel bijection** ([PR #7172](https://github.com/NVIDIA/cccl/pull/7172) via [PR #7189](https://github.com/NVIDIA/cccl/pull/7189)) — the shuffled output sequence changes. **To do:** port `random_bijection.h` and the rewritten `shuffle.cu`, and update `test/test_shuffle.cpp`.
-- **`device_delete` bypasses the allocator and supports polymorphic types; allocator and `device_[new|delete|free]` internals rewritten** ([PR #6134](https://github.com/NVIDIA/cccl/pull/6134), [PR #6136](https://github.com/NVIDIA/cccl/pull/6136), [PR #6198](https://github.com/NVIDIA/cccl/pull/6198), [PR #6140](https://github.com/NVIDIA/cccl/pull/6140)). **To do:** port; 7 of the allocator `.inl` files being deleted carry rocThrust edits (see §4).
-- **`transform_iterator` traversal now comes from the base iterator's traversal, not its category** ([PR #5883](https://github.com/NVIDIA/cccl/pull/5883)). **To do:** port with its tests.
-- **Internal uses of `thrust::pair`, `thrust::reverse_iterator`, `thrust::tabulate_output_iterator` and Thrust's duplicated math replaced by `cuda::std::` / `cuda::`** ([PR #6616](https://github.com/NVIDIA/cccl/pull/6616), [PR #5616](https://github.com/NVIDIA/cccl/pull/5616), [PR #6001](https://github.com/NVIDIA/cccl/pull/6001), [PR #6188](https://github.com/NVIDIA/cccl/pull/6188)). **To do:** translate to `_THRUST_STD::` / `_THRUST_LIBCXX::`. The non-libhipcxx fallback build needs care (see §4).
-- **NVTX ranges disabled for `thrust::seq`** ([PR #6415](https://github.com/NVIDIA/cccl/pull/6415)) — adds `thrust/detail/nvtx_policy.h`. **To do:** rocThrust has no NVTX ranges; add the header for parity and drop the `_CCCL_NVTX_RANGE_SCOPE_IF` call sites, or tick N/A.
-- **ABI inline-namespace spelling hardened against user macros** ([PR #6564](https://github.com/NVIDIA/cccl/pull/6564)). **To do:** apply the same `_CCCL_PP_CAT` construction to rocThrust's own `ROCTHRUST_VERSION` branch in `detail/config/namespace.h`.
-
-#### Deprecations
-- **`THRUST_HOST_FUNCTION`, `THRUST_DEVICE_FUNCTION` and `THRUST_FUNCTION`** ([PR #5972](https://github.com/NVIDIA/cccl/pull/5972)) — marked deprecated in `system/cuda/config.h`, with internal uses replaced by `_CCCL_API`/`_CCCL_HOST_API`. **To do:** port to `system/cuda/`. Decide whether `THRUST_HIP_FUNCTION` in `system/hip/config.h` follows suit.
-- **`_LIBCUDACXX_DEPRECATED` replaced by `CCCL_DEPRECATED`** ([PR #6024](https://github.com/NVIDIA/cccl/pull/6024)). **To do:** port. The macro comes from libhipcxx ≥ 3.2.
-
-#### Fixes
-- **Uninitialized read in `uninitialized_copy_n`** ([PR #5811](https://github.com/NVIDIA/cccl/pull/5811)). **To do:** port, and check `system/hip/detail/uninitialized_copy.h` for the same pattern.
-- **Missing stream synchronization in `cuda_cub::generate`** ([PR #5889](https://github.com/NVIDIA/cccl/pull/5889)). **To do:** port, and check `system/hip/detail/generate.h`.
-- **`iterator_category_to_system` wrong for device iterator tags** ([PR #5880](https://github.com/NVIDIA/cccl/pull/5880)). **To do:** port with its tests.
-- **CUDA memory resource no longer throws on free** ([PR #7002](https://github.com/NVIDIA/cccl/pull/7002) via [PR #7033](https://github.com/NVIDIA/cccl/pull/7033)) — avoids throwing from destructors and at process teardown. **To do:** apply the same change to `system/hip/memory_resource.h:79` ("HIP free failed").
-- **`thrust::ccosh` reformulated** ([PR #6200](https://github.com/NVIDIA/cccl/pull/6200)) — works around a GCC 14 segfault on Arm. **To do:** port.
-- **`<new>` included for clang-cuda** ([PR #6310](https://github.com/NVIDIA/cccl/pull/6310)), **`offset_iterator` tests** ([PR #6436](https://github.com/NVIDIA/cccl/pull/6436)), **`detect_wrong_difference` output iterator** ([PR #6450](https://github.com/NVIDIA/cccl/pull/6450)), and **OOM tolerated in the large `unique` test** ([PR #6304](https://github.com/NVIDIA/cccl/pull/6304)). **To do:** port.
-
-#### NVIDIA-only
-- **UBLKCP in copy/scatter_if** ([PR #5954](https://github.com/NVIDIA/cccl/pull/5954), [PR #5952](https://github.com/NVIDIA/cccl/pull/5952)), **vectorized-transform storage alignment** ([PR #7163](https://github.com/NVIDIA/cccl/pull/7163)), **removal of `LoadIterator`** ([PR #5480](https://github.com/NVIDIA/cccl/pull/5480)), **trimmed CUDA core utilities** ([PR #5845](https://github.com/NVIDIA/cccl/pull/5845)), **nvhpc header wrappers moved to libcudacxx** ([PR #6167](https://github.com/NVIDIA/cccl/pull/6167)), **an NVHPC optimization workaround** ([PR #5416](https://github.com/NVIDIA/cccl/pull/5416)) and **device-lambda diagnostics** ([PR #6782](https://github.com/NVIDIA/cccl/pull/6782)). **To do:** port into `system/cuda/` for parity where the file exists; nothing is needed on the HIP side.
-
----
-
-## 2. New CMake options / feature macros
-
-None of the new upstream CMake options are Thrust-specific. `CCCL_ENABLE_*` and `CCCL_USE_LIBCXX` come from top-level CCCL CMake, and rocThrust has its own CMake, so they are N/A. All the new macros below are libcu++ 3.2 macros that rocThrust gets from libhipcxx ≥ 3.2 (the bundled 3.0.2 lacks them).
-
-| Option / macro | Default | Introduced in | Defined/read in | Notes / rocThrust disposition |
-|----------------|---------|----------------|------------------|--------------------------------|
-| `_CCCL_HOST_STD_LIB(X)` | — | v3.2.0 ([PR #6244](https://github.com/NVIDIA/cccl/pull/6244)) | libcu++; read in a Thrust header | Port as-is; provided by libhipcxx ≥ 3.2 |
-| `_CCCL_BEGIN/END_NAMESPACE_CUDA[_STD]` | — | v3.2.0 ([PR #5538](https://github.com/NVIDIA/cccl/pull/5538)) | libcu++; Thrust iterator headers and tests | Translate to `_THRUST_STD_NAMESPACE_BEGIN/END` |
-| `_CCCL_HOST_API`, `_CCCL_DEVICE_API`, `_CCCL_API` | — | v3.2.0 ([PR #5953](https://github.com/NVIDIA/cccl/pull/5953), [PR #5972](https://github.com/NVIDIA/cccl/pull/5972)) | libcu++; `system/cuda/` | Already used in `system/cuda/` (3 uses); keep them CUDA-side only |
-| `_CCCL_TEMPLATE` / `_CCCL_REQUIRES` | — | v3.2.0 ([PR #6188](https://github.com/NVIDIA/cccl/pull/6188)) | libcu++ concept emulation | Port as-is; provided by libhipcxx ≥ 3.2 |
-| `_CCCL_PP_CAT` | — | v3.2.0 ([PR #6564](https://github.com/NVIDIA/cccl/pull/6564)) | `detail/config/namespace.h` | Use rocThrust's `THRUST_PP_*` equivalent |
-| `CCCL_DEPRECATED` | — | v3.2.0 ([PR #6024](https://github.com/NVIDIA/cccl/pull/6024)) | libcu++ | Port as-is; provided by libhipcxx ≥ 3.2 |
-| `_CCCL_NVTX_RANGE_SCOPE_IF` | — | v3.2.0 ([PR #6415](https://github.com/NVIDIA/cccl/pull/6415)) | libcu++ NVTX | N/A on AMD (no NVTX in rocThrust) |
-| `CCCL_DETAIL_KERNEL_ATTRIBUTES` | — | v3.2.0 ([PR #5843](https://github.com/NVIDIA/cccl/pull/5843)) | `system/cuda/detail/iter_swap.h` | CUDA-only |
-| `__THRUST_{DEVICE,HOST}_SYSTEM_ALGORITH[_DETAIL]_HEADER_INCLUDE(f)` | — | v3.2.0 ([PR #6377](https://github.com/NVIDIA/cccl/pull/6377)) | `detail/config/{device,host}_system.h` | Replaces the ADL layer; must resolve to `system/hip/` for the HIP device system (see §4) |
-| `THRUST_INCLUDING_ALGORITHMS_HEADER`, `_CCCL_TRAIT` (removed) | — | v3.2.0 ([PR #5764](https://github.com/NVIDIA/cccl/pull/5764), [PR #5466](https://github.com/NVIDIA/cccl/pull/5466)) | Thrust headers | Remove; check `system/hip/` for remaining uses |
-
----
-
-## 3. Test / benchmark coverage gaps
-
-### Tests
-
-| Feature / fix | Upstream test | rocThrust `testing/` / `test/` today | Action needed |
-|---------------|---------------|--------------------------------------|---------------|
-| `cuda::zip_iterator` / `transform_input_output_iterator` / `zip_transform_iterator` interop | `catch2_test_cuda_iterators.cu`, `zip_iterator.cu`, `transform_input_output_iterator.cu` | `testing/cuda_iterators.cu` + `test/test_libcxx_iterators.cpp` exist | Extend both, in Google Test |
-| Iterator system/traversal propagation ([PR #5875](https://github.com/NVIDIA/cccl/pull/5875), [PR #5880](https://github.com/NVIDIA/cccl/pull/5880), [PR #5881](https://github.com/NVIDIA/cccl/pull/5881), [PR #5883](https://github.com/NVIDIA/cccl/pull/5883)) | new `catch2_test_iterator_traits.cu` | missing | Implement as a new Google Test, e.g. `test/test_iterator_traits.cpp`, plus a `testing/` counterpart |
-| Trivial copy with `cudaMemcpyDefault` | new `cuda/trivial_copy_memcpy_default.cu` | missing | Add `testing/cuda/` copy and a HIP Google Test |
-| `log2` in `xor_combine_engine_max` (replaces mpl math, [PR #5897](https://github.com/NVIDIA/cccl/pull/5897)) | new `xor_combine_engine_max.cu`; deletes `metaprogramming.cu` | `metaprogramming.cu` + `test_metaprogramming.cpp` exist | Add the new test to both suites; keep `metaprogramming` cases that still apply |
-| OMP/TBB parallel scan | `omp/` scan tests ([PR #6704](https://github.com/NVIDIA/cccl/pull/6704)) | `testing/omp/` exists | Port |
-| `device_delete` polymorphic / allocator bypass | `device_delete.cu` | both exist | Extend both |
-| `reduce_by_key` | `reduce_by_key.cu` (+136 lines, [PR #6063](https://github.com/NVIDIA/cccl/pull/6063)) | both exist | Extend both |
-| `shuffle` | `shuffle.cu` rewritten | both exist | Port and update the Google Test |
-| Pair-, set-, sort- and iterator-test churn ([PR #6616](https://github.com/NVIDIA/cccl/pull/6616), [PR #5616](https://github.com/NVIDIA/cccl/pull/5616), [PR #4923](https://github.com/NVIDIA/cccl/pull/4923), [PR #6515](https://github.com/NVIDIA/cccl/pull/6515)) | ~60 `testing/*.cu` files | all exist | Port to `testing/`; mirror into `test/` where it changes behavior, not just spelling |
-
-### Catch2 migration
-- `complex.cu` → `catch2_test_complex.cu` ([PR #6625](https://github.com/NVIDIA/cccl/pull/6625)). rocThrust keeps `testing/complex.cu` and `test/test_complex.cpp`, and adds any new cases with Google Test.
-
-### Benchmarks
-- New upstream benchmarks that rocThrust lacks; port with Google Benchmark:
-  - `bench/generate/basic.cu`
-  - `bench/uninitialized_copy/basic.cu`
-  - `bench/transform/fib.cu`
-  - `bench/transform/if.cu`
-  - `bench/transform/if_stencil.cu`
-  - `bench/transform/zip_transform.cu`
-- Renamed upstream: `bench/transform/basic.cu` → `bench/transform/babelstream.cu`. rocThrust still has `basic.cu`; rename it.
-- Deleted upstream: none.
-- Modified: about 40 benchmarks. The changes are mostly the `thrust::pair` → `cuda::std::pair` swap, `nvbench_helper` relocation, and SPDX headers ([PR #6441](https://github.com/NVIDIA/cccl/pull/6441)); there are no functional changes.
-
----
-
-## 4. Potentially problematic commits
-
-| Commit | Subject | Why risky | What to do |
-|--------|---------|-----------|------------|
-| [`88b95bb9a2c`](https://github.com/NVIDIA/cccl/commit/88b95bb9a2c) | Inline the Thrust ADL layer ([PR #6377](https://github.com/NVIDIA/cccl/pull/6377)) | Deletes all 43 `system/detail/adl/*.h`, which in rocThrust explicitly include `system/hip/detail/*`. 91 files are affected. | Make the new `__THRUST_DEVICE_SYSTEM_*_HEADER_INCLUDE` macros resolve to `system/hip` when the device system is HIP; build-test both the HIP and CUDA device systems |
-| [`2f39a342b93`](https://github.com/NVIDIA/cccl/commit/2f39a342b93) | Refactor Thrust execution policies ([PR #5821](https://github.com/NVIDIA/cccl/pull/5821)) | Deletes `par.h`/`par_to_seq.h` for cuda/cpp/omp/tbb. rocThrust has AMD-only `system/hip/detail/par.h` and `par_to_seq.h`. | Port the same restructuring into `system/hip/` by hand |
-| [`e73cc82956a`](https://github.com/NVIDIA/cccl/commit/e73cc82956a) | Move CPP, OMP and TBB exec policies to detail ([PR #6361](https://github.com/NVIDIA/cccl/pull/6361)) | Follow-up to #5821; touches `system/cuda/` | Check whether `system/hip/` needs the same move |
-| [`fbb9479172c`](https://github.com/NVIDIA/cccl/commit/fbb9479172c), [`700f2a867a7`](https://github.com/NVIDIA/cccl/commit/700f2a867a7) | Allocator internals; `destroy_range`/`device_*` refactors ([PR #6136](https://github.com/NVIDIA/cccl/pull/6136), [PR #6134](https://github.com/NVIDIA/cccl/pull/6134)) | Deletes 11 `.inl` files; 7 of the allocator `.inl` files contain rocThrust `_THRUST_STD`/`::hip::` edits | Carry the rocThrust edits over into the merged headers |
-| [`c22298179e0`](https://github.com/NVIDIA/cccl/commit/c22298179e0), [`c2f0b68245e`](https://github.com/NVIDIA/cccl/commit/c2f0b68245e), [`865e3d6429f`](https://github.com/NVIDIA/cccl/commit/865e3d6429f), [`e11761cc1b8`](https://github.com/NVIDIA/cccl/commit/e11761cc1b8) | OMP / TBB / seq header restructuring ([PR #6372](https://github.com/NVIDIA/cccl/pull/6372), [PR #6394](https://github.com/NVIDIA/cccl/pull/6394), [PR #6437](https://github.com/NVIDIA/cccl/pull/6437), [PR #6406](https://github.com/NVIDIA/cccl/pull/6406)) | About 250 files; most `.inl` files are deleted | Mostly mechanical; diff rocThrust's copies against v3.1.0 first to find local edits that must survive |
-| [`91434d76ab3`](https://github.com/NVIDIA/cccl/commit/91434d76ab3) | Replace `thrust::pair` with `cuda::std::pair` ([PR #6616](https://github.com/NVIDIA/cccl/pull/6616)) | 115 files. In the fallback build (no libhipcxx) `_THRUST_STD::pair` is `std::pair`, whose device-side usability is unverified. | Translate to `_THRUST_STD::pair`; build-test the fallback configuration |
-| [`31dd1d76e72`](https://github.com/NVIDIA/cccl/commit/31dd1d76e72), [`bcb2bcb106d`](https://github.com/NVIDIA/cccl/commit/bcb2bcb106d), [`4b10fd26255`](https://github.com/NVIDIA/cccl/commit/4b10fd26255), [`e6ad5079192`](https://github.com/NVIDIA/cccl/commit/e6ad5079192), [`5ff11d47308`](https://github.com/NVIDIA/cccl/commit/5ff11d47308) | clang-format, include cleanup, nested namespaces ([PR #6439](https://github.com/NVIDIA/cccl/pull/6439), [PR #6440](https://github.com/NVIDIA/cccl/pull/6440), [PR #6547](https://github.com/NVIDIA/cccl/pull/6547), [PR #6465](https://github.com/NVIDIA/cccl/pull/6465), [PR #5801](https://github.com/NVIDIA/cccl/pull/5801)) | 600+ files of whitespace and include churn; a high chance of conflicting context | Apply to the upstream-shared files; extend to `system/hip/` only if you want consistent formatting |
-| [`b2a8d0e88f8`](https://github.com/NVIDIA/cccl/commit/b2a8d0e88f8), [`7b52284299d`](https://github.com/NVIDIA/cccl/commit/7b52284299d) | Plain `cuda::std::`; renamed namespace macros ([PR #5573](https://github.com/NVIDIA/cccl/pull/5573), [PR #5538](https://github.com/NVIDIA/cccl/pull/5538)) | rocThrust spells these `_THRUST_STD::` (1238 uses) | Translate rather than copy verbatim |
-| [`3b6e4a6e911`](https://github.com/NVIDIA/cccl/commit/3b6e4a6e911), [`6d3ffc900fb`](https://github.com/NVIDIA/cccl/commit/6d3ffc900fb), [`fa13b90c53b`](https://github.com/NVIDIA/cccl/commit/fa13b90c53b), [`ff8a0d96b7f`](https://github.com/NVIDIA/cccl/commit/ff8a0d96b7f), [`bfb875c8f73`](https://github.com/NVIDIA/cccl/commit/bfb875c8f73) | `cuda::` iterator interop | The types don't exist in libhipcxx 3.0.2 | Port via `_THRUST_LIBCXX::`; requires the libhipcxx ≥ 3.2 bump |
-| [`4eb027ce476`](https://github.com/NVIDIA/cccl/commit/4eb027ce476) + [`07e250154a8`](https://github.com/NVIDIA/cccl/commit/07e250154a8) | Drop `thrust::counting_iterator`, then revert it ([PR #5839](https://github.com/NVIDIA/cccl/pull/5839), [PR #5925](https://github.com/NVIDIA/cccl/pull/5925)) | Net zero across 83 files | Tick both N/A together |
-| [`8b263079605`](https://github.com/NVIDIA/cccl/commit/8b263079605) | ABI namespace spelling ([PR #6564](https://github.com/NVIDIA/cccl/pull/6564)) | Changes the mangled inline-namespace name, and rocThrust has its own `ROCTHRUST_VERSION` branch | Apply to all three branches of `namespace.h` |
-| [`2845628f12e`](https://github.com/NVIDIA/cccl/commit/2845628f12e), [`783ebe64a0e`](https://github.com/NVIDIA/cccl/commit/783ebe64a0e), [`d89402658b2`](https://github.com/NVIDIA/cccl/commit/d89402658b2), [`8a95f4c8051`](https://github.com/NVIDIA/cccl/commit/8a95f4c8051), [`065a6a742d6`](https://github.com/NVIDIA/cccl/commit/065a6a742d6), [`a8c74132b74`](https://github.com/NVIDIA/cccl/commit/a8c74132b74), [`344641b3b3c`](https://github.com/NVIDIA/cccl/commit/344641b3b3c) | Upstream CMake changes | rocThrust's CMake is independent of upstream's | Mostly N/A; check `testing/` and `examples/` CMake additions |
-
-### File renames / moves (build-break risk)
-- `thrust/iterator/detail/iterator_traversal_tags.h` → `thrust/iterator/iterator_traversal_tags.h` ([PR #5833](https://github.com/NVIDIA/cccl/pull/5833)). Fix up includes in `system/hip/`.
-- 110 upstream-deleted files still exist in rocThrust. They are the 43 `adl/*.h`, 11 allocator/`device_*` `.inl` files, `util/align.h`, `mpl/math.h`, `integer_math.h`, `complex/c99math.h`, `{algorithm,memory,numeric}_wrapper.h`, `cuda/detail/core/{load,make_load}_iterator.h`, `cuda/detail/{par,par_to_seq}.h`, `cuda/detail/internal/copy_*.h`, the OMP/TBB/sequential `.inl` files, and `generic/scan.inl`. Any `system/hip/` or rocThrust-only file that includes them must be updated. The `system/hip/detail/internal/copy_*.h` and `par*.h` counterparts need an explicit keep-or-delete decision.
-- `testing/complex.cu` and `testing/metaprogramming.cu` are deleted upstream; keep them (see §3).
-
-### Public API / ABI changes
-- The ABI inline namespace name changes ([PR #6564](https://github.com/NVIDIA/cccl/pull/6564)), and `THRUST_VERSION` becomes `300201`.
-- Thrust 3.2 is written against libcu++ 3.2, while `libcxx.h` on the base branch still requires 3.0 and the bundled libhipcxx is 3.0.2. Raise the requirement to 3.2 alongside the libhipcxx bump.
-- `THRUST_*_FUNCTION` macros are deprecated ([PR #5972](https://github.com/NVIDIA/cccl/pull/5972)).
-
----
-
-## Handoff
-
-- **Next step**: `rocthrust-cccl-sync-todo` for `v3.1.0..v3.2.1` on top of `users/matyas-streamhpc/hipccl/rocthrust_cccl31`, then `rocthrust-cccl-sync-resolve` and `rocthrust-cccl-sync-finalize`.
-- **Decisions (2026-10-19)**:
-  - libhipcxx will be at least 3.2. Port the `cuda::` iterator interop and the libcu++ 3.2 macros as-is, translated to `_THRUST_LIBCXX::`/`_THRUST_STD::`, with no libhipcxx-3.0 fallback. Raise the required libhipcxx version in `libcxx.h` from 3.0 to 3.2.
-  - Compatibility over performance. Performance-only rewrites (the `DeviceTransform` routing, UBLKCP, the `copy`/`find`/`mismatch`/`iter_swap`/`replace` rewrites, vectorized-transform alignment) are ported into `system/cuda/` only. Their `system/hip/` disposition is "no change: performance-only". Behavior and correctness fixes still go into `system/hip/`.
-- **Open questions**:
-  - Should the HIP backend's `par.h`, `par_to_seq.h` and `internal/copy_*.h` follow #5821's deletion, or stay as AMD-only?
-  - The `THRUST_HIP_FUNCTION` deprecation: follow #5972 or not?
-  - Is `std::pair` usable in device code in the fallback (no libhipcxx) build? This affects #6616.
diff --git a/projects/hipccl/hipccl3/rocthrust/todo-rocthrust.md b/projects/hipccl/hipccl3/rocthrust/todo-rocthrust.md
deleted file mode 100644
index d8b6563678b2..000000000000
--- a/projects/hipccl/hipccl3/rocthrust/todo-rocthrust.md
+++ /dev/null
@@ -1,705 +0,0 @@
-# CCCL → rocThrust Sync: v3.1.0 → v3.2.1 — TODO
-
-We are in the middle of a manual-port sync of upstream CCCL/Thrust commits
-into rocThrust. There is no git merge in progress and never will be — this
-sync is a series of hand-ported commits, one local commit per item below,
-audited at the end by `rocthrust-cccl-sync-finalize`. This file tracks
-which upstream commits still need to be ported.
-
-## Sync parameters
-
-- **JIRA ticket**: none (no fixed project exists for
-  rocThrust syncs)
-- **Repo**: `ROCm/rocm-libraries` — rocThrust lives at `projects/hipccl/hipccl3/rocthrust/`
-- **Sync base branch** (`$SYNC_BASE`): `users/matyas-streamhpc/hipccl/rocthrust_cccl31`
-- **Confirmed current tag** (`$CURRENT_TAG`): `v3.1.0`
-- **Target tag** (`$TO_TAG`): `v3.2.1`
-- **Sync branch** (`$SYNC_BRANCH`, currently checked out): `users/amd-jmahovsky/hipccl/rocthrust_cccl32`
-- **Investigation report**: `/home/AMD/jmahovsk/hipcclsync_rocthrust_3.2/rocm-libraries/projects/hipccl/hipccl3/rocthrust/cccl-investigation-v3.2.1.md`
-- **Path-prefix reminder**: upstream `thrust/<path>` translates to
-  `projects/hipccl/hipccl3/rocthrust/<path>` (e.g. `thrust/testing/*` →
-  `projects/hipccl/hipccl3/rocthrust/testing/*`), except `thrust/benchmarks/*` →
-  `projects/hipccl/hipccl3/rocthrust/benchmark/*` (singular). Translate every path before
-  applying.
-- **Sync decisions** (human, 2026-10-19):
-  - libhipcxx will be at least 3.2. Port `cuda::` iterator interop and
-    libcu++ 3.2 macros directly via `_THRUST_LIBCXX::`/`_THRUST_STD::`, with
-    no libhipcxx-3.0 fallback. Raise the libhipcxx version required in
-    `thrust/detail/config/libcxx.h` from 3.0 to 3.2.
-  - Compatibility over performance. Performance-only rewrites go into
-    `thrust/system/cuda/` only, with HIP disposition "no change:
-    performance-only". Behavior and correctness fixes still go into
-    `thrust/system/hip/`.
-
-## ⚠ Ordering rule
-
-Commits below are listed **strictly oldest-first**. Only the first unticked
-(`- [ ]`) item may be worked next. Do not skip ahead, reorder, or batch
-multiple commits together — a later commit may assume an earlier one is
-already applied (it may reference symbols the earlier commit introduces, or
-fix a bug the earlier commit itself introduced).
-
-## State of the sync
-
-- No `git merge` is in progress. There is no `MERGE_HEAD`, and no conflict
-  markers will ever appear as part of this process.
-- Ticked (`- [X]`) items below are **committed** on the sync branch: one
-  local commit per item, including N/A items (empty commit), whose subject
-  contains `port CCCL <sha11>`. The tick-note records it as `Local commit:
-  <sha>`.
-- This file itself is untracked and is never committed. Nothing is pushed
-  until the human decides to. Avoid `git reset --hard` on this branch.
-
-## Commits to port
-
-- [X] 543b245c62c Bump main to 3.2.0. (#5286) [SCOPE: HEADER]
-  - N/A — version bump only; rocThrust's THRUST_VERSION is set outside the port loop (target 300201 after finalize, as the 3.1 sync did in e4702647598).
-  - HIP counterpart: none (no thrust/system/cuda/ paths touched).
-  - test/ counterpart: none (no testing/*.cu paths touched).
-  - Local commit: 08d5fcb66fa
-- [X] 76fc4572271 Extend and refactor transform overloads in CUDA system (#5238) [SCOPE: HEADER]
-  - clean port — applied to projects/hipccl/hipccl3/rocthrust/thrust/system/cuda/detail/transform.h (now identical to upstream; the local `_THRUST_STD::distance` spellings were all on lines upstream rewrote).
-  - HIP counterpart: no change — `thrust::transform_n`/`transform_if_n` already reach the HIP backend through the generic implementations in `system/detail/generic/transform.h`; the new CUDA overloads only shortcut onto the CUDA fast path (performance-only, per sync decision).
-  - test/ counterpart: none (no testing/*.cu paths touched).
-  - Not compiled, tests not run (per human).
-  - Local commit: 00e73adf2a5
-- [X] 6d3ffc900fb Port `thrust::transform_input_output_iterator` to `cuda` (#5113) [SCOPE: HEADER,TEST]
-  - Adaptation: libcxx transform_input_output_iterator include placed inside local `#if _THRUST_HAS_DEVICE_SYSTEM_STD` guard; iterator_traits specializations use `_THRUST_LIBCXX::` spelling, local `transform_output_iterator<Fn, Iter>` order kept.
-  - HIP counterpart: none (no system/cuda paths touched).
-  - test/ counterpart: catch2 "transform_input_output_iterator" case implemented as GTest in test/test_libcxx_iterators.cpp (TestLibcxxTransformInputOutputIterator) and legacy testing/cuda_iterators.cu.
-  - Not compiled, tests not run (per human).
-  - Local commit: 61d047f9782
-- [X] 7825c40c8a6 Add a macro to disable PDL (#5316) [SCOPE: HEADER]
-  - N/A: already backported (verified — rocThrust triple_chevron_launch.h already uses `_CCCL_HAS_PDL()`; 3-way merge is a no-op).
-  - HIP counterpart: none (hip backend has no PDL launch path).
-  - test/ counterpart: none (no test changes).
-  - Not compiled, tests not run (per human).
-  - Local commit: 39141fa23ca
-- [X] daf84b3d7f5 Makes `thrust::unique` use `cub::DeviceSelect::Unique` (#5396) [SCOPE: HEADER,TEST]
-  - N/A: already backported (verified — 3-way merge of system/cuda/detail/unique.h and testing/cuda/unique.cu is a no-op; local unique.cu additionally keeps local custom-equality tests).
-  - HIP counterpart: none (cuda DeviceSelect::Unique routing is performance-only; hip backend already uses rocprim unique).
-  - test/ counterpart: none needed (TestUniqueWithLargeNumberOfItems already present in testing/cuda/unique.cu; cuda-dir test, no test/test_ counterpart).
-  - Not compiled, tests not run (per human).
-  - Local commit: af79728c93f
-- [X] 4db1ed081a3 Disable NVHPC optimization that leads to error (#5416) [SCOPE: TEST]
-  - Ported NVHPC noinline workaround on FixedVector::operator+ in testing/unittest/special_types.h, keeping local THRUST_HOST_DEVICE spelling.
-  - HIP counterpart: none (test-infrastructure only, NVHPC-specific).
-  - test/ counterpart: none (NVHPC compiler workaround; GTest test/ is not built with NVHPC).
-  - Not compiled, tests not run (per human).
-  - Local commit: bd3ed37dd9c
-- [X] 228c8379b80 Generate negative numbers in Thrust unit tests and fix them (#4923) [SCOPE: HEADER,TEST]
-  - Clean port: uniform_real_distribution now uses `_THRUST_STD::lerp` (fixes overflow for [lowest, max] ranges); legacy testing/unittest/random.h generator refactored to `if constexpr` and generates negative values.
-  - HIP counterpart: none (system-independent random header).
-  - test/ counterpart: none (GTest test/ uses its own data generators in test/test_utils.hpp; legacy testing/unittest/random.h updated).
-  - Not compiled, tests not run (per human).
-  - Local commit: 8f47253fb79
-- [X] 3b6e4a6e911 Port `thrust::zip_iterator` to namespace `cuda` (#5429) [SCOPE: HEADER,TEST]
-  - Clean port: iterator_system/iterator_traversal specializations for `_THRUST_LIBCXX::zip_iterator<Iterators...>` (requires libhipcxx >= 3.2 zip_iterator/zip_function).
-  - HIP counterpart: none (no system/cuda paths touched).
-  - test/ counterpart: catch2 "zip_iterator" case implemented as GTest TestLibcxxZipIterator in test/test_libcxx_iterators.cpp and TestCUDAZipIterator in legacy testing/cuda_iterators.cu.
-  - Not compiled, tests not run (per human).
-  - Local commit: 57d74ebd10c
-- [X] f22dae63e20 Drop all usages of `_CCCL_TRAIT` (#5466) [SCOPE: HEADER]
-  - Clean port (after spelling normalization): transform_iterator::operator= uses `_THRUST_STD::is_*_v` instead of local `THRUST_TRAIT` (upstream `_CCCL_TRAIT`). Other local THRUST_TRAIT uses left as upstream did not touch them in thrust/.
-  - HIP counterpart: none (no system/cuda paths touched).
-  - test/ counterpart: none (no test changes).
-  - Not compiled, tests not run (per human).
-  - Local commit: 66fc2141646
-- [X] c8e0441d799 Simplify thrust::device_malloc (#5477) [SCOPE: HEADER]
-  - Clean port (conflict was doc-comment rewrite; local side was identical to upstream base): device_malloc folded into a single `template <typename T = void>` in device_malloc.h; detail/device_malloc.inl deleted (no other local includes).
-  - HIP counterpart: none (system-independent; dispatches via thrust::malloc).
-  - test/ counterpart: none (no test changes; existing device_malloc tests cover both overloads).
-  - Not compiled, tests not run (per human).
-  - Local commit: 15c13247bdb
-- [X] 30c02fd29dd Refactor thrust::pointer (#5478) [SCOPE: HEADER]
-  - Adaptation: pointer.inl folded into pointer.h per upstream; kept local `::internal::remove_cvref_t` shim (C++17 fallback) and moved the local hipcc-linkage `pointer(Element*)` constructor (THRUST_HAS_HIP_COMPILER) definition inline; `_CCCL_*` wrapper macros spelled `THRUST_*`.
-  - HIP counterpart: none (system-independent pointer type; hip `pointer` derives from it).
-  - test/ counterpart: none (no test changes).
-  - Not compiled, tests not run (per human).
-  - Local commit: 5596ad85080
-- [X] 8b6974ed415 Add test to ensure we can use `cuda::std::reverse_iterator` with thrust APIs (#5486) [SCOPE: HEADER,TEST]
-  - Clean port: iterator_system/iterator_traversal specializations for `_THRUST_STD::reverse_iterator<Iter>` so thrust dispatches on the wrapped iterator's system.
-  - HIP counterpart: none (no system/cuda paths touched).
-  - test/ counterpart: catch2 "reverse_iterator" case implemented as GTest TestLibcxxReverseIterator in test/test_libcxx_iterators.cpp and TestCUDAReverseIterator in legacy testing/cuda_iterators.cu.
-  - Not compiled, tests not run (per human).
-  - Local commit: 717f3a94918
-- [X] f5a40bf5e45 Drop `thrust::LoadIterator`/`make_load_iterator` (#5480) [SCOPE: HEADER]
-  - Clean port into system/cuda: load_iterator.h/make_load_iterator.h deleted; reduce/reduce_by_key/set_operations use cub::try_make_cache_modified_iterator (requires CCCL 3.2 CUB in the CUDA build).
-  - HIP counterpart: none (no system/hip usage of LoadIterator; hip backend uses rocPRIM).
-  - test/ counterpart: none (no test changes).
-  - Not compiled, tests not run (per human).
-  - Local commit: dab7e6173a3
-- [X] 82335a826ed Extend `cub::DeviceTransform` by a predicate and port `thrust::transform_if` (#5198) [SCOPE: HEADER,BENCH]
-  - Clean port into system/cuda/detail/transform.h: transform_if routed through cub::DeviceTransform with predicate (performance-only).
-  - HIP counterpart: no change: performance-only (hip backend transform_if keeps its rocPRIM path; per sync decision compatibility over performance).
-  - Benchmark: new nvbench benchmarks/bench/transform/if.cu rewritten for primbench as benchmark/bench/transform/if.cu (negate_if over int8..int64, 3 entropies) and registered in benchmark/CMakeLists.txt.
-  - test/ counterpart: none (no test changes).
-  - Not compiled, tests not run (per human).
-  - Local commit: 558df7bfe99
-- [X] 4ea5d23ae76 [Thrust] Make documentation behind `#if 0` visible (#5455) [SCOPE: HEADER]
-  - Port (docs-only): `#if 0` documentation blocks switched to `#if THRUST_DOXYGEN_INVOKED` (upstream `_CCCL_DOXYGEN_INVOKED`) across device_reference/device_vector/host_vector/memory/retag/execution_policy and cpp/omp/tbb execution_policy.h. Conflicts resolved to upstream doc text; kept local hipcc-linkage `pointer(Element*)` ctor in detail/pointer.h.
-  - HIP counterpart: none (system/hip/execution_policy.h has no `#if 0` doc block; no system/cuda paths touched).
-  - test/ counterpart: none (no test changes).
-  - Not compiled, tests not run (per human).
-  - Local commit: dd2c8abc604
-- [X] 4b2201184c4 Use `thrust::copy` in `thrust::uninitialized_copy[_n]` in CUDA system when possible (#5181) [SCOPE: HEADER,BENCH]
-  - Clean port into system/cuda: uninitialized_copy_n delegates to copy_n when output is trivially constructible from input (performance-only); added `thrust::detail::raw_reference_t` alias in detail/raw_reference_cast.h (generic).
-  - HIP counterpart: no change: performance-only (system/hip uninitialized_copy keeps its parallel_for path per sync decision).
-  - Benchmark: new nvbench bench/uninitialized_copy/basic.cu rewritten for primbench as benchmark/bench/uninitialized_copy/basic.cu (uint8..uint64, no_copy, no_construct) and registered in benchmark/CMakeLists.txt.
-  - test/ counterpart: none (no test changes).
-  - Not compiled, tests not run (per human).
-  - Local commit: 9d7099b1e54
-- [X] 7b52284299d Rename our namespace macros (#5538) [SCOPE: HEADER,TEST]
-  - Adaptation: local `_THRUST_STD_NAMESPACE_BEGIN/END` (thrust/detail/config/libcxx.h) already abstracts the libcu++ std namespace macros; kept local spelling in testing/copy.cu, testing/scan.cu, testing/unittest/testframework.h, tuple_of_iterator_references.h, zip_iterator.h. libcxx.h now maps to `_CCCL_BEGIN/END_NAMESPACE_CUDA_STD` when defined (CCCL >= 3.2), else the old `_LIBCUDACXX_*` names; added `_THRUST_LIBCXX_NAMESPACE_BEGIN/END` (cuda namespace) and used it in zip_function.h.
-  - HIP counterpart: none (no system/cuda paths changed locally)
-  - test/ counterpart: none (testing/copy.cu, testing/scan.cu namespace-macro rename only, kept local abstraction; test/test_copy.cpp / test/test_scan.cpp unaffected)
-  - Not compiled, tests not run (per human)
-  - Local commit: 09162f5157b
-- [X] 854290f8b5f Add a benchmark for transform_if with stencil (#5571) [SCOPE: BENCH]
-  - Ported as primbench benchmark: new `benchmark/bench/transform/if_stencil.cu` (negate_if_stencil, modeled on bench/transform/if.cu; stencil generated with seed+1; reads n + selected, writes selected) + `add_thrust_benchmark(bench/transform/if_stencil.cu)` in benchmark/CMakeLists.txt
-  - HIP counterpart: none (benchmark only)
-  - test/ counterpart: none (benchmark only)
-  - Not compiled, tests not run (per human)
-  - Local commit: 7530717d999
-- [X] bc455b2d440 Remove repo-docs dependency (#5568) [SCOPE: HEADER] ⚠ touches `thrust/tuple.h`
-  - Ported Doxygen comment fixes in thrust/ headers (group open/close markers, \param fixes, offset_iterator deduction guide `#ifndef THRUST_DOXYGEN_INVOKED`). offset_iterator.h: kept local deduction guide without `THRUST_HOST_DEVICE` (local spelling; guard already present). Non-thrust (docs/, cub/, .github) parts N/A.
-  - HIP counterpart: none (doc comments only; system/cuda/vector.h comment only)
-  - test/ counterpart: none (no test changes)
-  - Not compiled, tests not run (per human)
-  - Local commit: fc0ff525183
-- [X] b2a8d0e88f8 Replace our qualification macros with plain `cuda::std::` (#5573) [SCOPE: HEADER,TEST] ⚠ touches `thrust/tuple.h`
-  - N/A: local code already uses `_THRUST_STD::` (maps to `::cuda::std`/`::hip::std`) instead of `_CUDA_VSTD`/`_CCCL_*` qualification macros in tuple.h, pair.h, zip_iterator.h, tuple_of_iterator_references.h and testing/transform_iterator.cu; 3-way merge produced no change
-  - HIP counterpart: none (no system/cuda paths)
-  - test/ counterpart: none (testing/transform_iterator.cu already uses `_THRUST_STD::forward`; test/test_transform_iterator.cpp unaffected)
-  - Not compiled, tests not run (per human)
-  - Local commit: 4113417ddf3
-- [X] 419d327e959 Documentation fixes (#5468) [SCOPE: HEADER]
-  - Ported thrust/ part: shuffle_iterator.h Doxygen guard tweaks (`#ifndef THRUST_DOXYGEN_INVOKED` instead of `\cond`). Non-thrust doc fixes N/A.
-  - HIP counterpart: none (documentation only)
-  - test/ counterpart: none (documentation only)
-  - Not compiled, tests not run (per human)
-  - Local commit: 7b5b4a05ee8
-- [X] 2e8d11a0e36 Avoids invoking custom equality operator for out-of-bounds items (#5566) [SCOPE: TEST]
-  - testing/cuda/unique.cu: N/A, already backported (TestUniqueWithCustomEqualityOp + check_valid_item_op present; 3-way merge only conflicted on later local NonConstAdapter test, kept ours).
-  - HIP counterpart: none (test-only commit; no header change)
-  - test/ counterpart: added `TEST(UniqueTests, TestUniqueWithCustomEqualityOp)` in test/test_unique.cpp (unique_copy over counting_iterator with an equality op that counts out-of-bounds invocations) to cover the hip backend
-  - Not compiled, tests not run (per human)
-  - Local commit: c6f0a6ccb63
-- [X] 8b68d958473 Drop internal uses of `thrust::reverse_iterator` (#5616) [SCOPE: HEADER,TEST,EXAMPLE,BENCH]
-  - Ported: `thrust::reverse_iterator` / `thrust::make_reverse_iterator` are now aliases of `_THRUST_STD::reverse_iterator` / `_THRUST_STD::make_reverse_iterator` (local class removed); internal uses switched to `_THRUST_STD::` in detail/vector_base.h, system/detail/generic/reverse.inl, system/tbb/detail/reduce_by_key.inl, system/cuda/detail/reverse.h. iterator_system/iterator_traversal for `_THRUST_STD::reverse_iterator` already present (item 12). In the no-libhipcxx fallback this resolves to `::std::reverse_iterator` (constexpr members, usable on device under hipcc).
-  - examples/cuda/range_view.cu kept `cuda::std::` spelling to match surrounding code; testing/cuda/sort.cu and benchmark/bench/partition/basic.cu (primbench, kept ours) use `_THRUST_STD::make_reverse_iterator`.
-  - testing/*_iterator.cu comment-only conflicts resolved to upstream wording with `_THRUST_STD`; testing/reverse_iterator.cu adds `_THRUST_STD_INCLUDE(iterator)` and keeps local `unittest.h` include.
-  - HIP counterpart: system/hip/detail/reverse.h mirrored (`_THRUST_STD::reverse_iterator{...}` / `_THRUST_STD::make_reverse_iterator`, unconditional `_THRUST_STD_INCLUDE(iterator)`, dropped thrust/iterator/reverse_iterator.h include)
-  - test/ counterpart: none needed (test/test_reverse_iterator.cpp uses `thrust::reverse_iterator`, which now aliases `_THRUST_STD::reverse_iterator`; its assertions match upstream's)
-  - Not compiled, tests not run (per human)
-  - Local commit: 331c611fcb9
-- [X] d7fbce513a7 Fixes `thrust::unique` for non-const `equality_op` (#5652) [SCOPE: TEST]
-  - testing/cuda/unique.cu: N/A, already backported (NonConstAdapter + TestUniqueWithCustomEqualityOpMutable present; 3-way merge no-op).
-  - HIP counterpart: none (test-only commit)
-  - test/ counterpart: added `TEST(UniqueTests, TestUniqueWithCustomEqualityOpMutable)` in test/test_unique.cpp (unique with a non-const `__device__` equality op) to cover the hip backend
-  - Not compiled, tests not run (per human)
-  - Local commit: 3f86335ac62
-- [X] ed7b88d9441 Fix `cuda::shuffle_iterator` not properly working with thrust algorithms (#5686) [SCOPE: HEADER,TEST]
-  - Ported: iterator_system (any_system_tag) / iterator_traversal (random_access) specializations for `_THRUST_LIBCXX::shuffle_iterator` in thrust/iterator/iterator_traits.h.
-  - HIP counterpart: none (no system/cuda paths; traits are backend-agnostic)
-  - test/ counterpart: catch2_test_cuda_iterators.cu changes ported to GTest test/test_libcxx_iterators.cpp (new TestLibcxxShuffleIterator + fake_bijection; constant/counting/strided/transform/transform_output cases now check results) and legacy testing/cuda_iterators.cu (TestCUDAShuffleIterator + same strengthened checks)
-  - Not compiled, tests not run (per human)
-  - Local commit: ec576853b41
-- [X] 10823d8cf51 Move nvbench_helper out of CUB for easier reuse. (#5692) [SCOPE: BENCH]
-  - N/A: moves nvbench_helper out of CUB and updates thrust/benchmarks/CMakeLists.txt; rocThrust benchmarks use primbench + local bench_utils.hpp, no nvbench_helper
-  - HIP counterpart: none (benchmark build infrastructure only)
-  - test/ counterpart: none (benchmark build infrastructure only)
-  - Not compiled, tests not run (per human)
-  - Local commit: 4e6c4a360a9
-- [X] d046198a7ee Fix `thrust::malloc` for `void` (#5698) [SCOPE: HEADER]
-  - N/A: already backported (verified — system/detail/generic/memory.inl already has the `if constexpr (is_void_v<T>)` byte-allocation path; 3-way merge only differed by a blank line, kept ours)
-  - HIP counterpart: none (generic backend, shared by hip)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 68c5023135a
-- [X] 065a6a742d6 Unify the libcudacxx header test infrastructure with the other projects (#5735) [SCOPE: CMAKE]
-  - N/A: upstream drops Clang-CUDA flags from thrust/cmake/ThrustCudaConfig.cmake (moved to cccl compiler interface); rocThrust has no ThrustCudaConfig.cmake (HIP CMake build)
-  - HIP counterpart: none (CMake only)
-  - test/ counterpart: none (CMake only)
-  - Not compiled, tests not run (per human)
-  - Local commit: f1a38744694
-- [X] d2453265b96 Address Sphinx warnings, populate Thrust's group pages (#5759) [SCOPE: HEADER]
-  - Ported thrust/ Doxygen group fixes (host_vector.h containers group, partition.h missing `\{`). docs/ part N/A.
-  - HIP counterpart: none (documentation only)
-  - test/ counterpart: none (documentation only)
-  - Not compiled, tests not run (per human)
-  - Local commit: 0c14aa13adc
-- [X] 8a95f4c8051 Fix Thrust header tests and remove unused defines. (#5764) [SCOPE: HEADER,CMAKE]
-  - N/A (kept local): temporary_allocator.inl switches from `THRUST_DEVICE_SYSTEM == CUDA` to `_CCCL_CUDA_COMPILATION()` guards for header-test fixes; local file dispatches on THRUST_DEVICE_SYSTEM with a dedicated HIP branch (hip/detail/terminate.h, `_THRUST_IF_TARGET`), so the guard rewrite does not apply. thrust/cmake/ThrustHeaderTesting.cmake has no local counterpart.
-  - HIP counterpart: none (local HIP branch already present and unchanged)
-  - test/ counterpart: none (header-test CMake only)
-  - Not compiled, tests not run (per human)
-  - Local commit: 31863203b06
-- [X] e6c67785ca6 Drop unused header (#5802) [SCOPE: HEADER]
-  - Ported: deleted unused thrust/system/cpp/detail/vector.inl (not included anywhere locally; only spelling diffs vs upstream)
-  - HIP counterpart: none (cpp system only)
-  - test/ counterpart: none (unused header removal)
-  - Not compiled, tests not run (per human)
-  - Local commit: 53a7fc4578c
-- [X] 5ff11d47308 Use nested namespace specifier in Thrust cpp system (#5801) [SCOPE: HEADER]
-  - Clean port: C++17 nested namespace specifiers (`namespace system::detail::generic {`, etc.) across thrust/system/cpp/, system/detail/generic/, system/detail/sequential/, system/detail/internal/; all 3-way merges clean.
-  - HIP counterpart: none (cpp/generic/sequential systems only; style-only change, system/hip not touched upstream)
-  - test/ counterpart: none (no behavior change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 7d8e82be9ea
-- [X] ee141c6b175 Fix uninitialized read in uninitialized_copy_n (#5811) [SCOPE: HEADER]
-  - Clean port (system/cuda): uninitialized_copy_n only delegates to copy_n when construction AND assignment are trivial.
-  - HIP counterpart: no change: the copy_n fast path in uninitialized_copy_n was ported to system/cuda only (performance-only, item 4b2201184c4); hip uninitialized_copy still always placement-constructs, so the bug does not exist there
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: c91e8ff7919
-- [X] 50929671faf Use DeviceTransform::Fill in uninitialized_fill[_n] when possible (#5813) [SCOPE: HEADER]
-  - Clean port (system/cuda): uninitialized_fill_n delegates to fill_n (DeviceTransform::Fill) for trivially constructible+assignable types.
-  - HIP counterpart: no change: performance-only
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 46a9a9cc4ba
-- [X] e93c9c33537 Port thrust::generate[_n] to cub::DeviceTransform::Fill (#5807) [SCOPE: HEADER,BENCH]
-  - Clean port (system/cuda): generate/generate_n route through cub::DeviceTransform::Fill.
-  - HIP counterpart: no change: performance-only
-  - test/ counterpart: none (no upstream test change)
-  - Benchmark: added primbench `benchmark/bench/generate/basic.cu` (modeled on bench/fill/basic.cu) and registered in benchmark/CMakeLists.txt
-  - Not compiled, tests not run (per human)
-  - Local commit: f500eddf9cc
-- [X] d668cd199be Slim down Thrust CUDA core utils (#5845) [SCOPE: HEADER]
-  - Clean port (system/cuda): core/util.h drops unused cub/thrust includes and the core::detail::BlockLoad helper; reduce_by_key.h and set_operations.h define a local BlockLoad alias and include cub/block/block_load.cuh.
-  - HIP counterpart: no change: CUDA-only compile-time cleanup (HIP backend uses rocPRIM)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 451a6a29843
-- [X] 5222e2921fb Improve Thrust iterator documentation (#5833) [SCOPE: HEADER]
-  - Ported Doxygen improvements; moved `thrust/iterator/detail/iterator_traversal_tags.h` to `thrust/iterator/iterator_traversal_tags.h` (git mv) and updated all includes (pointer.h, iterator_categories.h, iterator_category_to_traversal.h, iterator_facade_category.h, iterator_traits.h).
-  - Conflict (iterator_traits.h x2): local `#ifndef THRUST_DOXYGEN_INVOKED` guards around iterator_traversal_t/iterator_system_t replaced by upstream doc comments (aliases are now documented upstream).
-  - Upstream docs/thrust/api_docs/*.rst changes not ported (rocThrust docs are structured differently).
-  - HIP counterpart: none (docs/header layout only)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 9e6d4a0708c
-- [X] 49b642e53dd Use a custom `iter_swap` kernel in Thrust (#5843) [SCOPE: HEADER]
-  - Ported (system/cuda): iter_swap host path launches a dedicated iter_swap_kernel instead of swap_ranges.
-  - Conflict (1): took upstream body with local `_THRUST_IF_TARGET`/`_THRUST_IS_HOST` spelling (matches get_value.h/assign_value.h).
-  - HIP counterpart: no change: performance-only (compile-time)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 3dd96159c3c
-- [X] 0b700f32b1e Use forward declarations of extended floating point types instead of including the headers (#5846) [SCOPE: HEADER]
-  - N/A: already backported (local commit 2d08c87c83c removed the cuda_fp16/cuda_bf16 includes from system/cuda/detail/sort.h); libcudacxx parts belong to libhipcxx.
-  - HIP counterpart: none
-  - test/ counterpart: none
-  - Not compiled, tests not run (per human)
-  - Local commit: 02b1624af57
-- [X] bf56172e512 Test Thrust iterator system propagation (#5875) [SCOPE: TEST]
-  - Upstream adds Catch2 `testing/catch2_test_iterator_traits.cu` (rocThrust has no Catch2 harness): not added; ported the three iterator-system-propagation cases (any / device / any+device via counting, transform, zip, device_vector iterators) as compile-time checks.
-  - test/ counterpart: `test/test_type_traits.cpp` gains `TEST(TypeTraitsTests, TestIteratorSystemPropagation{AnySystem,DeviceSystem,AnyAndDeviceSystem})` (+ thrust/device_vector.h include).
-  - testing/ counterpart: same three as `void TestIteratorSystemPropagation*()` + DECLARE_UNITTEST in `testing/type_traits.cu`.
-  - HIP counterpart: none (test-only)
-  - Not compiled, tests not run (per human)
-  - Local commit: ddb5a95186d
-- [X] abcb70514b7 Refactor thrust::iterator_facade_category (#5877) [SCOPE: HEADER]
-  - Ported refactor: dropped unused ValueParam/Reference parameters from iterator_facade_default_category*; `iterator_facade_category<...>::type` replaced by `iterator_facade_category_t<System, Traversal>` (sole user iterator_facade.h updated).
-  - Conflicts (4): took upstream structure, kept local `::internal::If` in place of `::cuda::std::_If` (not available via _THRUST_STD fallback).
-  - cub/ iterator parts: not applicable (rocThrust uses hipCUB/rocPRIM).
-  - HIP counterpart: none (generic iterator header)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: af24d6d1659
-- [X] a94f5f38596 Add tests for host system propagation (#5881) [SCOPE: TEST]
-  - Upstream extends Catch2 catch2_test_iterator_traits.cu (not present locally; see bf56172e512): ported the host-system propagation case (host_vector, transform, zip iterators -> host_system_tag).
-  - test/ counterpart: `TEST(TypeTraitsTests, TestIteratorSystemPropagationHostSystem)` in `test/test_type_traits.cpp` (+ thrust/host_vector.h include).
-  - testing/ counterpart: `TestIteratorSystemPropagationHostSystem` + DECLARE_UNITTEST in `testing/type_traits.cu` (+ thrust/host_vector.h include).
-  - HIP counterpart: none (test-only)
-  - Not compiled, tests not run (per human)
-  - Local commit: 34f5f9cd0b3
-- [X] af6a7158195 Drop obsolete is_discard_iterator (#5884) [SCOPE: HEADER]
-  - `git rm thrust/detail/type_traits/iterator/is_discard_iterator.h` (unused locally, verified by grep across thrust/, test/, testing/, benchmark/).
-  - HIP counterpart: none (no system/hip user)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: d85cfa3e55d
-- [X] a0c7db9916c Fix `iterator_category_to_system` for device iterator tags (#5880) [SCOPE: HEADER,TEST]
-  - Clean port (correctness fix, generic header): iterator_category_to_system.h gains forward/bidirectional/random_access host+device cat_to_system_impl overloads and `iterator_category_to_system_t`; iterator_category_to_traversal.h gains `iterator_category_to_traversal_t`.
-  - HIP counterpart: none needed (generic iterator header shared by all backends; fix applies to HIP automatically)
-  - test/ counterpart: Catch2 cases ported as `TEST(TypeTraitsTests, TestIteratorCategoryToSystem)` / `TestIteratorCategoryToTraversal` in `test/test_type_traits.cpp`.
-  - testing/ counterpart: same two tests + DECLARE_UNITTEST in `testing/type_traits.cu`.
-  - Not compiled, tests not run (per human)
-  - Local commit: 10668f20f46
-- [X] 025ed18d66e Remove unused include of grid/grid_queue (#5887) [SCOPE: HEADER]
-  - Clean port (system/cuda): reduce.h now includes cub/grid/grid_queue.cuh directly (upstream dropped the transitive include from CUB dispatch headers; cub/ parts not applicable).
-  - HIP counterpart: none (system/hip reduce uses rocPRIM, no GridQueue)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 13e6c4a19a4
-- [X] d91b32f1bf6 Add missing stream synchronization in thrust::cuda_cub::generate (#5889) [SCOPE: HEADER]
-  - Clean port (system/cuda): generate_n adds `synchronize_optional` after the cub::DeviceTransform::Fill path (from e93c9c33537).
-  - HIP counterpart: no change needed: system/hip generate_n goes through hip_rocprim::for_each_n -> parallel_for, which already calls synchronize_optional (parallel_for.h:157).
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: aea15d9a004
-- [X] 4d1fc6ae38d Clarify missing Reference and ValueType (#5888) [SCOPE: HEADER]
-  - Clean port: comment-only clarification in iterator_facade_category.h.
-  - HIP counterpart: none (comment only)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: a023d858630
-- [X] f4867bd8982 Make thrust::fill[_n] use cub::DeviceTransform (#5805) [SCOPE: HEADER]
-  - Ported (system/cuda): fill_n now dispatches cub::detail::transform (DeviceTransform::Fill-style, `__return_constant`) instead of parallel_for; conflict (1, closing of removed `__fill` namespace) resolved to upstream. Result identical to upstream except local `_THRUST_STD::distance`.
-  - cub/test/warp part: not applicable.
-  - HIP counterpart: no change: performance-only
-  - test/ counterpart: none (no upstream thrust test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 09034620cf3
-- [X] da893945e45 Modernize Thrust examples (#5670) [SCOPE: EXAMPLE]
-  - Ported example modernizations (initializer lists, range-for, host_vector staging, .size()) to 33 `examples/*.cu` files.
-  - Deviations from upstream:
-    - Kept explicit `#include "include/host_device.h"` in every example, and kept the local `examples/include/host_device.h` and `examples/CMakeLists.txt` unchanged. Upstream instead force-includes host_device.h through the CMake `thrust_add_example`, which rocThrust's example CMake does not have.
-    - Kept the local `!_THRUST_HAS_DEVICE_SYSTEM_STD` `<iterator>` fallbacks in repeated_range/strided_range/tiled_range.
-    - Spelling: `cuda::std::` -> `_THRUST_STD::` and `cuda::maximum` -> `_THRUST_LIBCXX::maximum`; `<cuda/functional>` -> `_THRUST_LIBCXX_INCLUDE(functional)`.
-    - Kept `<cmath>` in max_abs_diff.cu (needed for fabsf on HIP).
-  - HIP counterpart: none (examples only)
-  - test/ counterpart: none (no upstream test change)
-  - Not compiled, tests not run (per human)
-  - Local commit: 55dceb1d0fb
-- [X] ca57b79824c Inherit `thrust::transform_iterator` traversal from base iterator traversal (#5883) [SCOPE: HEADER,TEST]
-  - Clean port (correctness fix, generic header): transform_iterator.h passes `use_default` for traversal so it is deduced from the base iterator instead of the raw std iterator_category (restores random-access traversal propagation).
-  - HIP counterpart: none needed (generic iterator header; applies to HIP automatically)
-  - test/ counterpart: the four `TestIteratorSystemPropagation*` GTests in `test/test_type_traits.cpp` are replaced by `TestIteratorSystemAndTraversalPropagation{AnySystem,Vectors,VectorsAndAnySystem}`. These mirror upstream's TEMPLATE_LIST cartesian products: thrust:: and `_THRUST_LIBCXX::` make_*_iterator wrappers, crossed with device_vector, host_vector and std::vector. The tests check both the system and random-access traversal. The libcxx combinations sit under `_THRUST_HAS_DEVICE_SYSTEM_STD`. Added the thrust/functional.h, <vector> and libcxx iterator includes.
-  - testing/ counterpart: the same replacement in `testing/type_traits.cu`, using DECLARE_UNITTEST.
-  - Not compiled, tests not run (per human)
-  - Local commit: 91471d5c62d
-- [X] 4eb027ce476 Drop `thrust::counting_iterator` in favor of `cuda::counting_iterator` (#5839) [SCOPE: HEADER,TEST,EXAMPLE,CMAKE]
-  - N/A: reverted upstream by 07e250154a8 (#5925); the pair nets to zero in thrust/ (verified `git diff 4eb027ce476^ 07e250154a8 -- thrust/` is empty). No local change.
-  - HIP counterpart: none
-  - test/ counterpart: none
-  - Not compiled, tests not run (per human)
-  - Local commit: 1b2d7a69d64
-- [X] 07e250154a8 Revert "Drop `thrust::counting_iterator` in favor of `cuda::counting_iterator` (#5839)" (#5925) [SCOPE: HEADER,TEST,EXAMPLE,CMAKE]
-  - N/A: revert of 4eb027ce476 (#5839), which was not applied locally; the pair nets to zero in thrust/.
-  - HIP counterpart: none
-  - test/ counterpart: none
-  - Not compiled, tests not run (per human)
-  - Local commit: 8f51763a320
-- [X] bb718514624 Drop Thrust mpl math (#5897) [SCOPE: HEADER,TEST]
-  - `git rm thrust/detail/mpl/math.h`.
-  - xor_combine_engine_max.h was rewritten to constexpr functions, using `_THRUST_STD` spelling. Its conflict came from the local include block; I used a single `_THRUST_STD_INCLUDE(algorithm)` in place of the `__algorithm/max.h`/`min.h` detail headers, which the `::std` fallback does not have.
-  - system/cuda reduce_by_key/set_operations: mpl::min/max replaced by `::cuda::std::min/max` (conflict 1, took upstream). Dropped the unused mpl/math.h includes from scan_by_key/unique_by_key.
-  - HIP counterpart: removed the unused `#include <thrust/detail/mpl/math.h>` from system/hip/detail/{scan_by_key,set_operations,unique_by_key}.h. No mpl::math uses remained.
-  - test/ counterpart: git mv `test/test_metaprogramming.cpp` -> `test/test_xor_combine_engine_max.cpp`. It now has `TEST(XorCombineEngineMaxTests, TestLog2)` as static_asserts on `thrust::random::detail::log2`. The CMake registration "metaprogramming" was replaced by "xor_combine_engine_max".
-  - testing/ counterpart: `git rm testing/metaprogramming.cu` and added upstream `testing/xor_combine_engine_max.cu`. Updated testing/CMakeLists.txt to match.
-  - Not compiled, tests not run (per human)
-  - Local commit: aad74167a62
-- [X] e2dda739257 Modernize iterator machinery (#5928) [SCOPE: HEADER,TEST]
-    - N/A: thrust side already uses `_THRUST_STD::__has_input_traversal` / `__has_random_access_traversal` (vector_base.h/.inl, 11 testing/*_iterator.cu static_asserts); upstream renamed these to `__is_cpp17_*` here, then renamed back to `__has_*_traversal` in e20f6a68c8a before v3.2.1, so the local spelling matches v3.2.1. All conflicts resolved to ours; no diff. libcudacxx parts belong to libhipcxx.
-    - HIP counterpart: none.
-    - test/ counterpart: none (GTest has no equivalent static_asserts).
-    - Not compiled, tests not run (per human).
-  - Local commit: 49907612445
-- [X] feb641f2a59 Fix iterator adaptor sample (#5957) [SCOPE: HEADER]
-    - Doc-only: iterator_adaptor.h sample drops `const` from the `begin` member so the sample iterator is assignable.
-    - HIP counterpart: none (doc comment only).
-    - test/ counterpart: none; testing/ counterpart: none.
-    - Not compiled, tests not run (per human).
-  - Local commit: 7efc1a73f8f
-- [X] 5197e4b8a58 Refactor and condense thrust::copy implementation (#5491) [SCOPE: HEADER]
-    - cuda `copy.h` merged cleanly (now identical to upstream): cross-system and device-to-device copy folded in; device-to-device routes through `cuda_cub::transform` with `::cuda::std::identity`. `git rm` cuda `internal/copy_cross_system.h` and `internal/copy_device_to_device.h` (only included by cuda copy.h).
-    - HIP counterpart: no change: performance-only refactor; `system/hip/detail/copy.h` keeps its `internal/copy_{cross_system,device_to_device}.h` (per compatibility-over-performance decision).
-    - test/ counterpart: none; testing/ counterpart: none (no upstream test changes).
-    - Not compiled, tests not run (per human).
-  - Local commit: d7763108212
-- [X] 1ceac3731d5 Improve `thrust::cuda_cub::replace` functor handling (#5949) [SCOPE: HEADER]
-    - Generic `detail/internal_functional.h`: added `new_value_if_f` (`_CCCL_DEVICE_API` spelled `THRUST_DEVICE`) and `proclaims_copyable_arguments` specializations for `predicate_to_integral`, `tuple_binary_predicate`, `new_value_if_f`; specializations placed in `_THRUST_LIBCXX_NAMESPACE_BEGIN/END` or `namespace internal` (fallback), matching `zip_function.h`; address_stability pulled in via `thrust/detail/libcxx_wrapper/__functional/address_stability.h` instead of the cuda include.
-    - cuda `replace.h` merged cleanly: uses `thrust::detail::new_value_if_f` with `cuda_cub::transform`, dropping its local functor.
-    - HIP counterpart: no change: performance-only (copyable-argument proclamation only feeds CUDA DeviceTransform); `system/hip/detail/replace.h` keeps `__replace::new_value_if_f`. cub `device_transform.cuh` change belongs to hipCUB.
-    - test/ counterpart: none; testing/ counterpart: none (no upstream test changes).
-    - Not compiled, tests not run (per human).
-  - Local commit: 3d25701be6a
-- [X] 2f39a342b93 Refactor Thrust execution policies (#5821) [SCOPE: HEADER,TEST]
-    - Generic: cpp/omp/tbb `tag`/`execution_policy` moved out of `system::X::detail` into `system::X`, and `par_t`/`par` folded into each `detail/execution_policy.h`; `git rm` `system/{cpp,omp,tbb}/detail/par.h`. Upstream SPDX header taken where the file had no AMD modification line; AMD-modified license headers kept (`seq.h`, `execution_policy.h`, `sequential/execution_policy.h`). `_CCCL_*` spelled `THRUST_*`.
-    - `system/detail/sequential/execution_policy.h`: kept the local converting constructor on `sequential::tag` (needed for minimum_system), took upstream's `operator tag()` and TODO comment.
-    - `thrust/execution_policy.h`: Doxygen-only `#if THRUST_DOXYGEN_INVOKED` blocks replaced by upstream doc comments; `host` is now `inline constexpr`; device docs keep "CUDA or HIP" wording; kept `#include <thrust/detail/execute_with_allocator.h>` (upstream dropped it) so `thrust::device(alloc)` keeps working for users including only this header.
-    - cuda: `par.h`/`par_to_seq.h` folded into `cuda/detail/execution_policy.h` (`git rm` both; local leftover `<cuda/stream_ref>` include dropped with par.h); algorithm headers include `execution_policy.h` instead of `par_to_seq.h`; `util.h` forward-declares `execution_policy`.
-    - HIP counterpart: no change: `system/hip/detail/par.h` and `par_to_seq.h` kept as-is (pure restructuring, no behavior fix; `hip/execution_policy.h` still includes `hip/detail/par.h`, `thrust::system::hip::detail::par_t` still exists for `device_t`).
-    - testing/ counterpart: `allocator_aware_policies.cu` includes `{cpp,omp,tbb}/detail/execution_policy.h` (kept `hip/detail/par.h`, no cuda block); `gather.cu` gains gcc>=11 `THRUST_DISABLE_BROKEN_GCC_VECTORIZER` on `TestGatherCountingIterator`; `transform_input_output_iterator.cu` workaround widened to gcc>=12 (spelled `THRUST_COMPILER`).
-    - test/ counterpart: `test_allocator_aware_policies.cpp` same include/policy_info updates (`thrust::system::X::execution_policy`); `test_gather.cpp` adds the gcc>=11 vectorizer workaround on `TestGatherCountingIterator`; `test_transform_input_output_iterator.cpp` widened to gcc>=12.
-    - Not compiled, tests not run (per human).
-  - Local commit: 9b393ddebdc
-- [X] dcc24cd082b Try to use _CCCL_API in Thrust and CUB (#5953) [SCOPE: HEADER]
-    - cuda `config.h`: `THRUST_{DEVICE,HOST}_FUNCTION`/`THRUST_FUNCTION` now built on `_CCCL_{DEVICE,HOST}_API`/`_CCCL_API` (merged cleanly). cub `detect_cuda_runtime.cuh` belongs to hipCUB.
-    - HIP counterpart: none (`system/hip/config.h` defines these on HIP attributes; `_CCCL_*_API` visibility macros are CUDA/libcu++-specific).
-    - test/ counterpart: none; testing/ counterpart: none.
-    - Not compiled, tests not run (per human).
-  - Local commit: a0f51ec0236
-- [X] 9e73f14e8f1 Improve interoperability of `cuda` iterators with thrust and std (#5929) [SCOPE: HEADER]
-    - Partially backported: `transform_output_iterator<Fn, Iter>` / `transform_iterator<Fn, Iter>` specializations were already in the libcu++ 3.2 order; this ports the remaining `transform_input_output_iterator<InputFn, OutputFn, Iter>` reorder in `iterator_traits.h` (spelled `_THRUST_LIBCXX::`), matching libhipcxx >= 3.2. libcudacxx iterator changes belong to libhipcxx.
-    - HIP counterpart: none (generic header).
-    - test/ counterpart: none; testing/ counterpart: none (upstream only added libcudacxx tests).
-    - Not compiled, tests not run (per human).
-  - Local commit: e1ea5da54e2
-- [X] 03552de3825 Drop thrust detail seq policy global (#5964) [SCOPE: HEADER]
-    - Dropped the `thrust::system::detail::sequential::seq` global; tbb `for_each.inl` now uses `thrust::seq` (includes `thrust/detail/seq.h`). Merged cleanly; no other local users of `sequential::seq` (checked `system/hip`, tests, benchmarks).
-    - HIP counterpart: none (HIP backend never referenced the sequential global).
-    - test/ counterpart: none; testing/ counterpart: none.
-    - Not compiled, tests not run (per human).
-  - Local commit: 1d2185ddd56
-- [X] 8979072c17a Deprecate and replace THUST_[HOST|DEVICE]_FUNCTION (#5972) [SCOPE: HEADER,BENCH]
-    - cuda: `THRUST_{DEVICE,HOST}_FUNCTION`/`THRUST_FUNCTION` marked deprecated in `cuda/config.h`; all cuda backend uses replaced by `_CCCL_{DEVICE,HOST}_API _CCCL_FORCEINLINE`. Conflicts in `reduce.h`/`reduce_by_key.h` took upstream signatures, keeping local `_THRUST_STD::true_type`/`false_type` spelling.
-    - HIP counterpart: none (macros are only defined/used under `system/cuda`; HIP backend uses `THRUST_HOST_DEVICE`/`THRUST_DEVICE`).
-    - Benchmark counterpart: `benchmark/bench/generate/basic.cu` already uses `THRUST_DEVICE` (no `THRUST_DEVICE_FUNCTION`); conflict resolved to ours, no change.
-    - test/ counterpart: none; testing/ counterpart: none.
-    - Not compiled, tests not run (per human).
-  - Local commit: cf4cf22097b
-- [X] 9fbba017026 Fix dereferencing nullptr in `thrust::device_reference` (#4226) [SCOPE: HEADER,TEST]
-    - N/A: already backported on the base branch (`reference.h`, `seq.h`, `minimum_system.h`, `select_system.h`, `sequential/execution_policy.h` merged with no change).
-    - HIP counterpart: none (generic headers).
-    - testing/ counterpart: already present as `testing/minimum_system.cu` (`MinimumSystem`); upstream Catch2 file not added.
-    - test/ counterpart: already present as `test/test_minimum_system.cpp` (`MinimumSystemTests.MinimumSystem`).
-    - Not compiled, tests not run (per human).
-  - Local commit: 789aeb4361a
-- [X] 36ec00be03f Ensure non-trivial thrust::copy from D2D uses UBLKCP (#5954) [SCOPE: HEADER]
-    - cuda `copy.h`: non-trivial device-to-device copy wraps `::cuda::std::identity` in `::cuda::proclaim_copyable_arguments` so DeviceTransform can use UBLKCP (merged cleanly). cub `kernels/transform.cuh` belongs to hipCUB.
-    - HIP counterpart: no change: performance-only.
-    - test/ counterpart: none; testing/ counterpart: none.
-    - Not compiled, tests not run (per human).
-  - Local commit: 52d443083d8
-- [X] fe943f23ced Ensure thrust::scatter_if uses UBLKCP (#5952) [SCOPE: HEADER]
-    - cuda `scatter.h`: `scatter`/`scatter_if` wrap `::cuda::std::identity` in `::cuda::proclaim_copyable_arguments` (UBLKCP, performance) and the predicate-less `scatter_if` overload drops its non-deducible `class Predicate` template parameter (merged cleanly).
-    - HIP counterpart: ported the overload fix only: `system/hip/detail/scatter.h` predicate-less `scatter_if` drops the non-deducible `class Predicate` parameter, so the overload is actually viable instead of falling back to the generic path. `proclaim_copyable_arguments` wrapping: no change: performance-only.
-    - test/ counterpart: none; testing/ counterpart: none (existing scatter_if tests cover the overload).
-    - Not compiled, tests not run (per human).
-  - Local commit: 61193836ea2
-- [X] e20f6a68c8a Rename the trait checks to `__has_meow_traversal` (#5968) [SCOPE: HEADER,TEST]
-    - N/A: rename back to `__has_*_traversal` matches what rocThrust already uses (see e2dda739257); all thrust-side files merged with no change. libcudacxx parts belong to libhipcxx.
-    - HIP counterpart: none.
-    - test/ counterpart: none; testing/ counterpart: none (already spelled `__has_*_traversal`).
-    - Not compiled, tests not run (per human).
-  - Local commit: 7eb4bed0ab4
-- [X] 168e81561d4 Try to clean up align utilities (#5950) [SCOPE: HEADER,TEST]
-  Deleted thrust/detail/util/align.h (align_up/align_down/is_aligned); its only user testing/cuda/cudart.cu now uses ::cuda::std::is_sufficiently_aligned<alignof(T)> with <cuda/std/memory> (CUDA-only test, kept raw cuda spelling; AMD license header kept). cuda reduce.h ReduceAgent::is_aligned now uses ::cuda::std::is_sufficiently_aligned<alignof(Vector)>. HIP: no change (system/hip reduce does not use align.h; cleanup only). test/: no counterpart (no test uses align.h). testing/: cuda/cudart.cu updated. Rest of upstream commit is libcudacxx/cub/c only. Not compiled, tests not run (per human)
-  - Local commit: 8bcfade550e
-- [X] ef51c79d683 Replace `_LIBCUDACXX_DEPRECATED` with `CCCL_DEPRECATED` (#6024) [SCOPE: HEADER]
-  Thrust side of upstream is clang-format-only reflow after the _LIBCUDACXX_DEPRECATED→CCCL_DEPRECATED rename (rest is libcudacxx/cub). advance.h, functional.h, iterator/iterator_traits.h: kept ours (local already uses CCCL_/THRUST_DEPRECATED_BECAUSE with hip/_THRUST_STD wording). distance.h: took upstream placement of [[nodiscard]] before CCCL_DEPRECATED_BECAUSE. HIP: no change (no system/hip usage). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: c1b26f255a3
-- [X] ff8a0d96b7f Unwrap cuda::zip_iterator/zip_function in thrust::transform (#6039) [SCOPE: HEADER,TEST]
-  cuda transform.h: new cub_transform_many overload unwraps ::cuda::zip_iterator/::cuda::zip_function (via __iterators()/__fun()) for cub::DeviceTransform, plus includes of cuda/__iterator/zip_{function,iterator}.h. HIP: no change: performance-only (DeviceTransform unwrapping; system/hip transform unaffected). testing/: cuda/transform.cu merged (CUDA-only test: renamed TestTransformThrustZipIteratorUnwrapping, added zip_function<sum_five> specialization and TestTransformCudaZipIteratorUnwrapping, include via _THRUST_LIBCXX_INCLUDE(iterator)). test/: no counterpart (test is CUDA-backend specific). Not compiled, tests not run (per human)
-  - Local commit: 199324aace2
-- [X] d9ebd3eb183 Add more tests for `thrust::reduce_by_key` (#6063) [SCOPE: TEST]
-  Test-only upstream commit. testing/: cuda/reduce_by_key.cu merged (AMD license header kept; adds check_valid_item_op/check_accumulator_t_op, TestReduceByKeyWithCustomEqualityOp, TestReduceByKeyWithDifferentAccumulatorT; kept the thrust/iterator/counting_iterator.h include upstream dropped since thrust::counting_iterator is still used). test/: ported both tests to test/test_reduce_by_key.cpp as TEST(ReduceByKeyTests, ...) using thrust::make_counting_iterator/make_constant_iterator, thrust::equal_to<> and std:: types. HIP: no change (test-only). Not compiled, tests not run (per human)
-  - Local commit: e51faba04d1
-- [X] ad70011e990 Support fancy iterators in vectorized transform and port thrust::tabulate to it (#6012) [SCOPE: HEADER,BENCH]
-  cuda tabulate.h: took upstream (drop __tabulate::functor/parallel_for; implement via cuda_cub::transform_n over ::cuda::counting_iterator with ::cuda::proclaim_copyable_arguments(tabulate_op)); fancy-iterator support itself is in cub DeviceTransform. HIP: no change: performance-only (system/hip tabulate keeps its parallel_for path). benchmark/: bench/tabulate/basic.cu adapted to primbench: added sequence_benchmark (subalgo "sequence"), seg_size_t static_cast, output vectors use thrust::no_init, types widened to int8/16/32/64 (upstream integral_types); kept subalgo "basic" for the seg_size benchmark (upstream renamed it seg_size). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 291f437712f
-- [X] 578ff26c307 Refactor `thrust::[try_]unwrap_contiguous_iterator[_t]` (#6065) [SCOPE: HEADER]
-  type_traits/unwrap_contiguous_iterator.h: took upstream (drop detail::contiguous_iterator_traits and detail::try_unwrap_contiguous_iterator_impl; unwrap_contiguous_iterator uses deduced return type, *_t aliases are decltype of the functions, try_unwrap uses if constexpr; THRUST_EXEC_CHECK_DISABLE on both). Local file had a partially-applied state where the trailing return referenced the alias before its declaration; now consistent. No local users of the removed detail helpers. HIP: no change (generic header). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: ebaf03faf22
-- [X] 57b16c2fc64 [CUB] Replace several direct uses of `__clz` (#6099) [SCOPE: HEADER]
-  N/A: thrust/detail/integer_math.h already matches upstream (clz replacement via countl_zero was already backported); rest of upstream commit is cub. HIP: no change. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: a57a8a48a28
-- [X] fa13b90c53b Implement `cuda::zip_transform_iterator` (#5982) [SCOPE: HEADER,TEST,BENCH]
-  iterator/iterator_traits.h: added iterator_system/iterator_traversal specializations for _THRUST_LIBCXX::zip_transform_iterator (libhipcxx >= 3.2 provides it). cuda copy.h: device_to_device unwraps ::cuda::zip_transform_iterator into __transform::cub_transform_many (forward-declared; includes cub tuning_transform, cuda/__fwd/zip_iterator.h). HIP counterpart (system/hip): no change: performance-only (HIP copy handles zip_transform_iterator via the generic transform path thanks to the iterator_traits specializations). testing/: cuda_iterators.cu gained TestCUDAZipTransformIterator (upstream catch2_test_cuda_iterators.cu has no local copy). test/: test_libcxx_iterators.cpp gained TestLibcxxZipTransformIterator. benchmark/: kept local transform/basic.cu (primbench; already contains both fib and babelstream, so upstream's split into babelstream.cu/fib.cu not mirrored); added primbench transform/zip_transform.cu (subalgo zip_transform.nstream) and registered it in benchmark/CMakeLists.txt. Not compiled, tests not run (per human)
-  - Local commit: f7d7e8ea011
-- [X] a1683b97d87 Remove fully qualified ::cuda::std:: from examples (#6130) [SCOPE: EXAMPLE]
-  examples/: upstream replaces ::cuda::std:: with cuda::std:: and reflows. Local generic examples already use _THRUST_STD:: (constant_iterator.cu, monte_carlo.cu, monte_carlo_disjoint_sequences.cu kept ours; merged reflow would have reintroduced raw cuda::std::plus); other touched examples unchanged by merge. examples/cuda/range_view.cu (CUDA-only example): took upstream removal of the unneeded "../include/host_device.h" include. HIP: no change (examples only). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 6ae37b28d8e
-- [X] ab99d87e866 Move nvhpc header wrappers to libcudacxx. (#6167) [SCOPE: HEADER,TEST]
-  N/A (kept ours): upstream deletes thrust/detail/{algorithm,memory,numeric}_wrapper.h and includes the libcudacxx copies <cuda/std/__cccl/*_wrapper.h> instead (nvhpc include-cycle guard moved). Locally that would map to _THRUST_STD_INCLUDE(__cccl/memory_wrapper.h), which expands to <__cccl/memory_wrapper.h> in builds without libhipcxx and breaks them; for compatibility kept the thrust-local wrapper headers and all existing includes (allocate_unique.h, allocator/*, internal_functional.h, memory_algorithms.h, temporary_array.h, host_vector.h, mr/pool.h, mr/disjoint_pool.h unchanged). testing/cmake/check_source_files.cmake has no local copy. HIP: no change. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 28719cf7f00
-- [X] 700f2a867a7 Refactor Thrust `destroy_range` and `device_[new|delete|free]` (#6134) [SCOPE: HEADER]
-  Took upstream refactor: destroy_range.inl, device_delete.inl, device_free.inl, device_new.inl folded into their headers (git rm of the .inl files); destroy_range now uses if constexpr over has_effectful_member_destroy (variable template, std::allocator specialization false) instead of enable_if cases. Local spellings kept (THRUST_HOST_DEVICE, THRUST_EXEC_CHECK_DISABLE, _THRUST_STD::is_trivially_destructible_v); destroy_range.h keeps <thrust/detail/memory_wrapper.h> (see ab99d87e866) and the !_THRUST_HAS_DEVICE_SYSTEM_STD <type_traits> fallback. HIP: no change (generic headers). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 325a086b899
-- [X] fbb9479172c Refactor Thrust allocator internals (#6136) [SCOPE: HEADER]
-  Took upstream allocator-internals refactor: allocator_traits, copy_construct_range, fill_construct_range, malloc_allocator, tagged_allocator, temporary_allocator and value_initialize_range .inl files folded into their .h (git rm of the .inl files), enable_if dispatch replaced by if constexpr / variable templates. Local adaptations kept: <thrust/detail/memory_wrapper.h> instead of <cuda/std/__cccl/memory_wrapper.h> (see ab99d87e866), !_THRUST_HAS_DEVICE_SYSTEM_STD <type_traits> fallbacks, _THRUST_STD_INCLUDE(limits); temporary_allocator.h restores the HIP device path (THRUST_DEVICE_SYSTEM_HIP -> _THRUST_IF_TARGET + thrust::system::hip::detail::terminate_with_message, plus hip/detail/terminate.h include) and the AMD Modifications Copyright line from the deleted .inl. HIP: no change (generic headers; HIP terminate path preserved). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 2a537d64af3
-- [X] dbd58724133 Bypass allocator in `thrust::device_delete` (#6198) [SCOPE: HEADER,TEST]
-  Correctness fix, generic headers: device_delete now runs destructors on the device via thrust::for_each_n(device, ptr, n, detail::gozer{}) instead of destroy_range with an empty allocator; device_new(p, n) value-initializes in place on the device via device_allocator + detail::value_initialize_range (no host-constructed exemplar copy), and device_new(p, exemplar, n) passes the device policy to uninitialized_fill. Applies to HIP via the generic headers. testing/: device_delete.cu re-enabled TestDeviceDeleteDestructorInvocation (no KNOWN_FAILURE/QNX guard), Foo is device-only and non-copyable (THRUST_DEVICE spelling). test/: test_device_delete.cpp updated the same way (enabled test, same Foo). HIP: covered via generic headers, no system/hip change. Not compiled, tests not run (per human)
-  - Local commit: 06a541c41ff
-- [X] 01cd9b491ed Support polymorphic types in thrust::device_delete (#6140) [SCOPE: TEST]
-  Test-only. testing/: device_delete.cu merged (Foo member renamed to destroyed; new base/derived polymorphic types and TestDeviceDeleteVirtualDestructorInvocation; _CCCL_HOST_DEVICE -> THRUST_HOST_DEVICE). test/: test_device_delete.cpp mirrored (TEST(DeviceDelete, TestDeviceDeleteVirtualDestructorInvocation) plus the Foo update). HIP: no change (test-only; relies on generic device_delete from dbd58724133). Not compiled, tests not run (per human)
-  - Local commit: 973de3f4425
-- [X] 1c3c7ddee12 Refactor iterator usage in thrust/cuda find() (#6019) [SCOPE: HEADER,TEST]
-  HIP: system/hip/detail/mismatch.h transform_pair_of_input_iterators_t got the iterator correctness fixes (defaulted default ctor, prefix operator++ returns self_t&, operator<); the find() zip/transform/counting_iterator rewrite is performance-only, so HIP find.h is unchanged. test/: no counterpart (no test change upstream beyond CUDA-only file). testing/: cuda/mismatch.cu unused-parameter cleanup taken. Not compiled, tests not run (per human)
-  - Local commit: 5b9b72ee172
-- [X] 73d8738e860 Try different formulation for thrust::ccosh (#6200) [SCOPE: HEADER]
-  HIP: generic complex header, applies to HIP automatically (taken as upstream). test/: no counterpart (no upstream test change). testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 47bf963b955
-- [X] c859e948453 Improve `invoke` machinery (#6227) [SCOPE: HEADER]
-  HIP: generic thrust/detail/type_traits.h; libhipcxx branch now uses _THRUST_STD::invoke_result instead of the internal __invoke_of (non-libhipcxx rocprim/std fallbacks unchanged), applies to HIP automatically. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 33e87b68197
-- [X] bfb875c8f73 Drop all uses of `thrust::tabulate_output_iterator` in favor of `cuda::tabulate_output_iterator` (#6001) [SCOPE: HEADER,TEST,CMAKE]
-  HIP: generic iterator header; thrust::tabulate_output_iterator / make_tabulate_output_iterator now CCCL_DEPRECATED_BECAUSE (THRUST_HOST_DEVICE spelling kept), no internal rocThrust users remain, applies to HIP automatically. test/: test_tabulate_output_iterator.cpp defines CCCL_IGNORE_DEPRECATED_API. testing/: tabulate_output_iterator.cu defines CCCL_IGNORE_DEPRECATED_API (AMD license header kept). CMake: ThrustHeaderTesting.cmake has no rocThrust counterpart (no header-test targets), skipped. Not compiled, tests not run (per human)
-  - Local commit: 8742e2e52dc
-- [X] 13886f72f16 Add host standard library detection (#6244) [SCOPE: HEADER]
-  N/A: upstream switches is_contiguous_iterator.h to _CCCL_HOST_STD_LIB(LIBCXX/LIBSTDCXX/STL); rocThrust has no THRUST-spelled equivalent and the macro is unavailable without libhipcxx, so the existing defined(_LIBCPP_VERSION)/defined(__GLIBCXX__)/defined(_MSC_VER) checks (behaviourally equivalent) are kept. HIP: no change, generic header. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: f36d487a3e8
-- [X] c99060c19e9 Deprecate `<cuda/stream_ref>` header (#6266) [SCOPE: TEST]
-  HIP: no counterpart (CUDA-only test include change, <cuda/stream_ref> -> <cuda/stream>, raw spelling kept as in the CUDA-only test). test/: no counterpart (no stream_ref usage in gtest tests). testing/: cuda/stream_wrapper.cu updated. Not compiled, tests not run (per human)
-  - Local commit: d323feb3b7f
-- [X] 344641b3b3c Limit deprecation exclusions to targeted headers. (#6275) [SCOPE: CMAKE]
-  N/A: only touches thrust/cmake/ThrustHeaderTesting.cmake, which has no rocThrust counterpart (rocThrust has no per-header test targets). HIP: no change. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: e36b7111d56
-- [X] 5303f65de2d Dropped duplicated math function from Thrust (#6188) [SCOPE: HEADER]
-  Partial: upstream deletes thrust/detail/integer_math.h and switches execute_with_allocator.h / mr/{pool,disjoint_pool,pool_options}.h to ::cuda::ceil_div / ceil_ilog2 / is_power_of_two. Kept integer_math.h and the thrust::detail helpers in generic headers for compatibility (those ::cuda:: cmath utilities are unavailable without libhipcxx; behaviour is identical). system/cuda: dropped the now-redundant integer_math.h include from scan.h/sort.h (is_negative still reaches scan.h via dispatch.h); cuda dispatch.h keeps including integer_math.h instead of defining its own is_negative, which would collide with integer_math.h's overloads. HIP counterpart (system/hip): no change (hip dispatch.h still uses thrust::detail::is_negative from integer_math.h). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 65b0b4d28af
-- [X] 1238f287f4f add parallel scan support for TBB and OMP (#6178) [SCOPE: HEADER]
-  HIP: host OMP/TBB backends are shared by HIP builds, applies automatically. New omp/detail/scan.inl adapted for builds without libhipcxx: umbrella _THRUST_STD_INCLUDE(algorithm/iterator/numeric) instead of libcu++ internal __numeric/* headers, ::internal::accumulator_t (libcxx_wrapper invoke.h, as in sequential/scan.h) instead of _THRUST_STD::__accumulator_t, and an inline integer ceil-div instead of _THRUST_LIBCXX::ceil_div; SPDX NVIDIA + AMD Modifications header. Upstream's later omp scan bugfix (26c79caf60e) follows in order. test/: no counterpart (no upstream test change). testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 2243c7505ba
-- [X] 75f88e5a5db Ignore OOM failures for large size unique thrust test. (#6304) [SCOPE: TEST]
-  HIP: no counterpart (test-only change). test/: no counterpart (test_unique.cpp has no large-magnitude unique test). testing/: cuda/unique.cu TestUniqueWithLargeNumberOfItems now skips on std::bad_alloc. Not compiled, tests not run (per human)
-  - Local commit: b17ac75d7af
-- [X] 638c03d54f7 Replace __popc with cude::std::popcounter (#6213) [SCOPE: HEADER]
-  HIP counterpart (system/hip): no change; hip/detail/set_operations.h keeps the HIP __popc intrinsic (valid on all HIP targets; switching to _THRUST_STD::popcount would require libhipcxx and gives no correctness benefit). system/cuda: __popc -> ::cuda::std::popcount. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 134adcc71b4
-- [X] f1b4a17019b Always include `<new>` when we need operator new for clang-cuda (#6310) [SCOPE: HEADER]
-  HIP counterpart (system/hip): no change needed in hip/detail/uninitialized_{copy,fill}.h (no clang-cuda assignment workaround there; hip-clang already supports device placement new). Generic internal_functional.h / generic uninitialized_copy.inl include _THRUST_STD_INCLUDE(__new/device_new.h) only under _THRUST_HAS_DEVICE_SYSTEM_STD (libcu++-internal header; non-libhipcxx builds keep <thrust/detail/memory_wrapper.h> / <type_traits>). system/cuda: device_new.h includes added and the _CCCL_CUDA_COMPILER(CLANG) assignment fallbacks removed. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 083584467f0
-- [X] 325b8851fe8 Fix thrust system dependend includes (#6311) [SCOPE: HEADER]
-  HIP: generic dispatch headers; new "#if 0" build-system include hints (execution_policy.h, device/host_system_tag.h, mr/{device,host}_memory_resource.h, universal_{allocator,vector}.h) also list the thrust/system/hip/... counterparts alongside cuda; adl/*.h comment rewording taken (existing hip entries kept). universal_{allocator,vector}.h hint blocks placed before the local THRUST_DOXYGEN_INVOKED guard. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: d0ffe60bd04
-- [X] 52eb28883c4 Simplify thrust::zip_function (#6321) [SCOPE: HEADER,TEST]
-  Partial: zip_function.h keeps the local detail::zip_detail::apply (upstream switches to ::cuda::std::apply, which is not usable with non-libhipcxx tuples on device; behaviour identical). HIP: no change (generic header kept). test/: no counterpart. testing/: cuda/transform.cu zip_function<sum_five> specialization now returns double instead of the decltype(zip_detail::apply(...)) trailing return, as upstream. Not compiled, tests not run (per human)
-  - Local commit: df5274e3c2d
-- [X] 8ca3dc31e90 Refactor thrust::mismatch to use CUDA iterators (#6018) [SCOPE: HEADER]
-  HIP counterpart (system/hip): no change: performance-only / internal refactor (cuda mismatch drops transform_pair_of_input_iterators_t for ::cuda::zip_iterator + ::cuda::zip_function); hip/detail/mismatch.h keeps its iterator (already carries the 1c3c7ddee12 correctness fixes). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: d656f2535fa
-- [X] 3ec95622aff Move the `throw_meow_error` functions into their own header and drop the `stdexcept` include (#6335) [SCOPE: HEADER]
-  HIP counterpart (system/hip): no change; hip/detail/dispatch.h uses the libcxx_wrapper stdexcept.h shim (::internal::__throw_runtime_error), which works with and without libhipcxx. system/cuda: dispatch.h includes <cuda/std/__exception/throw_error.h> instead of the libcxx stdexcept header (other include additions from upstream belong to the is_negative rewrite not ported in 5303f65de2d). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: e50e7c3cbed
-- [X] 81b9aa5f1cc Move the implementation of `tuple` into its own file (#6336) [SCOPE: HEADER]
-  HIP: generic header; the libhipcxx-only (_THRUST_HAS_DEVICE_SYSTEM_STD) specialization now targets the __is_tuple_of_iterator_references_v variable template, matching the libcu++ tuple refactor in libhipcxx >= 3.2; non-libhipcxx path unchanged. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: d63ad167556
-- [X] 85bf1b00c4d Refactor generic thrust scan dispatch (#6360) [SCOPE: HEADER]
-  HIP: generic dispatch header; scan.inl folded into scan.h and the backend-required binary_op overloads are now "= delete" (HIP backend provides them), applies to HIP automatically. Uses <thrust/functional.h> instead of _THRUST_LIBCXX_INCLUDE(functional) so builds without libhipcxx still get _THRUST_STD::plus; THRUST_HOST_DEVICE spelling kept. git rm generic/scan.inl. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 53ef5ee1437
-- [X] e73cc82956a Move CPP, OMP and TBB exec policies to detail (#6361) [SCOPE: HEADER,TEST]
-  HIP counterpart (system/hip): no change; hip tag/execution_policy already live in thrust::hip_rocprim alongside the HIP algorithms, so ADL already finds them (the cuda change is only a comment). cpp/omp/tbb tag + execution_policy moved into system::<sys>::detail with using-declarations in system::<sys>, as upstream. omp/detail/scan.inl: P0571 accumulator (no-init tag, wrapped_function, init applied in block-sum scan), keeping the libhipcxx-free includes (_THRUST_STD_INCLUDE(type_traits) added, libcxx_wrapper invoke.h include dropped as accumulator_t is no longer used). test/: test_scan.cpp only_set_when_expected_it gains postfix operator++(int). testing/: scan.cu same (THRUST_HOST_DEVICE spelling). Not compiled, tests not run (per human)
-  - Local commit: 6f8eb446d11
-- [X] c22298179e0 Refactor Thrust OMP system headers (#6372) [SCOPE: HEADER]
-  HIP counterpart (system/hip): no change; OMP host backend restructuring only (shared by HIP builds, applies automatically). Inlined the 14 omp/detail/*.inl files into their .h and git rm'd them; SPDX headers and nested namespaces as upstream. Local edits preserved: omp/detail/scan.h keeps the libhipcxx-free includes (_THRUST_STD_INCLUDE(algorithm/iterator/numeric/type_traits)) and inline integer ceil-div, plus AMD Modifications SPDX line; memory.h keeps _THRUST_STD_INCLUDE(limits); reduce_intervals.h uses _THRUST_STD_INCLUDE(cstdint). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 764fd88c08b
-- [X] 88b95bb9a2c Inline the Thrust ADL layer (#6377) [SCOPE: HEADER]
-  HIP counterpart (system/hip): covered via __THRUST_DEVICE_SYSTEM_ROOT (resolves to thrust/system/hip), so the new __THRUST_{HOST,DEVICE}_SYSTEM_ALGORITH_{,DETAIL_}HEADER_INCLUDE macros pull in hip/detail headers directly; verified every referenced system/hip/detail/*.h and system/cpp/detail/*.h exists. Added thrust/system/hip lines to all upstream `#if 0` build-system hint blocks. git rm'd all 43 thrust/system/detail/adl/*.h; no remaining includers. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 6a4ae1580ed
-- [X] a8c74132b74 Drop unused file to detect CUDA archs (#6374) [SCOPE: CMAKE]
-  N/A: thrust/cmake/detect_compute_archs.cu has no local counterpart (rocThrust cmake/ has no CUDA arch detection). HIP counterpart (system/hip): none needed. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 857b08611c0
-- [X] e2fcf893086 Make some if constexpr (#6382) [SCOPE: HEADER]
-  Took upstream: cuda set_operations.h / sort.h `if` -> `if constexpr` plus [[maybe_unused]] items_first.
-  HIP counterpart (system/hip): no change; hip set_operations.h/sort.h have no matching runtime `if (HAS_VALUES::value)` / `if (SORT_ITEMS::value)` / `if (!is_contiguous_iterator...)` branches (rocPRIM-based dispatch). test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 44ce4e405dc
-- [X] c2f0b68245e Refactor Thrust TBB system headers (#6394) [SCOPE: HEADER]
-  Took upstream TBB refactor: nested namespaces, SPDX headers, inlined copy/for_each/merge/partition/reduce/scan/sort .inl into their .h and git rm'd the 7 .inl files (no remaining includers). Local .inl edits were spelling-only (::cuda::std:: -> _THRUST_STD::, <cuda/std/type_traits> -> _THRUST_STD_INCLUDE(type_traits)) and are preserved in the inlined headers. Stats match upstream (61 files).
-  HIP counterpart (system/hip): no change; refactor is TBB-backend-only. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 5b0e2305076
-- [X] dc30031642b Fix wrong namespace (#6395) [SCOPE: HEADER]
-  Took upstream: tbb/detail/remove.h namespace/include fixed from omp to tbb.
-  HIP counterpart (system/hip): no change; TBB-only fix. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: bac3a8ff69a
-- [X] e11761cc1b8 Fix wrongly rewritten license headers in Thrust OMP/TBB backend (#6406) [SCOPE: HEADER]
-  Took upstream: restored original NVIDIA Corporation / Apache-2.0 license headers in OMP/TBB backend files (102 files, stats match upstream). omp/detail/scan.h conflict: took upstream header, kept the AMD Modifications SPDX line.
-  HIP counterpart (system/hip): no change; OMP/TBB-only. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 8fde352f9c0
-- [X] 865e3d6429f Inline remaining `*.inl` files in tbb and seq backends (#6437) [SCOPE: HEADER]
-  Took upstream: inlined sequential copy/merge/sort/stable_merge_sort/stable_primitive_sort/stable_radix_sort .inl and tbb copy_if/memory/reduce_by_key/remove/unique/unique_by_key .inl into their headers; git rm'd the 12 .inl files (no remaining includers).
-  Preserved local .inl edits in the inlined headers: THRUST_HOST_DEVICE/THRUST_EXEC_CHECK_DISABLE/_THRUST_STD spellings; sequential/copy.h keeps _THRUST_STD::{true,false}_type; sequential/sort.h keeps the conjunction.h wrapper include, `<type_traits>` fallback and _THRUST_IF_TARGET/_THRUST_IS_HOST (nv/target dropped); stable_merge_sort.h keeps the _THRUST_HAS_DEVICE_SYSTEM_STD-guarded includes (algorithm_wrapper.h fallback) and _THRUST_IF_TARGET(_THRUST_IS_DEVICE, "CUDA or HIP threads"); stable_primitive_sort.h keeps the `<type_traits>` fallback; AMD Modifications lines carried from sort.inl/stable_merge_sort.inl. tbb reduce_by_key.h: libcu++-internal includes guarded by _THRUST_HAS_DEVICE_SYSTEM_STD with algorithm_wrapper.h/<type_traits> fallback (compatibility without libhipcxx).
-  HIP counterpart (system/hip): no change; sequential backend is shared and picked up by HIP through the generic dispatch, TBB is host-only. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: ab00525afc9
-- [X] 79060c84eb6 Fix offset_iterator tests (#6436) [SCOPE: TEST]
-  Took upstream: testing/cuda/offset_iterator.cu device_only_iterator gains operator+ and operator- now returns difference_type (CUDA-only test, raw spelling kept).
-  HIP counterpart (system/hip): no change; test-only fix. test/: test_offset_iterator.cpp has no device_only_iterator, no change. Not compiled, tests not run (per human)
-  - Local commit: c6b601bd94e
-- [X] 106665c64f4 Use SPDX license identifiers in CUB (#6441) [SCOPE: HEADER,BENCH]
-  Took upstream SPDX license headers for cuda/detail/{merge.h,core/triple_chevron_launch.h} and the primbench-style benchmark/bench/ counterparts (adjacent_difference, copy, fill, for_each, inner_product, merge, partition, reduce, scan, shuffle, sort, tabulate, transform_reduce, unique, vectorized_search); AMD Modifications lines preserved as SPDX-FileCopyrightText lines. Kept ours for AMD-only MIT-licensed set_operations benchmarks. NOLOCAL: set_operations/base.cuh, by_key.cuh, transform/babelstream.cu, transform/fib.cu, vectorized_search/base.cu. CUB part not applicable (hipCUB is separate).
-  HIP counterpart (system/hip): no change; license-only. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 899e186bb7f
-- [X] 31dd1d76e72 [clang-format] WrapNamespaceBodyWithEmptyLines: Never (#6439) [SCOPE: HEADER,TEST]
-  Took upstream whitespace-only change (empty lines removed after namespace open / before close) across 324 thrust/ and testing/ files. Not ported: the `WrapNamespaceBodyWithEmptyLines: Never` option for rocthrust/.clang-format, since the monorepo pre-commit pins clang-format v18.1.4 and that key needs v20+. Conflicts: kept ours (whitespace trimmed) in testing/unittest/{assertions,random}.h, mr/{fancy_pointer_resource,polymorphic_adaptor}.h doc comments, cuda/detail/sort.h TODO, type_traits/is_operator_{plus,less_or_greater}_function_object.h `#endif`, and iterator_facade_category.h (::internal::If); kept ours (no addition) for cuda/detail/dispatch.h is_negative (collides with integer_math.h, see 5303f65de2d) and cuda/detail/reduce.h public reduce_into overloads (absent locally).
-  HIP counterpart (system/hip): no change; upstream does not touch system/hip and the whitespace style change is not mirrored there. test/ counterpart: none (whitespace-only style change, not mirrored into gtest test/*.cpp). testing/: whitespace in unittest/ and tests merged. Not compiled, tests not run (per human)
-  - Local commit: 42c97ed3778
-- [X] 93e1f87c252 Ensure that `detect_wrong_difference` is a valid output iterator (#6450) [SCOPE: TEST]
-  Took upstream: testing/cpp/adjacent_difference.cu detect_wrong_difference gains output-iterator typedefs (iterator_category spelled _THRUST_STD::output_iterator_tag).
-  HIP counterpart (system/hip): no change; test-only. test/: test_adjacent_difference.cpp has no detect_wrong_difference, no change. Not compiled, tests not run (per human)
-  - Local commit: d7c4653fc34
-- [X] e6ad5079192 Nested namespace resolve for thrust & libcudacxx (#6465) [SCOPE: HEADER]
-  Took upstream: nested namespace definitions (namespace a::b) in 40 thrust headers (complex math, functional, random detail, cpp/cuda/omp system headers); merged cleanly. libcudacxx part not applicable.
-  HIP counterpart (system/hip): no change; style-only, the corresponding system/hip headers keep their existing namespace layout. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 0b59b09e572
-- [X] d89402658b2 Various CMake cleanups. (#6346) [SCOPE: TEST,EXAMPLE,CMAKE]
-  N/A: upstream adds cccl_configure_target(... DIALECT ...) calls to CCCL's ThrustHeaderTesting.cmake, examples/, testing/ and testing/unittest/ CMake. rocThrust uses its own CMake (no cccl_configure_target / thrust_add_test definitions locally; ThrustHeaderTesting.cmake absent); the vestigial testing/unittest/CMakeLists.txt is left unchanged.
-  HIP counterpart (system/hip): none needed. test/: no counterpart (test/CMakeLists.txt is rocThrust-native). testing/: no change. Not compiled, tests not run (per human)
-  - Local commit: fd53b07b864
-- [X] cb07e970a01 Remove old C++ version checks (#6494) [SCOPE: HEADER] ⚠ touches `thrust/detail/config/cpp_dialect.h`
-  Took upstream comment fix in thrust/detail/config/cpp_dialect.h: `#endif // THRUST_STD_VER < 2017` (local spelling of _CCCL_STD_VER). The rest of the upstream commit (old C++ version checks) is in CUB/libcudacxx only.
-  HIP counterpart (system/hip): no change. test/: no counterpart. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: 279e1e7302c
-- [X] bcb2bcb106d [clang-format] KeepEmptyLines only at EOF (#6440) [SCOPE: HEADER,TEST]
-  Took upstream: removed leading empty line in system/detail/generic/select_system.h. detail/pointer.h already had no leading blank line; testing/offset_iterator.cu and zip_function.h have local AMD license headers without a leading blank line, kept ours. Not ported: .clang-format KeepEmptyLines block (monorepo pins clang-format v18.1.4; KeepEmptyLines needs v19+).
-  HIP counterpart (system/hip): no change; whitespace-only. test/ counterpart: test/test_offset_iterator.cpp unchanged (whitespace-only). testing/: offset_iterator.cu kept ours. Not compiled, tests not run (per human)
-  - Local commit: 9f57de356b0
-- [X] a3cf1182949 Replace custom equal_to functors by _1 (#6515) [SCOPE: TEST]
-  Took upstream: testing/find.cu and testing/cuda/find.cu replace the custom equal_to/not_equal_to/less_than value predicates with thrust::placeholders::_1 expressions (find.cu conflict: dropped the structs, kept local _THRUST_STD_INCLUDE(cstdint) placement).
-  HIP counterpart (system/hip): no change; test-only. test/: mirrored in test/test_find.cpp: removed the three *_value_pred structs, added file-scope `using thrust::placeholders::_1;` and replaced uses with `_1 ==/!=/< T(x)` (same conversion semantics). Not compiled, tests not run (per human)
-  - Local commit: 3bf99859680
-- [X] 24deb145aec Cleanup `thrust::complex` math includes and functions (#6546) [SCOPE: HEADER]
-  Took upstream complex math cleanup: deleted detail/complex/c99math.h (git rm; no remaining includers) and replaced unqualified/ADL math calls with qualified _THRUST_STD:: calls across detail/complex/*.h; removed the abs float/double specializations in arithmetic.h. Compatibility adjustments: upstream's libcu++-internal includes (_THRUST_STD_INCLUDE(__cmath/...), __type_traits/common_type.h) replaced by a single _THRUST_STD_INCLUDE(cmath) per file (works with ::std when libhipcxx is absent); arithmetic.h keeps _THRUST_STD_INCLUDE(cfloat) (FLT_MIN/DBL_MIN) and <thrust/detail/type_traits.h>; cpow.h keeps <thrust/detail/type_traits.h>; kept local ::internal::common_type_t instead of _THRUST_STD::common_type_t; complex.h kept ours (_THRUST_STD_INCLUDE(cmath)); csinhf.h kept cmath include; catrig.h additionally qualifies the remaining `isnan(rx)` as _THRUST_STD::isnan since c99math's using-declarations are gone.
-  HIP counterpart (system/hip): no change; generic complex headers are used by HIP directly. test/: test_complex_various.cpp references thrust::detail::complex::hypot/hypotf only under `_MSC_VER <= 1500 && !defined(__clang__)` (dead for hipcc), no change. testing/: no counterpart. Not compiled, tests not run (per human)
-  - Local commit: e1ffc7b63d8
-- [X] 4b10fd26255 Cleanup includes in thrust (#6547) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none needed; system/cuda include cleanup taken as upstream. Generic headers: took trait modernization (is_x_v, enable_if_t, add_lvalue_reference_t) and binary_search_less -> _THRUST_STD::less<> (added _THRUST_STD_INCLUDE(functional)); kept local include blocks instead of upstream's granular libcu++-internal includes (would break non-libhipcxx builds); kept ::internal::is_integral/::internal::If wrappers and dual less list in cuda sort.h. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 9b7abf25a94
-- [X] 369f2f72eca Fix merge conflicts from dropping headers (#6563) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none. N/A: upstream adds granular libcu++ __cmath/* includes to catrig.h/catrigf.h; local already includes the _THRUST_STD_INCLUDE(cmath) umbrella (from 24deb145aec port), which is compatible with non-libhipcxx builds. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: c308d88e449
-- [X] 2845628f12e Add gersemi CMake formatter (#6557) [SCOPE: TEST,EXAMPLE,BENCH,CMAKE] ⚠ touches `CMakeLists.txt`
-  HIP counterpart (system/hip): none. N/A: gersemi formatting-only reflow of CMake files; local CMakeLists.txt/*.cmake are rocThrust-owned (HIP build) and the monorepo does not use gersemi, so no reformat ported; no functional change. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 5510a5eabe8
-- [X] 3a4892e1fb9 [Thrust]: New "sum rows" and "sum columns" examples (#4462) [SCOPE: TEST,EXAMPLE,OTHER]
-  HIP counterpart (system/hip): none. Ported rewritten examples/sum_rows.cu and new examples/sum_columns.cu (registered in examples/CMakeLists.txt), adapted for non-libhipcxx compatibility: cuda::std::mdspan replaced by row-major raw pointer indexing, cuda::counting_iterator by thrust::counting_iterator<int>; added missing permutation_iterator include; AMD MIT header kept on sum_rows. CMake sidecars (sum_*.cmake, GCC7/nvcc-only), sum_columns filecheck and gersemi-only address_stability.cmake reflow not ported (local build has no per-example sidecar/FileCheck support). test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 5ef6089282f
-- [X] 06f2025d169 Replace enum by static constexpr in CUB/Thrust (#6480) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none; system/hip has no anonymous-enum constants of this form. Ported enum -> static constexpr in system/cuda (agent_launcher.h, core/util.h, reduce.h, reduce_by_key.h, set_operations.h); util.h conflict resolved to static constexpr bool value while keeping local ::cuda::std::true_type/false_type. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: e4cf20cf111
-- [X] 8b263079605 Make Thrust/CUB ABI namespace resilient against user-defined macros (#6564) [SCOPE: HEADER]
-  HIP counterpart (system/hip): mirrored in namespace.h HIP branch: ABI namespace now THRUST_PP_CAT(THRUST_PP_CAT(_V_, THRUST_VERSION), THRUST_PP_SPLICE_WITH(_, _R, ROCTHRUST_VERSION)) so user macros named THRUST/NS cannot break it (namespace name changes from THRUST_<ver>_<rocver>_NS to _V_<ver>_R_<rocver>; ABI-only, inline namespace). CUDA branches take upstream. cub/libcudacxx parts not applicable. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 8162b02e909
-- [X] 91434d76ab3 Replace uses of `thrust::pair` with `cuda::std::pair` (#6616) [SCOPE: HEADER,TEST,EXAMPLE,BENCH]
-  HIP counterpart (system/hip): none; system/hip keeps thrust::pair. Ported only system/cuda (extrema, merge, mismatch, partition, reduce_by_key, set_operations, temporary_buffer, unique_by_key) and CUDA-only testing/cuda tests, where thrust::pair is an alias of cuda::std::pair. Generic/public headers, sequential/omp/tbb backends, top-level tests, examples and benchmarks keep thrust::pair: in the non-libhipcxx fallback thrust::pair is a distinct struct (pair.h), so switching signatures to _THRUST_STD::pair (std::pair) would break the fallback and diverge from system/hip return types (compatibility over upstream parity). Remaining upstream changes in those files were formatting-only. test/ counterpart: none (test/ uses thrust::pair; unchanged). Not compiled, tests not run (per human)
-  - Local commit: 5555313e802
-- [X] fba9f834103 Publicly expose `<cuda/std/algorithm>` (#3741) [SCOPE: TEST]
-  HIP counterpart (system/hip): none. testing/counting_iterator.cu now includes _THRUST_STD_INCLUDE(algorithm) instead of the private __algorithm_ header; testing/zip_iterator_sort.cu qualifies thrust::stable_sort (avoids ADL ambiguity with now-public cuda::std algorithms). test/ counterpart: mirrored in test/test_counting_iterator.cpp (algorithm include) and test/test_zip_iterator_sort.cpp (thrust::stable_sort). Not compiled, tests not run (per human)
-  - Local commit: 3c05a78861b
-- [X] b934754d607 Refactor cub::detail::AliasTemporaries (#6617) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none; system/hip uses rocPRIM temp storage, not cub AliasTemporaries. Ported call-site updates in system/cuda (copy_if, core/util, extrema, partition, reduce_by_key, unique, unique_by_key). test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 461edd016d8
-- [X] 99976dcd665 MVP for disabling nvtx ranges for `thrust::seq` (#6415) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none. N/A: adds nvtx_policy.h and _CCCL_NVTX_RANGE_SCOPE_IF to algorithm entry points to skip NVTX for thrust::seq; rocThrust carries no NVTX ranges in generic entry points (kept ours, nvtx_policy.h not added). test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 8f48aa3616e
-- [X] 2f82c4d1be1 Port thrust complex.cu tests to catch2_test_complex.cu (#6625) [SCOPE: TEST]
-  HIP counterpart (system/hip): none. N/A: upstream moves testing/complex.cu to Catch2 testing/catch2_test_complex.cu; rocThrust has no Catch2 harness, so the catch2 file is not added and legacy testing/complex.cu is kept (same coverage). test/ counterpart: test/test_complex.cpp already covers these cases; unchanged. Not compiled, tests not run (per human)
-  - Local commit: c914c9efc71
-- [X] 26c79caf60e fix omp scan bug (#6560) (#6704) [SCOPE: HEADER,TEST]
-  HIP counterpart (system/hip): none (rocPRIM scan unaffected). Ported OMP scan fix in system/omp/detail/scan.h: blocks reduce with their first element as init (no accum_t{} identity assumption), no-init inclusive path seeds from block_sums[0] and thread 0 scans without prefix, serial fallback when n < max(threshold, num_threads); _CCCL_ASSERT dropped (not available locally; replaced by a comment). testing/scan.cu and testing/transform_scan.cu gain the new tests (THRUST_HOST_DEVICE spelling; kept local include guards, added <numeric>). test/ counterpart: mirrored in test/test_scan.cpp (Int with friend ops, TestScanWithUserDefinedTypeAndInit replacing TestInclusiveScanWithUserDefinedType, TestScanBug6317 using get_random_data, TestScanEdgeCases) and test/test_transform_scan.cpp (TransformInt, TestTransformScanEdgeCases). Not compiled, tests not run (per human)
-  - Local commit: b30d2c07630
-- [X] 2f529edf653 Ensure that we properly warn about device lambdas that need to query the return type (#6765) (#6782) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none. transform_iterator_reference now uses _THRUST_STD::invoke_result_t<UnaryFunc&, ...> (also for functional::actor) so the device-lambda return-type diagnostic fires; kept local include block (type_traits umbrella provides invoke_result_t; upstream's granular __functional/__type_traits includes not added). libcudacxx invoke.h part not applicable. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 0988f1197e8
-- [X] 783ebe64a0e CMake backports for 3.2 (#6850) [SCOPE: TEST,EXAMPLE,BENCH,CMAKE] ⚠ touches `CMakeLists.txt`
-  HIP counterpart (system/hip): none. N/A: upstream CCCL CMake backports (Thrust*.cmake, DetectSupportedStandards, ThrustRunTest, gersemi-formatted CMakeLists, async_reduce.cmake removal); rocThrust's CMake (top-level, benchmark, examples, testing) is independent of upstream's and these files are absent or AMD-owned locally. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: fa12cc643c2
-- [X] 2c7c41e2026 [thrust] Ignore CUDA free errors in thrust memory resource (#7002) (#7033) [SCOPE: HEADER]
-  HIP counterpart (system/hip): mirrored in system/hip/memory_resource.h: do_deallocate no longer throws on hipFree errors (status discarded with [[maybe_unused]]), matching system/cuda/memory_resource.h. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: 6a3c654cb90
-- [X] 7407ca152b0 Use cudaMemcpyDefault for trivial copies (#7006) (#7134) [SCOPE: HEADER,TEST]
-  HIP counterpart (system/hip): mirrored in system/hip/detail/util.h: trivial_copy_from_device/trivial_copy_to_device use hipMemcpyDefault (both hipMemcpyWithStream and legacy hipMemcpyAsync paths) so the runtime picks the direction when a device-accessible pointer is host memory. system/cuda/detail/util.h and CUDA-only testing/cuda/trivial_copy_memcpy_default.cu taken as upstream. test/ counterpart: added TestTrivialCopyFromDeviceHostSource/TestTrivialCopyToDeviceHostDest to test/test_copy.cpp. Not compiled, tests not run (per human)
-  - Local commit: 2edab5b61d2
-- [X] 5281dcaefdc Align local vector storage arrays in vec transform (#7162) (#7163) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none; the Alignment parameter only serves CUB's vectorized transform (cub part not applicable), and system/hip uses rocPRIM transform. Ported the uninitialized_array Alignment template parameter in system/cuda/detail/core/util.h. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: b0f307773ad
-- [X] b85d41e36d4 Fixes for thrust::shuffle (#7172) (#7189) [SCOPE: HEADER,TEST]
-  HIP counterpart (system/hip): none (generic shuffle/random_bijection shared by all backends). Took upstream's new Feistel bijection (L/R split, size() = 1 << (L_bits+R_bits), min 256, nearest_power_of_two/mulhilo/get_cipher_bits/round_state removed) and generic/shuffle.inl now uses bijection.size(). Replaced cuda::std::bit_width with a portable bit-count loop (C++20 std::bit_width unavailable without libhipcxx); kept local umbrella includes instead of granular __type_traits/__bit includes. testing/shuffle.cu taken as upstream (Cephes and EvenSpacing/EvenDistribution tests removed, z-test key-position test, chi-squared critical value 145.461) with cuda::std:: -> _THRUST_STD:: and _THRUST_STD_INCLUDE(algorithm/cmath). test/ counterpart: mirrored in test/test_shuffle.cpp (size_t(256) bound, FeistelBijectionLength 345->512/256->256/1->256, inverse_erf z-test, critical value 145.461, Cephes/EvenSpacing/EvenDistribution removed, <cmath> added). Not compiled, tests not run (per human)
-  - Local commit: 6c4b6a6fc1c
-- [X] 64bf7077610 Bump branch/3.2.x to 3.2.1. (#7329) [SCOPE: HEADER]
-  HIP counterpart (system/hip): none. N/A: upstream version bump only touches thrust/version.h / CCCL version files; rocThrust versioning (thrust/version.h, CHANGELOG.md) is rocThrust-owned and not modified by the sync. test/ counterpart: none. Not compiled, tests not run (per human)
-  - Local commit: d2976ad27c2

From 1ecc3a9cb10e1e3e6fc3d5bc8333691d54a47b3d Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Tue, 3 Nov 2026 17:17:07 -0500
Subject: [PATCH 47/48] chore(libhipcxx): bump submodule to 87af709ba43

Co-Authored-By: Claude <noreply@anthropic.com>
---
 projects/hipccl/hipccl3/libhipcxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/hipccl/hipccl3/libhipcxx b/projects/hipccl/hipccl3/libhipcxx
index 385f456d7e7c..87af709ba434 160000
--- a/projects/hipccl/hipccl3/libhipcxx
+++ b/projects/hipccl/hipccl3/libhipcxx
@@ -1 +1 @@
-Subproject commit 385f456d7e7c44a42631bcd242de6015d894aa9c
+Subproject commit 87af709ba4349548a2bfaee73907635d889736dd

From 91fc71ce9250c94db2bffc00ba1bf01436f4df7c Mon Sep 17 00:00:00 2001
From: Mahovsky <jmahovsk@amd.com>
Date: Wed, 4 Nov 2026 11:14:00 -0500
Subject: [PATCH 48/48] chore(libhipcxx): bump submodule to 5cf4deb633f

Co-Authored-By: Claude <noreply@anthropic.com>
---
 projects/hipccl/hipccl3/libhipcxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/hipccl/hipccl3/libhipcxx b/projects/hipccl/hipccl3/libhipcxx
index 87af709ba434..5cf4deb633fb 160000
--- a/projects/hipccl/hipccl3/libhipcxx
+++ b/projects/hipccl/hipccl3/libhipcxx
@@ -1 +1 @@
-Subproject commit 87af709ba4349548a2bfaee73907635d889736dd
+Subproject commit 5cf4deb633fbefd3868c37d2a623b4abd8822f35