rm device_helpers.hip.h from cuh

src/collective/device_communicator.cuh

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

src/common/algorithm.cuh

@@ -23,13 +23,7 @@
 
 #include "common.h"            // safe_cuda
 #include "cuda_context.cuh"    // CUDAContext
-
-#if defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#elif defined(XGBOOST_USE_CUDA)
 #include "device_helpers.cuh"  // TemporaryArray,SegmentId,LaunchN,Iota,device_vector
-#endif
-
 #include "xgboost/base.h"      // XGBOOST_DEVICE
 #include "xgboost/context.h"   // Context
 #include "xgboost/logging.h"   // CHECK

src/common/cuda_context.cuh

@@ -4,12 +4,7 @@
 #ifndef XGBOOST_COMMON_CUDA_CONTEXT_CUH_
 #define XGBOOST_COMMON_CUDA_CONTEXT_CUH_
 #include <thrust/execution_policy.h>
-
-#if defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#elif defined(XGBOOST_USE_CUDA)
 #include "device_helpers.cuh"
-#endif
 
 namespace xgboost {
 struct CUDAContext {

src/common/hist_util.cuh

@@ -12,13 +12,7 @@
 #include <cstddef>  // for size_t
 
 #include "../data/device_adapter.cuh"
-
-#if defined(XGBOOST_USE_CUDA)
 #include "device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#endif
-
 #include "hist_util.h"
 #include "quantile.cuh"
 #include "timer.h"

src/common/linalg_op.cuh

@@ -4,12 +4,7 @@
 #ifndef XGBOOST_COMMON_LINALG_OP_CUH_
 #define XGBOOST_COMMON_LINALG_OP_CUH_
 
-#if defined(XGBOOST_USE_CUDA)
 #include "device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#endif
-
 #include "linalg_op.h"
 #include "xgboost/context.h"
 #include "xgboost/linalg.h"

src/common/quantile.cuh

@@ -5,13 +5,7 @@
 
 #include "xgboost/span.h"
 #include "xgboost/data.h"
-
-#if defined(XGBOOST_USE_CUDA)
 #include "device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#endif
-
 #include "quantile.h"
 #include "timer.h"
 #include "categorical.h"

src/common/stats.cuh

@@ -19,13 +19,7 @@
 
 #include "algorithm.cuh"                           // SegmentedArgMergeSort
 #include "cuda_context.cuh"                        // CUDAContext
-
-#if defined(XGBOOST_USE_CUDA)
 #include "device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#endif
-
 #include "xgboost/context.h"                       // Context
 #include "xgboost/span.h"                          // Span
 

src/common/threading_utils.cuh

@@ -9,13 +9,7 @@
 
 #include "./math.h"            // Sqr
 #include "common.h"
-
-#if defined(XGBOOST_USE_HIP)
-#include "device_helpers.hip.h"
-#elif defined(XGBOOST_USE_CUDA)
 #include "device_helpers.cuh"  // LaunchN
-#endif
-
 #include "xgboost/base.h"      // XGBOOST_DEVICE
 #include "xgboost/span.h"      // Span
 

src/data/device_adapter.cuh

@@ -12,12 +12,7 @@
 #include <memory>
 #include <string>
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../common/device_helpers.hip.h"
-#endif
-
 #include "../common/math.h"
 #include "adapter.h"
 #include "array_interface.h"

src/data/ellpack_page.cuh

@@ -8,13 +8,7 @@
 #include <xgboost/data.h>
 
 #include "../common/compressed_iterator.h"
-
-#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/categorical.h"
 #include <thrust/binary_search.h>

src/data/simple_dmatrix.cuh

@@ -9,12 +9,7 @@
 #include <thrust/execution_policy.h>
 #include <thrust/scan.h>
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../common/device_helpers.hip.h"
-#endif
-
 #include "../common/error_msg.h"  // for InfInData
 #include "device_adapter.cuh"     // for HasInfInData
 

src/tree/constraints.cuh

@@ -15,12 +15,7 @@
 #include "constraints.h"
 #include "xgboost/span.h"
 #include "../common/bitfield.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 {
 // Feature interaction constraints built for GPU Hist updater.

src/tree/gpu_hist/gradient_based_sampler.cuh

@@ -6,12 +6,7 @@
 #include <xgboost/data.h>
 #include <xgboost/span.h>
 
-#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"
 
 namespace xgboost {

src/tree/gpu_hist/row_partitioner.cuh

@@ -7,12 +7,7 @@
 #include <limits>
 #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 "xgboost/base.h"
 #include "xgboost/context.h"
 #include "xgboost/task.h"

src/tree/updater_gpu_common.cuh

@@ -17,13 +17,7 @@
 #include <string>
 #include <vector>
 #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"
-#endif
-
 #include "../common/random.h"
 #include "gpu_hist/histogram.cuh"
 #include "param.h"