rm device_helpers.hip.h from cu

src/tree/constraints.cu

@@ -14,12 +14,7 @@
 #include "xgboost/span.h"
 #include "constraints.cuh"
 #include "param.h"
-
-#if defined(XGBOOST_USE_CUDA)
 #include "../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../common/device_helpers.hip.h"
-#endif
 
 namespace xgboost {
 

src/tree/fit_stump.cu

@@ -12,13 +12,7 @@
 #include <cstddef>                                // std::size_t
 
 #include "../collective/device_communicator.cuh"  // DeviceCommunicator
-
-#if defined(XGBOOST_USE_CUDA)
 #include "../common/device_helpers.cuh"           // dh::MakeTransformIterator
-#elif defined(XGBOOST_USE_HIP)
-#include "../common/device_helpers.hip.h"         // dh::MakeTransformIterator
-#endif
-
 #include "fit_stump.h"
 #include "xgboost/base.h"     // GradientPairPrecise, GradientPair, XGBOOST_DEVICE
 #include "xgboost/context.h"  // Context

src/tree/gpu_hist/evaluate_splits.cu

@@ -6,19 +6,14 @@
 #include <limits>
 
 #include "../../common/categorical.h"
-
-#if defined(XGBOOST_USE_CUDA)
 #include "../../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../common/device_helpers.hip.h"
-#include <hip/hip_cooperative_groups.h>
-#endif
-
 #include "../../data/ellpack_page.cuh"
 #include "evaluate_splits.cuh"
 #include "expand_entry.cuh"
 
 #if defined(XGBOOST_USE_HIP)
+#include <hip/hip_cooperative_groups.h>
+
 #define WARP_SIZE WAVEFRONT_SIZE
 #elif defined(XGBOOST_USE_CUDA)
 #define WARP_SIZE 32

src/tree/gpu_hist/evaluator.cu

@@ -7,12 +7,7 @@
 #include <thrust/logical.h>  // thrust::any_of
 #include <thrust/sort.h>     // thrust::stable_sort
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../common/device_helpers.hip.h"
-#endif
-
 #include "../../common/hist_util.h"  // common::HistogramCuts
 #include "evaluate_splits.cuh"
 #include "xgboost/data.h"

src/tree/gpu_hist/feature_groups.cu

@@ -7,13 +7,7 @@
 #include <vector>
 
 #include "feature_groups.cuh"
-
-#if defined(XGBOOST_USE_CUDA)
 #include "../../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../common/device_helpers.hip.h"
-#endif
-
 #include "../../common/hist_util.h"
 
 namespace xgboost {

src/tree/gpu_hist/histogram.cu

@@ -9,13 +9,7 @@
 #include <limits>
 
 #include "../../common/deterministic.cuh"
-
-#if defined(XGBOOST_USE_CUDA)
 #include "../../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../common/device_helpers.hip.h"
-#endif
-
 #include "../../data/ellpack_page.cuh"
 #include "histogram.cuh"
 #include "row_partitioner.cuh"

src/tree/gpu_hist/row_partitioner.cu

@@ -7,12 +7,7 @@
 
 #include <vector>
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../common/device_helpers.hip.h"
-#endif
-
 #include "row_partitioner.cuh"
 
 namespace xgboost {

src/tree/updater_gpu_hist.cu

@@ -17,13 +17,7 @@
 #include "../common/categorical.h"
 
 #include "../common/cuda_context.cuh"  // CUDAContext
-
-#if defined(XGBOOST_USE_CUDA)
 #include "../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../common/device_helpers.hip.h"
-#endif
-
 #include "../common/hist_util.h"
 #include "../common/io.h"
 #include "../common/timer.h"