Skip to content

GitLab

Commit 61ec4f1a authored by Jeff Daily's avatar Jeff Daily
Browse files

[ROCm] re-add support for ROCm builds 

Previously #6086 added ROCm support but after numerous rebases it lost
critical changes. This PR restores the ROCm build.

There are many source file changes but most were automated using the
following:

```bash
for f in `grep -rl '#ifdef USE_CUDA'`
do
    sed -i 's@#ifdef USE_CUDA@#if defined(USE_CUDA) || defined(USE_ROCM)@g' $f
done

for f in `grep -rl '#endif  // USE_CUDA'`
do
    sed -i 's@#endif  // USE_CUDA@#endif  // USE_CUDA || USE_ROCM@g' $f
done
```
parent 336a77df
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
src/io/multi_val_sparse_bin.hpp
View file @ 61ec4f1a
......@@ -410,13 +410,13 @@ class MultiValSparseBin : public MultiValBin {
MultiValSparseBin<INDEX_T, VAL_T>* Clone() override;
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
const void* GetRowWiseData(uint8_t* bit_type,
size_t* total_size,
bool* is_sparse,
const void** out_data_ptr,
uint8_t* data_ptr_bit_type) const override;
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
private:
data_size_t num_data_;
......
src/io/train_share_states.cpp
View file @ 61ec4f1a
......@@ -503,9 +503,9 @@ void TrainingShareStates::CalcBinOffsets(const std::vector<std::unique_ptr<Featu
}
num_hist_total_bin_ = static_cast<int>(feature_hist_offsets_.back());
}
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
column_hist_offsets_ = *offsets;
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
}
void TrainingShareStates::SetMultiValBin(MultiValBin* bin, data_size_t num_data,
......
src/io/tree.cpp
View file @ 61ec4f1a
......@@ -53,9 +53,9 @@ Tree::Tree(int max_leaves, bool track_branch_features, bool is_linear)
leaf_features_.resize(max_leaves_);
leaf_features_inner_.resize(max_leaves_);
}
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
is_cuda_tree_ = false;
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
}
int Tree::Split(int leaf, int feature, int real_feature, uint32_t threshold_bin,
......@@ -740,9 +740,9 @@ Tree::Tree(const char* str, size_t* used_len) {
leaf_count_.resize(num_leaves_);
}
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
is_cuda_tree_ = false;
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
if ((num_leaves_ <= 1) && !is_linear_) {
return;
......
src/metric/cuda/cuda_binary_metric.cpp
View file @ 61ec4f1a
......@@ -4,7 +4,7 @@
* license information.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include "cuda_binary_metric.hpp"
......@@ -28,4 +28,4 @@ std::vector<double> CUDABinaryMetricInterface<HOST_METRIC, CUDA_METRIC>::Eval(co
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/metric/cuda/cuda_binary_metric.hpp
View file @ 61ec4f1a
......@@ -7,7 +7,7 @@
#ifndef LIGHTGBM_METRIC_CUDA_CUDA_BINARY_METRIC_HPP_
#define LIGHTGBM_METRIC_CUDA_CUDA_BINARY_METRIC_HPP_
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <LightGBM/cuda/cuda_metric.hpp>
#include <LightGBM/cuda/cuda_utils.hu>
......@@ -52,6 +52,6 @@ class CUDABinaryLoglossMetric: public CUDABinaryMetricInterface<BinaryLoglossMet
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
#endif // LIGHTGBM_METRIC_CUDA_CUDA_BINARY_METRIC_HPP_
src/metric/cuda/cuda_pointwise_metric.cpp
View file @ 61ec4f1a
......@@ -4,7 +4,7 @@
* license information.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include "cuda_binary_metric.hpp"
#include "cuda_pointwise_metric.hpp"
......@@ -44,4 +44,4 @@ template void CUDAPointwiseMetricInterface<TweedieMetric, CUDATweedieMetric>::In
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/metric/cuda/cuda_pointwise_metric.cu
View file @ 61ec4f1a
......@@ -5,7 +5,7 @@
* Modifications Copyright(C) 2023 Advanced Micro Devices, Inc. All rights reserved.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <LightGBM/cuda/cuda_algorithms.hpp>
#include <LightGBM/cuda/cuda_rocm_interop.h>
......@@ -77,4 +77,4 @@ template void CUDAPointwiseMetricInterface<TweedieMetric, CUDATweedieMetric>::La
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/metric/cuda/cuda_pointwise_metric.hpp
View file @ 61ec4f1a
......@@ -7,7 +7,7 @@
#ifndef LIGHTGBM_METRIC_CUDA_CUDA_POINTWISE_METRIC_HPP_
#define LIGHTGBM_METRIC_CUDA_CUDA_POINTWISE_METRIC_HPP_
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <LightGBM/cuda/cuda_metric.hpp>
#include <LightGBM/cuda/cuda_utils.hu>
......@@ -40,6 +40,6 @@ class CUDAPointwiseMetricInterface: public CUDAMetricInterface<HOST_METRIC> {
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
#endif // LIGHTGBM_METRIC_CUDA_CUDA_POINTWISE_METRIC_HPP_
src/metric/cuda/cuda_regression_metric.cpp
View file @ 61ec4f1a
......@@ -4,7 +4,7 @@
* license information.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <vector>
......@@ -49,4 +49,4 @@ CUDATweedieMetric::CUDATweedieMetric(const Config& config): CUDARegressionMetric
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/metric/cuda/cuda_regression_metric.hpp
View file @ 61ec4f1a
......@@ -7,7 +7,7 @@
#ifndef LIGHTGBM_METRIC_CUDA_CUDA_REGRESSION_METRIC_HPP_
#define LIGHTGBM_METRIC_CUDA_CUDA_REGRESSION_METRIC_HPP_
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <LightGBM/cuda/cuda_metric.hpp>
#include <LightGBM/cuda/cuda_utils.hu>
......@@ -210,6 +210,6 @@ class CUDATweedieMetric : public CUDARegressionMetricInterface<TweedieMetric, CU
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
#endif // LIGHTGBM_METRIC_CUDA_CUDA_REGRESSION_METRIC_HPP_
src/metric/metric.cpp
View file @ 61ec4f1a
......@@ -17,7 +17,7 @@
namespace LightGBM {
Metric* Metric::CreateMetric(const std::string& type, const Config& config) {
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
if (config.device_type == std::string("cuda") && config.boosting == std::string("gbdt")) {
if (type == std::string("l2")) {
return new CUDAL2Metric(config);
......@@ -78,7 +78,7 @@ Metric* Metric::CreateMetric(const std::string& type, const Config& config) {
return new CUDATweedieMetric(config);
}
} else {
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
if (type == std::string("l2")) {
return new L2Metric(config);
} else if (type == std::string("rmse")) {
......@@ -126,9 +126,9 @@ Metric* Metric::CreateMetric(const std::string& type, const Config& config) {
} else if (type == std::string("tweedie")) {
return new TweedieMetric(config);
}
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
}
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
return nullptr;
}
......
src/objective/cuda/cuda_binary_objective.cpp
View file @ 61ec4f1a
......@@ -4,7 +4,7 @@
* license information.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include "cuda_binary_objective.hpp"
......@@ -61,4 +61,4 @@ void CUDABinaryLogloss::Init(const Metadata& metadata, data_size_t num_data) {
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/objective/cuda/cuda_binary_objective.cu
View file @ 61ec4f1a
......@@ -5,7 +5,7 @@
* Modifications Copyright(C) 2023 Advanced Micro Devices, Inc. All rights reserved.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include "cuda_binary_objective.hpp"
......@@ -209,4 +209,4 @@ void CUDABinaryLogloss::LaunchResetOVACUDALabelKernel() const {
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/objective/cuda/cuda_binary_objective.hpp
View file @ 61ec4f1a
......@@ -7,7 +7,7 @@
#ifndef LIGHTGBM_OBJECTIVE_CUDA_CUDA_BINARY_OBJECTIVE_HPP_
#define LIGHTGBM_OBJECTIVE_CUDA_CUDA_BINARY_OBJECTIVE_HPP_
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#define GET_GRADIENTS_BLOCK_SIZE_BINARY (1024)
#define CALC_INIT_SCORE_BLOCK_SIZE_BINARY (1024)
......@@ -58,6 +58,6 @@ class CUDABinaryLogloss : public CUDAObjectiveInterface<BinaryLogloss> {
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
#endif // LIGHTGBM_OBJECTIVE_CUDA_CUDA_BINARY_OBJECTIVE_HPP_
src/objective/cuda/cuda_multiclass_objective.cpp
View file @ 61ec4f1a
......@@ -3,7 +3,7 @@
* Licensed under the MIT License. See LICENSE file in the project root for license information.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include "cuda_multiclass_objective.hpp"
......@@ -59,4 +59,4 @@ const double* CUDAMulticlassOVA::ConvertOutputCUDA(const data_size_t num_data, c
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/objective/cuda/cuda_multiclass_objective.cu
View file @ 61ec4f1a
......@@ -3,7 +3,7 @@
* Licensed under the MIT License. See LICENSE file in the project root for license information.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <algorithm>
......@@ -105,4 +105,4 @@ const double* CUDAMulticlassSoftmax::LaunchConvertOutputCUDAKernel(
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/objective/cuda/cuda_multiclass_objective.hpp
View file @ 61ec4f1a
......@@ -5,7 +5,7 @@
#ifndef LIGHTGBM_OBJECTIVE_CUDA_CUDA_MULTICLASS_OBJECTIVE_HPP_
#define LIGHTGBM_OBJECTIVE_CUDA_CUDA_MULTICLASS_OBJECTIVE_HPP_
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <LightGBM/cuda/cuda_objective_function.hpp>
......@@ -74,5 +74,5 @@ class CUDAMulticlassOVA: public CUDAObjectiveInterface<MulticlassOVA> {
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
#endif // LIGHTGBM_OBJECTIVE_CUDA_CUDA_MULTICLASS_OBJECTIVE_HPP_
src/objective/cuda/cuda_rank_objective.cpp
View file @ 61ec4f1a
......@@ -4,7 +4,7 @@
* license information.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include <string>
#include <vector>
......@@ -64,4 +64,4 @@ void CUDARankXENDCG::GenerateItemRands() const {
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/objective/cuda/cuda_rank_objective.cu
View file @ 61ec4f1a
......@@ -5,7 +5,7 @@
* Modifications Copyright(C) 2023 Advanced Micro Devices, Inc. All rights reserved.
*/
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#include "cuda_rank_objective.hpp"
......@@ -662,4 +662,4 @@ void CUDARankXENDCG::LaunchGetGradientsKernel(const double* score, score_t* grad
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
src/objective/cuda/cuda_rank_objective.hpp
View file @ 61ec4f1a
......@@ -7,7 +7,7 @@
#ifndef LIGHTGBM_OBJECTIVE_CUDA_CUDA_RANK_OBJECTIVE_HPP_
#define LIGHTGBM_OBJECTIVE_CUDA_CUDA_RANK_OBJECTIVE_HPP_
#ifdef USE_CUDA
#if defined(USE_CUDA) || defined(USE_ROCM)
#define NUM_QUERY_PER_BLOCK (10)
......@@ -118,5 +118,5 @@ class CUDARankXENDCG : public CUDALambdaRankObjectiveInterface<RankXENDCG> {
} // namespace LightGBM
#endif // USE_CUDA
#endif // USE_CUDA || USE_ROCM
#endif // LIGHTGBM_OBJECTIVE_CUDA_CUDA_RANK_OBJECTIVE_HPP_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment