From 65012b356c4cf5749ad2aceddab33fe64d3bdefa Mon Sep 17 00:00:00 2001 From: Hui Liu <96135754+amdsc21@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:13:02 -0700 Subject: [PATCH] rm some hip --- tests/cpp/common/test_device_helpers.cu | 4 - .../common/test_gpu_compressed_iterator.cu | 4 - tests/cpp/common/test_hist_util.cu | 4 - tests/cpp/common/test_span.cu | 82 ------------------- tests/cpp/common/test_stats.cc | 4 +- tests/cpp/data/test_array_interface.cu | 12 --- tests/cpp/data/test_device_adapter.cu | 4 - tests/cpp/data/test_ellpack_page.cu | 4 - tests/cpp/data/test_metainfo.cu | 12 --- tests/cpp/data/test_simple_dmatrix.cu | 5 -- tests/cpp/helpers.cc | 13 --- tests/cpp/predictor/test_gpu_predictor.cu | 4 - tests/cpp/test_learner.cc | 6 +- tests/cpp/tree/gpu_hist/test_histogram.cu | 18 ---- .../cpp/tree/gpu_hist/test_row_partitioner.cu | 6 -- tests/cpp/tree/test_gpu_hist.cu | 9 -- 16 files changed, 5 insertions(+), 186 deletions(-) diff --git a/tests/cpp/common/test_device_helpers.cu b/tests/cpp/common/test_device_helpers.cu index 13542cc16..a333b2c79 100644 --- a/tests/cpp/common/test_device_helpers.cu +++ b/tests/cpp/common/test_device_helpers.cu @@ -180,10 +180,6 @@ TEST(Allocator, OOM) { ASSERT_THROW({dh::caching_device_vector vec(size);}, dmlc::Error); ASSERT_THROW({dh::device_vector vec(size);}, dmlc::Error); // Clear last error so we don't fail subsequent tests -#if defined(XGBOOST_USE_CUDA) cudaGetLastError(); -#elif defined(XGBOOST_USE_HIP) - hipGetLastError(); -#endif } } // namespace xgboost diff --git a/tests/cpp/common/test_gpu_compressed_iterator.cu b/tests/cpp/common/test_gpu_compressed_iterator.cu index 94e695940..b56f2c862 100644 --- a/tests/cpp/common/test_gpu_compressed_iterator.cu +++ b/tests/cpp/common/test_gpu_compressed_iterator.cu @@ -36,11 +36,7 @@ struct ReadSymbolFunction { }; TEST(CompressedIterator, TestGPU) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif std::vector test_cases = {1, 3, 426, 21, 64, 256, 100000, INT32_MAX}; int num_elements = 1000; int repetitions = 1000; diff --git a/tests/cpp/common/test_hist_util.cu b/tests/cpp/common/test_hist_util.cu index 50f673a12..78c293e3c 100644 --- a/tests/cpp/common/test_hist_util.cu +++ b/tests/cpp/common/test_hist_util.cu @@ -69,11 +69,7 @@ TEST(HistUtil, SketchBatchNumElements) { size_t constexpr kCols = 10000; int device; -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaGetDevice(&device)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipGetDevice(&device)); -#endif auto avail = static_cast(dh::AvailableMemory(device) * 0.8); auto per_elem = detail::BytesPerElement(false); diff --git a/tests/cpp/common/test_span.cu b/tests/cpp/common/test_span.cu index afebcf91c..becb987d8 100644 --- a/tests/cpp/common/test_span.cu +++ b/tests/cpp/common/test_span.cu @@ -25,36 +25,20 @@ struct TestStatus { public: TestStatus () { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaMalloc(&status_, sizeof(int))); int h_status = 1; dh::safe_cuda(cudaMemcpy(status_, &h_status, sizeof(int), cudaMemcpyHostToDevice)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipMalloc(&status_, sizeof(int))); - int h_status = 1; - dh::safe_cuda(hipMemcpy(status_, &h_status, - sizeof(int), hipMemcpyHostToDevice)); -#endif } ~TestStatus() { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaFree(status_)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipFree(status_)); -#endif } int Get() { int h_status; -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaMemcpy(&h_status, status_, sizeof(int), cudaMemcpyDeviceToHost)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipMemcpy(&h_status, status_, - sizeof(int), hipMemcpyDeviceToHost)); -#endif return h_status; } @@ -112,22 +96,14 @@ TEST(GPUSpan, FromOther) { } TEST(GPUSpan, Assignment) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestAssignment{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpan, TestStatus) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestTestStatus{status.Data()}); ASSERT_EQ(status.Get(), -1); @@ -150,11 +126,7 @@ struct TestEqual { }; TEST(GPUSpan, WithTrust) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif // Not adviced to initialize span with host_vector, since h_vec.data() is // a host function. thrust::host_vector h_vec (16); @@ -191,22 +163,14 @@ TEST(GPUSpan, WithTrust) { } TEST(GPUSpan, BeginEnd) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestBeginEnd{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpan, RBeginREnd) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestRBeginREnd{status.Data()}); ASSERT_EQ(status.Get(), 1); @@ -238,22 +202,14 @@ TEST(GPUSpan, Modify) { } TEST(GPUSpan, Observers) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestObservers{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpan, Compare) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestIterCompare{status.Data()}); ASSERT_EQ(status.Get(), 1); @@ -273,11 +229,7 @@ struct TestElementAccess { }; TEST(GPUSpanDeathTest, ElementAccess) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif auto test_element_access = []() { thrust::host_vector h_vec (16); InitializeRange(h_vec.begin(), h_vec.end()); @@ -375,13 +327,8 @@ void TestFrontBack() { // make sure the termination happens inside this test. try { dh::LaunchN(1, [=] __device__(size_t) { s.front(); }); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaDeviceSynchronize()); dh::safe_cuda(cudaGetLastError()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipDeviceSynchronize()); - dh::safe_cuda(hipGetLastError()); -#endif } catch (dmlc::Error const& e) { std::terminate(); } @@ -391,13 +338,8 @@ void TestFrontBack() { { try { dh::LaunchN(1, [=] __device__(size_t) { s.back(); }); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaDeviceSynchronize()); dh::safe_cuda(cudaGetLastError()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipDeviceSynchronize()); - dh::safe_cuda(hipGetLastError()); -#endif } catch (dmlc::Error const& e) { std::terminate(); } @@ -447,66 +389,42 @@ TEST(GPUSpanDeathTest, Subspan) { } TEST(GPUSpanIter, Construct) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestIterConstruct{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpanIter, Ref) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestIterRef{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpanIter, Calculate) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestIterCalculate{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpanIter, Compare) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestIterCompare{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpan, AsBytes) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestAsBytes{status.Data()}); ASSERT_EQ(status.Get(), 1); } TEST(GPUSpan, AsWritableBytes) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif TestStatus status; dh::LaunchN(16, TestAsWritableBytes{status.Data()}); ASSERT_EQ(status.Get(), 1); diff --git a/tests/cpp/common/test_stats.cc b/tests/cpp/common/test_stats.cc index 070c9d6f1..ea785fa19 100644 --- a/tests/cpp/common/test_stats.cc +++ b/tests/cpp/common/test_stats.cc @@ -76,7 +76,7 @@ TEST(Stats, Median) { Median(&ctx, values, weights, &out); m = out(0); ASSERT_EQ(m, .5f); -#endif // defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP) +#endif // defined(XGBOOST_USE_CUDA) } { @@ -94,7 +94,7 @@ TEST(Stats, Median) { Median(&ctx, values, weights, &out); ASSERT_EQ(out(0), .5f); ASSERT_EQ(out(1), .5f); -#endif // defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP) +#endif // defined(XGBOOST_USE_CUDA) } } diff --git a/tests/cpp/data/test_array_interface.cu b/tests/cpp/data/test_array_interface.cu index 2601d52f1..00b996fb9 100644 --- a/tests/cpp/data/test_array_interface.cu +++ b/tests/cpp/data/test_array_interface.cu @@ -40,25 +40,13 @@ TEST(ArrayInterface, Stream) { TEST(ArrayInterface, Ptr) { std::vector h_data(10); ASSERT_FALSE(ArrayInterfaceHandler::IsCudaPtr(h_data.data())); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaGetLastError()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipGetLastError()); -#endif dh::device_vector d_data(10); ASSERT_TRUE(ArrayInterfaceHandler::IsCudaPtr(d_data.data().get())); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaGetLastError()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipGetLastError()); -#endif ASSERT_FALSE(ArrayInterfaceHandler::IsCudaPtr(nullptr)); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaGetLastError()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipGetLastError()); -#endif } } // namespace xgboost diff --git a/tests/cpp/data/test_device_adapter.cu b/tests/cpp/data/test_device_adapter.cu index 19e220c48..ac56e2f70 100644 --- a/tests/cpp/data/test_device_adapter.cu +++ b/tests/cpp/data/test_device_adapter.cu @@ -51,11 +51,7 @@ void TestCudfAdapter() } }); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaDeviceSynchronize()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipDeviceSynchronize()); -#endif }); } diff --git a/tests/cpp/data/test_ellpack_page.cu b/tests/cpp/data/test_ellpack_page.cu index dd3a30f7d..2d40c2507 100644 --- a/tests/cpp/data/test_ellpack_page.cu +++ b/tests/cpp/data/test_ellpack_page.cu @@ -234,11 +234,7 @@ TEST(EllpackPage, Compact) { dh::LaunchN(kCols, ReadRowFunction(impl->GetDeviceAccessor(FstCU()), current_row, row_d.data().get())); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaDeviceSynchronize()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipDeviceSynchronize()); -#endif thrust::copy(row_d.begin(), row_d.end(), row.begin()); dh::LaunchN(kCols, diff --git a/tests/cpp/data/test_metainfo.cu b/tests/cpp/data/test_metainfo.cu index 76b95f3aa..540189c0e 100644 --- a/tests/cpp/data/test_metainfo.cu +++ b/tests/cpp/data/test_metainfo.cu @@ -47,11 +47,7 @@ std::string PrepareData(std::string typestr, thrust::device_vector* out, cons } TEST(MetaInfo, FromInterface) { -#if defined(XGBOOST_USE_CUDA) cudaSetDevice(0); -#elif defined(XGBOOST_USE_HIP) - hipSetDevice(0); -#endif Context ctx; thrust::device_vector d_data; @@ -96,11 +92,7 @@ TEST(MetaInfo, GPUStridedData) { } TEST(MetaInfo, Group) { -#if defined(XGBOOST_USE_CUDA) cudaSetDevice(0); -#elif defined(XGBOOST_USE_HIP) - hipSetDevice(0); -#endif MetaInfo info; Context ctx; @@ -155,11 +147,7 @@ TEST(MetaInfo, GPUQid) { TEST(MetaInfo, DeviceExtend) { -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif size_t const kRows = 100; MetaInfo lhs, rhs; diff --git a/tests/cpp/data/test_simple_dmatrix.cu b/tests/cpp/data/test_simple_dmatrix.cu index 32083c715..321cc9e2f 100644 --- a/tests/cpp/data/test_simple_dmatrix.cu +++ b/tests/cpp/data/test_simple_dmatrix.cu @@ -115,13 +115,8 @@ TEST(SimpleDMatrix, FromColumnarWithEmptyRows) { data.resize(kRows); thrust::sequence(data.begin(), data.end(), 0); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaDeviceSynchronize()); dh::safe_cuda(cudaGetLastError()); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipDeviceSynchronize()); - dh::safe_cuda(hipGetLastError()); -#endif ASSERT_EQ(data.size(), kRows); diff --git a/tests/cpp/helpers.cc b/tests/cpp/helpers.cc index 648278b29..960eb8999 100644 --- a/tests/cpp/helpers.cc +++ b/tests/cpp/helpers.cc @@ -724,27 +724,14 @@ class RMMAllocator { int n_gpu; RMMAllocator() : n_gpu(common::AllVisibleGPUs()) { int current_device; -#if defined(XGBOOST_USE_CUDA) CHECK_EQ(cudaGetDevice(¤t_device), cudaSuccess); -#elif defined(XGBOOST_USE_HIP) - CHECK_EQ(hipGetDevice(¤t_device), hipSuccess); -#endif for (int i = 0; i < n_gpu; ++i) { -#if defined(XGBOOST_USE_CUDA) CHECK_EQ(cudaSetDevice(i), cudaSuccess); -#elif defined(XGBOOST_USE_HIP) - CHECK_EQ(hipSetDevice(i), hipSuccess); -#endif - cuda_mr.push_back(std::make_unique()); pool_mr.push_back(std::make_unique(cuda_mr[i].get())); } -#if defined(XGBOOST_USE_CUDA) CHECK_EQ(cudaSetDevice(current_device), cudaSuccess); -#elif defined(XGBOOST_USE_HIP) - CHECK_EQ(hipSetDevice(current_device), hipSuccess); -#endif } ~RMMAllocator() = default; }; diff --git a/tests/cpp/predictor/test_gpu_predictor.cu b/tests/cpp/predictor/test_gpu_predictor.cu index b15076773..d7d926cfc 100644 --- a/tests/cpp/predictor/test_gpu_predictor.cu +++ b/tests/cpp/predictor/test_gpu_predictor.cu @@ -218,11 +218,7 @@ TEST_F(MGPUPredictorTest, LesserFeaturesColumnSplit) { // Very basic test of empty model TEST(GPUPredictor, ShapStump) { -#if defined(XGBOOST_USE_CUDA) cudaSetDevice(0); -#elif defined(XGBOOST_USE_HIP) - hipSetDevice(0); -#endif auto ctx = MakeCUDACtx(0); LearnerModelParam mparam{MakeMP(1, .5, 1, ctx.Device())}; diff --git a/tests/cpp/test_learner.cc b/tests/cpp/test_learner.cc index 7c4f10b6d..fc9779813 100644 --- a/tests/cpp/test_learner.cc +++ b/tests/cpp/test_learner.cc @@ -785,7 +785,7 @@ TEST(ColumnSplitColumnSampler, Approx) { TestColumnSplitColumnSampler("approx", TEST(ColumnSplitColumnSampler, Hist) { TestColumnSplitColumnSampler("hist", false); } -#if defined(XGBOOST_USE_CUDA) +#if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP) TEST(MGPUColumnSplitColumnSampler, GPUApprox) { TestColumnSplitColumnSampler("approx", true); } TEST(MGPUColumnSplitColumnSampler, GPUHist) { TestColumnSplitColumnSampler("hist", true); } @@ -799,7 +799,7 @@ TEST(ColumnSplitInteractionConstraints, Hist) { TestColumnSplitInteractionConstraints("hist", false); } -#if defined(XGBOOST_USE_CUDA) +#if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP) TEST(MGPUColumnSplitInteractionConstraints, GPUApprox) { TestColumnSplitInteractionConstraints("approx", true); } @@ -817,7 +817,7 @@ TEST(ColumnSplitMonotoneConstraints, Hist) { TestColumnSplitMonotoneConstraints("hist", false); } -#if defined(XGBOOST_USE_CUDA) +#if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP) TEST(MGPUColumnSplitMonotoneConstraints, GPUApprox) { TestColumnSplitMonotoneConstraints("approx", true); } diff --git a/tests/cpp/tree/gpu_hist/test_histogram.cu b/tests/cpp/tree/gpu_hist/test_histogram.cu index 3e6d24a93..430194d94 100644 --- a/tests/cpp/tree/gpu_hist/test_histogram.cu +++ b/tests/cpp/tree/gpu_hist/test_histogram.cu @@ -48,15 +48,9 @@ void TestDeterministicHistogram(bool is_dense, int shm_size) { d_histogram, quantiser); std::vector histogram_h(num_bins); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaMemcpy(histogram_h.data(), d_histogram.data(), num_bins * sizeof(GradientPairInt64), cudaMemcpyDeviceToHost)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipMemcpy(histogram_h.data(), d_histogram.data(), - num_bins * sizeof(GradientPairInt64), - hipMemcpyDeviceToHost)); -#endif for (size_t i = 0; i < kRounds; ++i) { dh::device_vector new_histogram(num_bins); @@ -68,15 +62,9 @@ void TestDeterministicHistogram(bool is_dense, int shm_size) { d_new_histogram, quantiser); std::vector new_histogram_h(num_bins); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaMemcpy(new_histogram_h.data(), d_new_histogram.data(), num_bins * sizeof(GradientPairInt64), cudaMemcpyDeviceToHost)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipMemcpy(new_histogram_h.data(), d_new_histogram.data(), - num_bins * sizeof(GradientPairInt64), - hipMemcpyDeviceToHost)); -#endif for (size_t j = 0; j < new_histogram_h.size(); ++j) { ASSERT_EQ(new_histogram_h[j].GetQuantisedGrad(), histogram_h[j].GetQuantisedGrad()); ASSERT_EQ(new_histogram_h[j].GetQuantisedHess(), histogram_h[j].GetQuantisedHess()); @@ -96,15 +84,9 @@ void TestDeterministicHistogram(bool is_dense, int shm_size) { dh::ToSpan(baseline), quantiser); std::vector baseline_h(num_bins); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaMemcpy(baseline_h.data(), baseline.data().get(), num_bins * sizeof(GradientPairInt64), cudaMemcpyDeviceToHost)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipMemcpy(baseline_h.data(), baseline.data().get(), - num_bins * sizeof(GradientPairInt64), - hipMemcpyDeviceToHost)); -#endif for (size_t i = 0; i < baseline.size(); ++i) { EXPECT_NEAR(baseline_h[i].GetQuantisedGrad(), histogram_h[i].GetQuantisedGrad(), diff --git a/tests/cpp/tree/gpu_hist/test_row_partitioner.cu b/tests/cpp/tree/gpu_hist/test_row_partitioner.cu index d8b085856..082f8d946 100644 --- a/tests/cpp/tree/gpu_hist/test_row_partitioner.cu +++ b/tests/cpp/tree/gpu_hist/test_row_partitioner.cu @@ -70,15 +70,9 @@ void TestSortPositionBatch(const std::vector& ridx_in, const std::vector), cudaMemcpyDefault, nullptr)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipMemcpyAsync(d_batch_info.data().get(), h_batch_info.data(), - h_batch_info.size() * sizeof(PerNodeData), hipMemcpyDefault, - nullptr)); -#endif dh::device_vector tmp; SortPositionBatch(dh::ToSpan(d_batch_info), dh::ToSpan(ridx), dh::ToSpan(ridx_tmp), dh::ToSpan(counts), diff --git a/tests/cpp/tree/test_gpu_hist.cu b/tests/cpp/tree/test_gpu_hist.cu index e06d1b9a9..b609dd891 100644 --- a/tests/cpp/tree/test_gpu_hist.cu +++ b/tests/cpp/tree/test_gpu_hist.cu @@ -31,11 +31,7 @@ namespace xgboost::tree { TEST(GpuHist, DeviceHistogram) { // Ensures that node allocates correctly after reaching `kStopGrowingSize`. -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaSetDevice(0)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipSetDevice(0)); -#endif constexpr size_t kNBins = 128; constexpr int kNNodes = 4; constexpr size_t kStopGrowing = kNNodes * kNBins * 2u; @@ -138,13 +134,8 @@ void TestBuildHist(bool use_shared_memory_histograms) { // d_hist.data stored in float, not gradient pair thrust::host_vector h_result (node_histogram.size()); -#if defined(XGBOOST_USE_CUDA) dh::safe_cuda(cudaMemcpy(h_result.data(), node_histogram.data(), node_histogram.size_bytes(), cudaMemcpyDeviceToHost)); -#elif defined(XGBOOST_USE_HIP) - dh::safe_cuda(hipMemcpy(h_result.data(), node_histogram.data(), node_histogram.size_bytes(), - hipMemcpyDeviceToHost)); -#endif std::vector solution = GetHostHistGpair(); for (size_t i = 0; i < h_result.size(); ++i) {