Cherry-pick build fixes for rocThrust + libhipcxx for ROCm 7.1.1 (#2465)

Do not merge until PM approval given. 

## Motivation

We have discovered an issue with the rocThrust version that comes with
ROCm 7.1. In particular, once libhipcxx is installed on a system,
rocThrust will include libhipcxx headers. Unfortunately, the version of
rocThrust is not aligned with the 2.7.0 libhipcxx version and seems to
use CCCL includes from >=2.8.x. Hence, any include of rocThrust will
fail once libhipcxx is installed on a ROCm 7.1 system. Fixing this in
rocThrust should be rather easy by disabling the hip/std includes for an
incompatible libhipcxx version.

## Technical Details

This PR combines #2430, #1769, and #1770

## Test Plan

Running CI tests now.

## Test Result

<!-- Briefly summarize test outcomes. -->

## Submission Checklist

- [ ] Look over the contributing guidelines at
https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.

---------

Co-authored-by: Yung-sheng Tu <[email protected]>
Co-authored-by: Nara <[email protected]>
Co-authored-by: Saiyang Zhang <[email protected]>

Author: 4 people

.clang-format

@@ -227,3 +227,8 @@ StatementMacros: [
 ]
 TabWidth: 2
 UseTab: Never
+WhitespaceSensitiveMacros: [
+  'THRUST_HAS_INCLUDE',
+  '_THRUST_LIBCXX_INCLUDE',
+  '_THRUST_STD_INCLUDE'
+]

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright 2019-2025 Advanced Micro Devices, Inc.
 # ########################################################################
 
-cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 # --------------------------------------
 # Update these variables at release time

cmake/DownloadProject.CMakeLists.cmake.in

@@ -1,7 +1,7 @@
 # Distributed under the OSI-approved MIT License.  See accompanying
 # file LICENSE or https://github.com/Crascit/DownloadProject for details.
 
-cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 project(${DL_ARGS_PROJ}-download NONE)
 

extra/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright 2019-2025 Advanced Micro Devices, Inc.
 # ########################################################################
 
-cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 # This project includes tests that should be run after
 # rocThrust is installed from package or using `make install`

test/test_event.cpp

@@ -162,7 +162,7 @@ TEST(EventTests, test_event_when_all)
 
   ASSERT_EQ(e0_stream, e8.stream().native_handle());
 
-  e8.wait();
+  TEST_EVENT_WAIT(e8);
 
   ASSERT_EQ(false, e0.ready());
   ASSERT_EQ(false, e1.ready());
@@ -173,8 +173,7 @@ TEST(EventTests, test_event_when_all)
   ASSERT_EQ(false, e6.ready());
   ASSERT_EQ(false, e7.ready());
 
-  // // FIXME: Temporarily disabled due to observed failure in AMD CI.
-  // ASSERT_EQ(true, e8.ready());
+  ASSERT_EQ(true, e8.ready());
 }
 
 ///////////////////////////////////////////////////////////////////////////////

testing/cmake/check_namespace.cmake

@@ -5,7 +5,7 @@
 # manually with:
 # cmake -D "Thrust_SOURCE_DIR=<thrust project root>" -P check_namespace.cmake
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16)
 
 set(exclusions
   # This defines the macros and must have bare namespace declarations:

testing/event.cu

@@ -154,7 +154,7 @@ THRUST_HOST void test_event_when_all()
 
   ASSERT_EQUAL(e0_stream, e8.stream().native_handle());
 
-  e8.wait();
+  TEST_EVENT_WAIT(e8);
 
   ASSERT_EQUAL(false, e0.ready());
   ASSERT_EQUAL(false, e1.ready());

testing/unittest/util_async.h

@@ -40,7 +40,10 @@ THRUST_HOST void test_event_wait(Event&& e, std::string const& filename = "unkno
   ASSERT_EQUAL_WITH_FILE_AND_LINE(true, e.valid_stream(), filename, lineno);
 
   e.wait();
-  e.wait();
+  while (!e.ready())
+  {
+    e.wait();
+  }
 
   ASSERT_EQUAL_WITH_FILE_AND_LINE(true, e.valid_stream(), filename, lineno);
   ASSERT_EQUAL_WITH_FILE_AND_LINE(true, e.ready(), filename, lineno);

thrust/detail/alignment.h

@@ -33,14 +33,8 @@
 #include _THRUST_STD_INCLUDE(type_traits) // For `std::alignment_of`.
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
-#    include <cuda/cmath>
-#  else
-#    include <hip/cmath>
-#  endif
-#endif
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include _THRUST_LIBCXX_INCLUDE(cmath)
+#else
 #  include <rocprim/detail/various.hpp>
 #endif
 
@@ -87,11 +81,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
-#  if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
-  return ::cuda::ceil_div(n, align) * align;
-#  else
-  return ::hip::ceil_div(n, align) * align;
-#  endif
+  return _THRUST_LIBCXX::ceil_div(n, align) * align;
 #else
   return ::rocprim::detail::ceiling_div(n, align) * align;
 #endif

thrust/detail/attributes.h

@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DETAIL_ATTRIBUTES_H
+#define DETAIL_ATTRIBUTES_H
+
+#include <thrust/detail/config.h>
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+
+// clang-format off
+#  include _THRUST_STD_INCLUDE(__cccl/attributes.h)
+// clang-format on
+
+#  define THRUST_DECLSPEC_EMPTY_BASES _CCCL_DECLSPEC_EMPTY_BASES
+
+#else // !_THRUST_HAS_DEVICE_SYSTEM_STD
+
+#  ifdef __has_declspec_attribute
+#    define THRUST_HAS_DECLSPEC_ATTRIBUTE(__x) __has_declspec_attribute(__x)
+#  else // ^^^ __has_declspec_attribute ^^^ / vvv !__has_declspec_attribute vvv
+#    define THRUST_HAS_DECLSPEC_ATTRIBUTE(__x) 0
+#  endif // !__has_declspec_attribute
+
+// MSVC needs extra help with empty base classes
+#  if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC || THRUST_HAS_DECLSPEC_ATTRIBUTE(empty_bases)
+#    define THRUST_DECLSPEC_EMPTY_BASES __declspec(empty_bases)
+#  else // !THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#    define THRUST_DECLSPEC_EMPTY_BASES
+#  endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+
+#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
+
+#endif // DETAIL_ATTRIBUTES_H