restore device helper

src/common/device_helpers.cuh

@@ -2,9 +2,6 @@
  * Copyright 2017-2023 XGBoost contributors
  */
 #pragma once
-
-#if defined(XGBOOST_USE_CUDA)
-
 #include <thrust/binary_search.h>  // thrust::upper_bound
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/device_ptr.h>
@@ -1385,7 +1382,3 @@ class LDGIterator {
   }
 };
 }  // namespace dh
-
-#elif defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#endif

tests/cpp/common/test_bitfield.cu

@@ -6,7 +6,11 @@
 #include <thrust/device_vector.h>
 #include <vector>
 #include "../../../src/common/bitfield.h"
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 
 namespace xgboost {
 

tests/cpp/common/test_device_helpers.cu

@@ -6,7 +6,11 @@
 #include <thrust/device_vector.h>
 #include <vector>
 #include <xgboost/base.h>
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 #include "../../../src/common/quantile.h"
 #include "../helpers.h"
 #include "gtest/gtest.h"

tests/cpp/common/test_gpu_compressed_iterator.cu

@@ -1,5 +1,9 @@
 #include "../../../src/common/compressed_iterator.h"
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 #include "gtest/gtest.h"
 #include <algorithm>
 #include <thrust/device_vector.h>

tests/cpp/common/test_host_device_vector.cu

@@ -6,7 +6,11 @@
 #include <thrust/equal.h>
 #include <thrust/iterator/counting_iterator.h>
 
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 #include <xgboost/host_device_vector.h>
 
 namespace xgboost {

tests/cpp/common/test_span.cu

@@ -7,7 +7,11 @@
 #include <thrust/device_vector.h>
 #include <thrust/execution_policy.h>
 
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 
 #include <xgboost/span.h>
 #include "test_span.h"

tests/cpp/data/test_array_interface.h

@@ -6,7 +6,11 @@
 
 #include <memory>
 #include "../../../src/common/bitfield.h"
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 
 namespace xgboost {
 

tests/cpp/data/test_ellpack_page.cu

@@ -7,7 +7,11 @@
 
 #include "../../../src/common/categorical.h"
 #include "../../../src/common/hist_util.h"
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/data/ellpack_page.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/data/ellpack_page.hip.h"
+#endif
 #include "../../../src/tree/param.h"  // TrainParam
 #include "../helpers.h"
 #include "../histogram_helpers.h"

tests/cpp/data/test_ellpack_page_raw_format.cu

@@ -4,7 +4,11 @@
 #include <gtest/gtest.h>
 #include <xgboost/data.h>
 
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/data/ellpack_page.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/data/ellpack_page.hip.h"
+#endif
 #include "../../../src/data/sparse_page_source.h"
 #include "../../../src/tree/param.h"  // TrainParam
 #include "../filesystem.h"            // dmlc::TemporaryDirectory

tests/cpp/data/test_metainfo.cu

@@ -6,7 +6,11 @@
 #include <xgboost/data.h>
 #include <xgboost/json.h>
 
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 #include "test_array_interface.h"
 #include "test_metainfo.h"
 

tests/cpp/data/test_sparse_page_dmatrix.cu

@@ -4,7 +4,11 @@
 #include <xgboost/data.h>  // for DMatrix
 
 #include "../../../src/common/compressed_iterator.h"
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/data/ellpack_page.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/data/ellpack_page.hip.h"
+#endif
 #include "../../../src/data/sparse_page_dmatrix.h"
 #include "../../../src/tree/param.h"  // TrainParam
 #include "../filesystem.h"            // dmlc::TemporaryDirectory

tests/cpp/tree/gpu_hist/test_gradient_based_sampler.cu

@@ -3,9 +3,13 @@
  */
 #include <gtest/gtest.h>
 
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../../src/data/ellpack_page.cuh"
 #include "../../../../src/tree/gpu_hist/gradient_based_sampler.cuh"
-#include "../../../../src/tree/param.h"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../../src/data/ellpack_page.hip.h"
+#include "../../../../src/tree/gpu_hist/gradient_based_sampler.hip.h"
+#endif
 #include "../../../../src/tree/param.h"  // TrainParam
 #include "../../filesystem.h"            // dmlc::TemporaryDirectory
 #include "../../helpers.h"

tests/cpp/tree/test_constraints.cu

@@ -8,9 +8,15 @@
 #include <string>
 #include <bitset>
 #include <set>
+#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/tree/constraints.cuh"
 #include "../../../src/tree/param.h"
 #include "../../../src/common/device_helpers.cuh"
+#elif defined(XGBOOST_USE_HIP)
+#include "../../../src/tree/constraints.hip.h"
+#include "../../../src/tree/param.h"
+#include "../../../src/common/device_helpers.hip.h"
+#endif
 
 namespace xgboost {
 namespace {