Commit 548cec82 authored by Jeff Daily's avatar Jeff Daily
Browse files

Merge branch 'master' into rocm3

parents 2f7bd8ef 5dbfcdc4
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
* Modifications Copyright(C) 2023 Advanced Micro Devices, Inc. All rights reserved. * Modifications Copyright(C) 2023 Advanced Micro Devices, Inc. All rights reserved.
*/ */
#ifndef LIGHTGBM_CUDA_VECTOR_CUDAHOST_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_CUDA_VECTOR_CUDAHOST_H_
#define LIGHTGBM_CUDA_VECTOR_CUDAHOST_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_CUDA_VECTOR_CUDAHOST_H_
#include <LightGBM/utils/common.h> #include <LightGBM/utils/common.h>
...@@ -94,4 +94,4 @@ bool operator!=(const CHAllocator<T>&, const CHAllocator<U>&); ...@@ -94,4 +94,4 @@ bool operator!=(const CHAllocator<T>&, const CHAllocator<U>&);
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_CUDA_VECTOR_CUDAHOST_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_CUDA_VECTOR_CUDAHOST_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_DATASET_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_DATASET_H_
#define LIGHTGBM_DATASET_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_DATASET_H_
#include <LightGBM/arrow.h> #include <LightGBM/arrow.h>
#include <LightGBM/config.h> #include <LightGBM/config.h>
...@@ -1071,4 +1071,4 @@ class Dataset { ...@@ -1071,4 +1071,4 @@ class Dataset {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_DATA_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_DATASET_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_DATASET_LOADER_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_DATASET_LOADER_H_
#define LIGHTGBM_DATASET_LOADER_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_DATASET_LOADER_H_
#include <LightGBM/dataset.h> #include <LightGBM/dataset.h>
...@@ -107,4 +107,4 @@ class DatasetLoader { ...@@ -107,4 +107,4 @@ class DatasetLoader {
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_DATASET_LOADER_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_DATASET_LOADER_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2017 Microsoft Corporation. All rights reserved. * Copyright (c) 2017 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_EXPORT_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_EXPORT_H_
#define LIGHTGBM_EXPORT_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_EXPORT_H_
/** Macros for exporting symbols in MSVC/GCC/CLANG **/ /** Macros for exporting symbols in MSVC/GCC/CLANG **/
...@@ -22,4 +22,4 @@ ...@@ -22,4 +22,4 @@
#define LIGHTGBM_C_EXPORT LIGHTGBM_EXTERN_C #define LIGHTGBM_C_EXPORT LIGHTGBM_EXTERN_C
#endif #endif
#endif /** LIGHTGBM_EXPORT_H_ **/ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_EXPORT_H_
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Licensed under the MIT License. See LICENSE file in the project root for * Licensed under the MIT License. See LICENSE file in the project root for
* license information. * license information.
*/ */
#ifndef LIGHTGBM_FEATURE_GROUP_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_FEATURE_GROUP_H_
#define LIGHTGBM_FEATURE_GROUP_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_FEATURE_GROUP_H_
#include <LightGBM/bin.h> #include <LightGBM/bin.h>
#include <LightGBM/meta.h> #include <LightGBM/meta.h>
...@@ -629,4 +629,4 @@ class FeatureGroup { ...@@ -629,4 +629,4 @@ class FeatureGroup {
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_FEATURE_GROUP_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_FEATURE_GROUP_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_META_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_META_H_
#define LIGHTGBM_META_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_META_H_
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>
...@@ -83,9 +83,9 @@ const int kAlignedSize = 32; ...@@ -83,9 +83,9 @@ const int kAlignedSize = 32;
// Refer to https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4127?view=vs-2019 // Refer to https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4127?view=vs-2019
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4127) #pragma warning(disable : 4127)
#endif #endif
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_META_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_META_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_METRIC_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_METRIC_H_
#define LIGHTGBM_METRIC_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_METRIC_H_
#include <LightGBM/config.h> #include <LightGBM/config.h>
#include <LightGBM/dataset.h> #include <LightGBM/dataset.h>
...@@ -142,4 +142,4 @@ class DCGCalculator { ...@@ -142,4 +142,4 @@ class DCGCalculator {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_METRIC_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_METRIC_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_NETWORK_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_NETWORK_H_
#define LIGHTGBM_NETWORK_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_NETWORK_H_
#include <LightGBM/config.h> #include <LightGBM/config.h>
#include <LightGBM/meta.h> #include <LightGBM/meta.h>
...@@ -314,4 +314,4 @@ class Network { ...@@ -314,4 +314,4 @@ class Network {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_NETWORK_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_NETWORK_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_OBJECTIVE_FUNCTION_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_OBJECTIVE_FUNCTION_H_
#define LIGHTGBM_OBJECTIVE_FUNCTION_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_OBJECTIVE_FUNCTION_H_
#include <LightGBM/config.h> #include <LightGBM/config.h>
#include <LightGBM/dataset.h> #include <LightGBM/dataset.h>
...@@ -123,4 +123,4 @@ class ObjectiveFunction { ...@@ -123,4 +123,4 @@ class ObjectiveFunction {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_OBJECTIVE_FUNCTION_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_OBJECTIVE_FUNCTION_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2017 Microsoft Corporation. All rights reserved. * Copyright (c) 2017 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_PREDICTION_EARLY_STOP_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_PREDICTION_EARLY_STOP_H_
#define LIGHTGBM_PREDICTION_EARLY_STOP_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_PREDICTION_EARLY_STOP_H_
#include <LightGBM/export.h> #include <LightGBM/export.h>
...@@ -33,4 +33,4 @@ LIGHTGBM_EXPORT PredictionEarlyStopInstance CreatePredictionEarlyStopInstance(co ...@@ -33,4 +33,4 @@ LIGHTGBM_EXPORT PredictionEarlyStopInstance CreatePredictionEarlyStopInstance(co
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_PREDICTION_EARLY_STOP_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_PREDICTION_EARLY_STOP_H_
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_SAMPLE_STRATEGY_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_SAMPLE_STRATEGY_H_
#define LIGHTGBM_SAMPLE_STRATEGY_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_SAMPLE_STRATEGY_H_
#include <LightGBM/cuda/cuda_utils.hu> #include <LightGBM/cuda/cuda_utils.hu>
#include <LightGBM/utils/random.h> #include <LightGBM/utils/random.h>
...@@ -84,4 +84,4 @@ class SampleStrategy { ...@@ -84,4 +84,4 @@ class SampleStrategy {
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_SAMPLE_STRATEGY_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_SAMPLE_STRATEGY_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_TRAIN_SHARE_STATES_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_TRAIN_SHARE_STATES_H_
#define LIGHTGBM_TRAIN_SHARE_STATES_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_TRAIN_SHARE_STATES_H_
#include <LightGBM/bin.h> #include <LightGBM/bin.h>
#include <LightGBM/feature_group.h> #include <LightGBM/feature_group.h>
...@@ -363,4 +363,4 @@ struct TrainingShareStates { ...@@ -363,4 +363,4 @@ struct TrainingShareStates {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_TRAIN_SHARE_STATES_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_TRAIN_SHARE_STATES_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_TREE_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_TREE_H_
#define LIGHTGBM_TREE_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_TREE_H_
#include <LightGBM/dataset.h> #include <LightGBM/dataset.h>
#include <LightGBM/meta.h> #include <LightGBM/meta.h>
...@@ -728,4 +728,4 @@ inline int Tree::GetLeafByMap(const std::unordered_map<int, double>& feature_val ...@@ -728,4 +728,4 @@ inline int Tree::GetLeafByMap(const std::unordered_map<int, double>& feature_val
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_TREE_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_TREE_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_TREE_LEARNER_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_TREE_LEARNER_H_
#define LIGHTGBM_TREE_LEARNER_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_TREE_LEARNER_H_
#include <LightGBM/config.h> #include <LightGBM/config.h>
#include <LightGBM/meta.h> #include <LightGBM/meta.h>
...@@ -115,4 +115,4 @@ class TreeLearner { ...@@ -115,4 +115,4 @@ class TreeLearner {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_TREE_LEARNER_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_TREE_LEARNER_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_UTILS_ARRAY_AGRS_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_ARRAY_ARGS_H_
#define LIGHTGBM_UTILS_ARRAY_AGRS_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_ARRAY_ARGS_H_
#include <LightGBM/utils/openmp_wrapper.h> #include <LightGBM/utils/openmp_wrapper.h>
#include <LightGBM/utils/threading.h> #include <LightGBM/utils/threading.h>
...@@ -205,4 +205,4 @@ class ArrayArgs { ...@@ -205,4 +205,4 @@ class ArrayArgs {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_UTILS_ARRAY_AGRS_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_ARRAY_ARGS_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2022 Microsoft Corporation. All rights reserved. * Copyright (c) 2022 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_UTILS_BINARY_WRITER_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_BINARY_WRITER_H_
#define LIGHTGBM_UTILS_BINARY_WRITER_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_BINARY_WRITER_H_
#include <cstdlib> #include <cstdlib>
#include <vector> #include <vector>
...@@ -55,4 +55,4 @@ struct BinaryWriter { ...@@ -55,4 +55,4 @@ struct BinaryWriter {
}; };
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_UTILS_BINARY_WRITER_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_BINARY_WRITER_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2022 Microsoft Corporation. All rights reserved. * Copyright (c) 2022 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_UTILS_BYTE_BUFFER_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_BYTE_BUFFER_H_
#define LIGHTGBM_UTILS_BYTE_BUFFER_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_BYTE_BUFFER_H_
#include <LightGBM/export.h> #include <LightGBM/export.h>
#include <LightGBM/utils/binary_writer.h> #include <LightGBM/utils/binary_writer.h>
...@@ -59,4 +59,4 @@ struct ByteBuffer final : public BinaryWriter { ...@@ -59,4 +59,4 @@ struct ByteBuffer final : public BinaryWriter {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_UTILS_BYTE_BUFFER_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_BYTE_BUFFER_H_
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* *
* Author: Alberto Ferreira * Author: Alberto Ferreira
*/ */
#ifndef LIGHTGBM_UTILS_CHUNKED_ARRAY_HPP_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_CHUNKED_ARRAY_HPP_
#define LIGHTGBM_UTILS_CHUNKED_ARRAY_HPP_ #define LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_CHUNKED_ARRAY_HPP_
#include <LightGBM/utils/log.h> #include <LightGBM/utils/log.h>
...@@ -257,4 +257,4 @@ class ChunkedArray { ...@@ -257,4 +257,4 @@ class ChunkedArray {
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_UTILS_CHUNKED_ARRAY_HPP_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_CHUNKED_ARRAY_HPP_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2016 Microsoft Corporation. All rights reserved. * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_UTILS_COMMON_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_COMMON_H_
#define LIGHTGBM_UTILS_COMMON_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_COMMON_H_
#include <LightGBM/utils/json11.h> #include <LightGBM/utils/json11.h>
#include <LightGBM/utils/log.h> #include <LightGBM/utils/log.h>
...@@ -1272,4 +1272,4 @@ inline static std::string ArrayToString(const std::vector<T>& arr, size_t n) { ...@@ -1272,4 +1272,4 @@ inline static std::string ArrayToString(const std::vector<T>& arr, size_t n) {
} // namespace LightGBM } // namespace LightGBM
#endif // LIGHTGBM_UTILS_COMMON_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_COMMON_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright (c) 2018 Microsoft Corporation. All rights reserved. * Copyright (c) 2018 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information. * Licensed under the MIT License. See LICENSE file in the project root for license information.
*/ */
#ifndef LIGHTGBM_UTILS_FILE_IO_H_ #ifndef LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_FILE_IO_H_
#define LIGHTGBM_UTILS_FILE_IO_H_ #define LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_FILE_IO_H_
#include <LightGBM/utils/binary_writer.h> #include <LightGBM/utils/binary_writer.h>
...@@ -75,4 +75,4 @@ struct VirtualFileReader { ...@@ -75,4 +75,4 @@ struct VirtualFileReader {
} // namespace LightGBM } // namespace LightGBM
#endif // LightGBM_UTILS_FILE_IO_H_ #endif // LIGHTGBM_INCLUDE_LIGHTGBM_UTILS_FILE_IO_H_
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