rm hip.h files

tests/cpp/common/test_algorithm.cu

@@ -9,13 +9,8 @@
 #include <algorithm>          // is_sorted
 #include <cstddef>            // size_t
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/algorithm.cuh"
 #include "../../../src/common/device_helpers.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../../src/common/algorithm.hip.h"
-#include "../../../src/common/device_helpers.hip.h"
-#endif
 #include "../helpers.h"  // CreateEmptyGenericParam
 
 namespace xgboost {

tests/cpp/common/test_bitfield.cu

@@ -6,11 +6,7 @@
 #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,11 +6,7 @@
 #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,9 +1,5 @@
 #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_hist_util.cu

@@ -16,18 +16,10 @@
 #include <vector>     // for vector
 
 #include "../../../include/xgboost/logging.h"
-#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
 #include "../../../src/common/hist_util.cuh"
 #include "../../../src/common/hist_util.h"
 #include "../../../src/data/device_adapter.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../../src/common/device_helpers.hip.h"
-#include "../../../src/common/hist_util.hip.h"
-#include "../../../src/common/hist_util.h"
-#include "../../../src/common/math.h"
-#include "../../../src/data/device_adapter.hip.h"
-#endif
 #include "../../../src/data/simple_dmatrix.h"
 #include "../data/test_array_interface.h"
 #include "../filesystem.h"  // dmlc::TemporaryDirectory

tests/cpp/common/test_host_device_vector.cu

@@ -4,12 +4,7 @@
 #include <gtest/gtest.h>
 #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::common {

tests/cpp/common/test_linalg.cu

@@ -2,12 +2,7 @@
  * Copyright 2021-2023 by XGBoost Contributors
  */
 #include <gtest/gtest.h>
-
-#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/linalg_op.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../../src/common/linalg_op.hip.h"
-#endif
 #include "../helpers.h"
 #include "xgboost/context.h"
 #include "xgboost/linalg.h"

tests/cpp/common/test_quantile.cu

@@ -3,17 +3,10 @@
  */
 #include <gtest/gtest.h>
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/collective/communicator-inl.cuh"
 #include "../../../src/common/hist_util.cuh"
 #include "../../../src/common/quantile.cuh"
 #include "../../../src/data/device_adapter.cuh"  // CupyAdapter
-#elif defined(XGBOOST_USE_HIP)
-#include "../../../src/collective/communicator-inl.hip.h"
-#include "../../../src/common/hist_util.hip.h"
-#include "../../../src/common/quantile.hip.h"
-#include "../../../src/data/device_adapter.hip.h"  // CupyAdapter
-#endif
 #include "../helpers.h"
 #include "test_quantile.h"
 

tests/cpp/common/test_ranking_utils.cu

@@ -11,17 +11,10 @@
 #include <numeric>                                 // for iota
 #include <vector>                                  // for vector
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/algorithm.cuh"       // for SegmentedSequence
 #include "../../../src/common/cuda_context.cuh"    // for CUDAContext
 #include "../../../src/common/device_helpers.cuh"  // for device_vector, ToSpan
 #include "../../../src/common/ranking_utils.cuh"   // for CalcQueriesInvIDCG
-#elif defined(XGBOOST_USE_HIP)
-#include "../../../src/common/algorithm.hip.h"       // for SegmentedSequence
-#include "../../../src/common/cuda_context.hip.h"    // for CUDAContext
-#include "../../../src/common/device_helpers.hip.h"  // for device_vector, ToSpan
-#include "../../../src/common/ranking_utils.hip.h"   // for CalcQueriesInvIDCG
-#endif
 #include "../../../src/common/ranking_utils.h"     // for LambdaRankParam, RankingCache
 #include "../helpers.h"                            // for EmptyDMatrix
 #include "test_ranking_utils.h"                    // for TestNDCGCache

tests/cpp/common/test_span.cu

@@ -6,13 +6,7 @@
 #include <thrust/host_vector.h>
 #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/common/test_stats.cu

@@ -7,13 +7,8 @@
 #include <utility>  // std::pair
 #include <vector>   // std::vector
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/linalg_op.cuh"  // ElementWiseTransformDevice
 #include "../../../src/common/stats.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../../src/common/linalg_op.hip.h"  // ElementWiseTransformDevice
-#include "../../../src/common/stats.hip.h"
-#endif
 #include "../helpers.h"
 #include "xgboost/base.h"                // XGBOOST_DEVICE
 #include "xgboost/context.h"             // Context

tests/cpp/common/test_threading_utils.cu

@@ -4,13 +4,8 @@
 #include <gtest/gtest.h>
 #include <thrust/copy.h>  // thrust::copy
 
-#if defined(XGBOOST_USE_CUDA)
 #include "../../../src/common/device_helpers.cuh"
 #include "../../../src/common/threading_utils.cuh"
-#elif defined(XGBOOST_USE_HIP)
-#include "../../../src/common/device_helpers.hip.h"
-#include "../../../src/common/threading_utils.hip.h"
-#endif
 
 namespace xgboost {
 namespace common {