Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix random

Browse Source
This commit is contained in:
Hui Liu 2024-01-21 12:48:41 -08:00
parent 9759e28e6a
commit 1e0ccf7b87
7 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -256,9 +256,10 @@ if (USE_HIP)
find_package(rocthrust REQUIRED) find_package(rocthrust REQUIRED)
find_package(hipcub REQUIRED) find_package(hipcub REQUIRED)
set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -I${HIP_INCLUDE_DIRS} -I${HIP_INCLUDE_DIRS}/hip") set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -I${HIP_INCLUDE_DIRS}")
set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -Wunused-result -w") set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -Wunused-result -w")
set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -D__HIP_PLATFORM_AMD__") set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -D__HIP_PLATFORM_AMD__")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HIP_INCLUDE_DIRS}")
add_subdirectory(${PROJECT_SOURCE_DIR}/rocgputreeshap) add_subdirectory(${PROJECT_SOURCE_DIR}/rocgputreeshap)
endif (USE_HIP) endif (USE_HIP)

2
src/c_api/c_api.cu
View File

@ -55,8 +55,10 @@ void XGBBuildInfoDevice(Json *p_info) {
info["RCCL_VERSION"] = v; info["RCCL_VERSION"] = v;
info["NCCL_VERSION"] = v; info["NCCL_VERSION"] = v;
#if defined(XGBOOST_USE_DLOPEN_RCCL) #if defined(XGBOOST_USE_DLOPEN_RCCL)
info["USE_DLOPEN_NCCL"] = Boolean{true};
info["USE_DLOPEN_RCCL"] = Boolean{true}; info["USE_DLOPEN_RCCL"] = Boolean{true};
#else #else
info["USE_DLOPEN_NCCL"] = Boolean{false};
info["USE_DLOPEN_RCCL"] = Boolean{false}; info["USE_DLOPEN_RCCL"] = Boolean{false};
#endif // defined(XGBOOST_USE_DLOPEN_RCCL) #endif // defined(XGBOOST_USE_DLOPEN_RCCL)
#else #else

1
src/collective/nccl_stub.cc
View File

@ -13,7 +13,6 @@
#include <thrust/system_error.h> // for system_error #include <thrust/system_error.h> // for system_error
#elif defined(XGBOOST_USE_RCCL) #elif defined(XGBOOST_USE_RCCL)
#include "../common/cuda_to_hip.h" #include "../common/cuda_to_hip.h"
#include "../common/device_helpers.hip.h"
#include <hip/hip_runtime_api.h> // for cudaPeekAtLastError #include <hip/hip_runtime_api.h> // for cudaPeekAtLastError
#include <dlfcn.h> // for dlclose, dlsym, dlopen #include <dlfcn.h> // for dlclose, dlsym, dlopen
#include <rccl.h> #include <rccl.h>

10
src/collective/nccl_stub.h
View File

@ -9,7 +9,15 @@
#include <nccl.h> #include <nccl.h>
#elif defined(XGBOOST_USE_RCCL) #elif defined(XGBOOST_USE_RCCL)
#include "../common/cuda_to_hip.h" #include "../common/cuda_to_hip.h"
#include "../common/device_helpers.cuh"
#ifndef __HIP_PLATFORM_AMD__
#define __HIP_PLATFORM_AMD__
#endif
#ifndef THRUST_DEVICE_SYSTEM
#define THRUST_DEVICE_SYSTEM THRUST_DEVICE_SYSTEM_HIP
#endif
#include <hip/hip_runtime_api.h> #include <hip/hip_runtime_api.h>
#include <rccl.h> #include <rccl.h>
#endif #endif

2
src/common/random.cc
View File

@ -19,7 +19,7 @@ std::shared_ptr<HostDeviceVector<bst_feature_t>> ColumnSampler::ColSample(
auto p_new_features = std::make_shared<HostDeviceVector<bst_feature_t>>(); auto p_new_features = std::make_shared<HostDeviceVector<bst_feature_t>>();
if (ctx_->IsCUDA()) { if (ctx_->IsCUDA()) {
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
cuda_impl::SampleFeature(ctx_, n, p_features, p_new_features, this->feature_weights_, cuda_impl::SampleFeature(ctx_, n, p_features, p_new_features, this->feature_weights_,
&this->weight_buffer_, &this->idx_buffer_, &rng_); &this->weight_buffer_, &this->idx_buffer_, &rng_);
return p_new_features; return p_new_features;

2
src/common/random.h
View File

@ -180,7 +180,7 @@ class ColumnSampler {
if (ctx->IsCPU()) { if (ctx->IsCPU()) {
std::iota(feature_set_tree_->HostVector().begin(), feature_set_tree_->HostVector().end(), 0); std::iota(feature_set_tree_->HostVector().begin(), feature_set_tree_->HostVector().end(), 0);
} else { } else {
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
cuda_impl::InitFeatureSet(ctx, feature_set_tree_); cuda_impl::InitFeatureSet(ctx, feature_set_tree_);
#else #else
AssertGPUSupport(); AssertGPUSupport();

4
src/common/random.hip Normal file
View File

@ -0,0 +1,4 @@
#if defined(XGBOOST_USE_HIP)
#include "random.cu"
#endif