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

namespace to reduce code

Browse Source
This commit is contained in:
Hui Liu 2023-10-27 10:51:32 -07:00
parent 4302200a33
commit 6762230d9a
26 changed files with 14 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/cuda_context.cuh
View File

@ -6,12 +6,6 @@
#include <thrust/execution_policy.h>
#include "device_helpers.cuh"
#ifdef XGBOOST_USE_HIP
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
struct CUDAContext {
private:

14
src/common/cuda_to_hip.h
View File

@ -54,4 +54,18 @@
#define cudaDevAttrMultiProcessorCount hipDeviceAttributeMultiprocessorCount
#define cudaOccupancyMaxActiveBlocksPerMultiprocessor hipOccupancyMaxActiveBlocksPerMultiprocessor
namespace thrust {
namespace hip {
}
}
namespace thrust {
namespace cuda = thrust::hip;
}
namespace hipcub {
}
namespace cub = hipcub;
#endif

6
src/common/hist_util.cu
View File

@ -26,12 +26,6 @@
#include "quantile.h"
#include "xgboost/host_device_vector.h"
#ifdef XGBOOST_USE_HIP
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::common {
constexpr float SketchContainer::kFactor;

8
src/common/hist_util.cuh
View File

@ -17,14 +17,6 @@
#include "quantile.cuh"
#include "xgboost/span.h" // for IterSpan
#if defined(XGBOOST_USE_HIP)
namespace cub = hipcub;
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::common {
namespace cuda {
/**

6
src/common/numeric.cu
View File

@ -8,12 +8,6 @@
#include "xgboost/context.h" // Context
#include "xgboost/host_device_vector.h" // HostDeviceVector
#ifdef XGBOOST_USE_HIP
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::common::cuda_impl {
double Reduce(Context const* ctx, HostDeviceVector<float> const& values) {
values.SetDevice(ctx->Device());

6
src/common/quantile.cu
View File

@ -22,12 +22,6 @@
#include "transform_iterator.h" // MakeIndexTransformIter
#include "xgboost/span.h"
#ifdef XGBOOST_USE_HIP
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace common {

6
src/common/quantile.cuh
View File

@ -10,12 +10,6 @@
#include "timer.h"
#include "categorical.h"
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace common {

2
src/common/ranking_utils.cu
View File

@ -25,8 +25,6 @@
#if defined(XGBOOST_USE_HIP)
#include <hipcub/hipcub.hpp>
namespace cub = hipcub;
#endif
namespace xgboost::ltr {

4
src/common/stats.cu
View File

@ -15,10 +15,6 @@
#include "xgboost/host_device_vector.h" // HostDeviceVector
#include "xgboost/linalg.h" // linalg::TensorView, UnravelIndex, Apply
#if defined(XGBOOST_USE_HIP)
namespace cub = hipcub;
#endif
namespace xgboost::common::cuda_impl {
void Median(Context const* ctx, linalg::TensorView<float const, 2> t,
common::OptionalWeights weights, linalg::Tensor<float, 1>* out) {

6
src/common/stats.cuh
View File

@ -23,12 +23,6 @@
#include "xgboost/context.h" // Context
#include "xgboost/span.h" // Span
#ifdef XGBOOST_USE_HIP
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace common {
namespace detail {

7
src/data/data.cu
View File

@ -15,13 +15,6 @@
#include "xgboost/json.h"
#include "xgboost/logging.h"
#if defined(XGBOOST_USE_HIP)
namespace cub = hipcub;
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace {
auto SetDeviceToPtr(void const* ptr) {

6
src/data/device_adapter.cuh
View File

@ -17,12 +17,6 @@
#include "adapter.h"
#include "array_interface.h"
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace data {

6
src/data/iterative_dmatrix.cu
View File

@ -16,12 +16,6 @@
#include "simple_batch_iterator.h"
#include "sparse_page_source.h"
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::data {
void IterativeDMatrix::InitFromCUDA(Context const* ctx, BatchParam const& p,
DataIterHandle iter_handle, float missing,

6
src/data/simple_dmatrix.cuh
View File

@ -13,12 +13,6 @@
#include "../common/error_msg.h" // for InfInData
#include "device_adapter.cuh" // for HasInfInData
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::data {
#if defined(XGBOOST_USE_CUDA)

6
src/metric/auc.cu
View File

@ -25,12 +25,6 @@
#include "xgboost/data.h"
#include "xgboost/span.h"
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace metric {
// tag the this file, used by force static link later.

6
src/metric/elementwise_metric.cu
View File

@ -30,12 +30,6 @@
#include "../common/device_helpers.cuh"
#endif // defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace metric {
// tag the this file, used by force static link later.

6
src/metric/multiclass_metric.cu
View File

@ -24,12 +24,6 @@
#include "../common/device_helpers.cuh"
#endif // XGBOOST_USE_CUDA || XGBOOST_USE_HIP
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace metric {
// tag the this file, used by force static link later.

2
src/metric/rank_metric.cu
View File

@ -26,8 +26,6 @@
#if defined(XGBOOST_USE_HIP)
#include <hipcub/hipcub.hpp>
namespace cub = hipcub;
#endif
namespace xgboost::metric {

6
src/metric/survival_metric.cu
View File

@ -25,12 +25,6 @@
#include "../common/device_helpers.cuh"
#endif // XGBOOST_USE_CUDA || XGBOOST_USE_HIP
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
using AFTParam = xgboost::common::AFTParam;
using ProbabilityDistributionType = xgboost::common::ProbabilityDistributionType;
template <typename Distribution>

5
src/objective/adaptive.cu
View File

@ -19,11 +19,6 @@
#include "xgboost/context.h"
namespace xgboost {
#if defined(XGBOOST_USE_HIP)
namespace cub = hipcub;
#endif
namespace obj {
namespace detail {
void EncodeTreeLeafDevice(Context const* ctx, common::Span<bst_node_t const> position,

2
src/objective/lambdarank_obj.cu
View File

@ -35,8 +35,6 @@
#if defined(XGBOOST_USE_HIP)
#include <hipcub/hipcub.hpp>
namespace cub = hipcub;
#endif
namespace xgboost::obj {

6
src/predictor/gpu_predictor.cu
View File

@ -29,12 +29,6 @@
#include "xgboost/tree_model.h"
#include "xgboost/tree_updater.h"
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::predictor {
DMLC_REGISTRY_FILE_TAG(gpu_predictor);

6
src/tree/fit_stump.cu
View File

@ -21,12 +21,6 @@
#include "xgboost/logging.h" // CHECK_EQ
#include "xgboost/span.h" // span
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::tree::cuda_impl {
void FitStump(Context const* ctx, MetaInfo const& info,
linalg::TensorView<GradientPair const, 2> gpair, linalg::VectorView<float> out) {

4
src/tree/gpu_hist/evaluate_splits.cu
View File

@ -24,10 +24,6 @@
#define WARP_SIZE WAVEFRONT_SIZE
#endif
#if defined(XGBOOST_USE_HIP)
namespace cub = hipcub;
#endif
namespace xgboost::tree {
// With constraints
XGBOOST_DEVICE float LossChangeMissing(const GradientPairInt64 &scan,

6
src/tree/gpu_hist/evaluator.cu
View File

@ -12,12 +12,6 @@
#include "evaluate_splits.cuh"
#include "xgboost/data.h"
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost::tree {
void GPUHistEvaluator::Reset(common::HistogramCuts const &cuts, common::Span<FeatureType const> ft,
bst_feature_t n_features, TrainParam const &param,

6
src/tree/gpu_hist/histogram.cu
View File

@ -16,12 +16,6 @@
#include "row_partitioner.cuh"
#include "xgboost/base.h"
#if defined(XGBOOST_USE_HIP)
namespace thrust {
namespace cuda = thrust::hip;
}
#endif
namespace xgboost {
namespace tree {
namespace {