Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tianlh
LightGBM-DCU
Commits
5bee6489
Unverified
Commit
5bee6489
authored
Aug 16, 2018
by
Guolin Ke
Committed by
GitHub
Aug 16, 2018
Browse files
fix include (#1586)
* fix include * reduce dependency on header file * fix build
parent
ad7738ac
Changes
26
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
66 additions
and
54 deletions
+66
-54
include/LightGBM/R_object_helper.h
include/LightGBM/R_object_helper.h
+1
-0
include/LightGBM/bin.h
include/LightGBM/bin.h
+3
-1
include/LightGBM/c_api.h
include/LightGBM/c_api.h
+6
-22
include/LightGBM/lightgbm_R.h
include/LightGBM/lightgbm_R.h
+2
-3
include/LightGBM/metric.h
include/LightGBM/metric.h
+3
-0
include/LightGBM/utils/file_io.h
include/LightGBM/utils/file_io.h
+4
-0
src/c_api.cpp
src/c_api.cpp
+20
-2
src/io/bin.cpp
src/io/bin.cpp
+3
-2
src/io/dataset_loader.cpp
src/io/dataset_loader.cpp
+2
-1
src/io/file_io.cpp
src/io/file_io.cpp
+1
-1
src/io/parser.hpp
src/io/parser.hpp
+1
-1
src/lightgbm_R.cpp
src/lightgbm_R.cpp
+7
-5
src/metric/binary_metric.hpp
src/metric/binary_metric.hpp
+2
-2
src/metric/map_metric.hpp
src/metric/map_metric.hpp
+1
-2
src/metric/multiclass_metric.hpp
src/metric/multiclass_metric.hpp
+2
-2
src/metric/rank_metric.hpp
src/metric/rank_metric.hpp
+2
-3
src/metric/regression_metric.hpp
src/metric/regression_metric.hpp
+2
-2
src/metric/xentropy_metric.hpp
src/metric/xentropy_metric.hpp
+1
-2
src/network/linkers.h
src/network/linkers.h
+2
-2
src/objective/regression_objective.hpp
src/objective/regression_objective.hpp
+1
-1
No files found.
include/LightGBM/R_object_helper.h
View file @
5bee6489
...
...
@@ -7,6 +7,7 @@
#define R_OBJECT_HELPER_H_
#include <cstdint>
#include <cstdio>
#define TYPE_BITS 5
// use .Internal(internalsID()) to uuid
...
...
include/LightGBM/bin.h
View file @
5bee6489
#ifndef LIGHTGBM_BIN_H_
#define LIGHTGBM_BIN_H_
#include <LightGBM/meta.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/utils/file_io.h>
#include <LightGBM/meta.h>
#include <vector>
#include <functional>
...
...
include/LightGBM/c_api.h
View file @
5bee6489
#ifndef LIGHTGBM_C_API_H_
#define LIGHTGBM_C_API_H_
#include <LightGBM/meta.h>
#include <cstdint>
#include <exception>
#include <stdexcept>
#include <cstring>
#include <string>
/*!
* To avoid type conversion on large data, most of our expose interface support both for float_32 and float_64.
...
...
@@ -782,6 +777,12 @@ LIGHTGBM_C_EXPORT int LGBM_NetworkInitWithFunctions(int num_machines, int rank,
void
*
reduce_scatter_ext_fun
,
void
*
allgather_ext_fun
);
#if defined(_MSC_VER)
#define THREAD_LOCAL __declspec(thread)
#else
#define THREAD_LOCAL thread_local
#endif
// exception handle and error msg
static
char
*
LastErrorMsg
()
{
static
THREAD_LOCAL
char
err_msg
[
512
]
=
"Everything is fine"
;
return
err_msg
;
}
...
...
@@ -790,21 +791,4 @@ inline void LGBM_SetLastError(const char* msg) {
std
::
strcpy
(
LastErrorMsg
(),
msg
);
}
inline
int
LGBM_APIHandleException
(
const
std
::
exception
&
ex
)
{
LGBM_SetLastError
(
ex
.
what
());
return
-
1
;
}
inline
int
LGBM_APIHandleException
(
const
std
::
string
&
ex
)
{
LGBM_SetLastError
(
ex
.
c_str
());
return
-
1
;
}
#define API_BEGIN() try {
#define API_END() } \
catch(std::exception& ex) { return LGBM_APIHandleException(ex); } \
catch(std::string& ex) { return LGBM_APIHandleException(ex); } \
catch(...) { return LGBM_APIHandleException("unknown exception"); } \
return 0;
#endif // LIGHTGBM_C_API_H_
include/LightGBM/lightgbm_R.h
View file @
5bee6489
#ifndef LIGHTGBM_R_H_
#define LIGHTGBM_R_H_
#include <LightGBM/utils/log.h>
#include "R_object_helper.h"
#include <cstdint>
#include <LightGBM/c_api.h>
#include "R_object_helper.h"
/*!
* \brief get string message of the last error
...
...
include/LightGBM/metric.h
View file @
5bee6489
#ifndef LIGHTGBM_METRIC_H_
#define LIGHTGBM_METRIC_H_
#include <LightGBM/utils/log.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/meta.h>
#include <LightGBM/config.h>
#include <LightGBM/dataset.h>
...
...
include/LightGBM/utils/file_io.h
View file @
5bee6489
...
...
@@ -2,6 +2,10 @@
#define LIGHTGBM_UTILS_FILE_IO_H_
#include <memory>
#include <iostream>
#include <cstdio>
#include <cstdlib>
#include <cstring>
namespace
LightGBM
{
...
...
src/c_api.cpp
View file @
5bee6489
#include <LightGBM/
utils/openmp_wrapper
.h>
#include <LightGBM/
c_api
.h>
#include <LightGBM/utils/openmp_wrapper.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/utils/random.h>
#include <LightGBM/utils/threading.h>
#include <LightGBM/
c_api
.h>
#include <LightGBM/
utils/log
.h>
#include <LightGBM/dataset_loader.h>
#include <LightGBM/dataset.h>
#include <LightGBM/boosting.h>
...
...
@@ -26,6 +27,23 @@
namespace
LightGBM
{
inline
int
LGBM_APIHandleException
(
const
std
::
exception
&
ex
)
{
LGBM_SetLastError
(
ex
.
what
());
return
-
1
;
}
inline
int
LGBM_APIHandleException
(
const
std
::
string
&
ex
)
{
LGBM_SetLastError
(
ex
.
c_str
());
return
-
1
;
}
#define API_BEGIN() try {
#define API_END() } \
catch(std::exception& ex) { return LGBM_APIHandleException(ex); } \
catch(std::string& ex) { return LGBM_APIHandleException(ex); } \
catch(...) { return LGBM_APIHandleException("unknown exception"); } \
return 0;
class
Booster
{
public:
explicit
Booster
(
const
char
*
filename
)
{
...
...
src/io/bin.cpp
View file @
5bee6489
#include <LightGBM/bin.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/utils/file_io.h>
#include <LightGBM/bin.h>
#include "dense_bin.hpp"
#include "dense_nbits_bin.hpp"
...
...
@@ -317,7 +318,7 @@ namespace LightGBM {
}
}
num_bin_
=
0
;
int
rest_cnt
=
total_sample_cnt
-
na_cnt
;
int
rest_cnt
=
static_cast
<
int
>
(
total_sample_cnt
-
na_cnt
)
;
if
(
rest_cnt
>
0
)
{
// sort by counts
Common
::
SortForPair
<
int
,
int
>
(
counts_int
,
distinct_values_int
,
0
,
true
);
...
...
src/io/dataset_loader.cpp
View file @
5bee6489
#include <LightGBM/dataset_loader.h>
#include <LightGBM/utils/openmp_wrapper.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/utils/array_args.h>
#include <LightGBM/dataset_loader.h>
#include <LightGBM/network.h>
...
...
src/io/file_io.cpp
View file @
5bee6489
#include <LightGBM/utils/log.h>
#include <LightGBM/utils/file_io.h>
#include <LightGBM/utils/log.h>
#include <algorithm>
#include <sstream>
...
...
src/io/parser.hpp
View file @
5bee6489
#ifndef LIGHTGBM_IO_PARSER_HPP_
#define LIGHTGBM_IO_PARSER_HPP_
#include <LightGBM/dataset.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/dataset.h>
#include <unordered_map>
#include <vector>
...
...
src/lightgbm_R.cpp
View file @
5bee6489
#include <LightGBM/lightgbm_R.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/utils/openmp_wrapper.h>
#include <LightGBM/utils/text_reader.h>
#include <LightGBM/utils/common.h>
#include <vector>
#include <string>
#include <utility>
#include <cstring>
#include <cstdio>
#include <sstream>
#include <LightGBM/utils/openmp_wrapper.h>
#include <cstdint>
#include <memory>
#include <LightGBM/utils/text_reader.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/lightgbm_R.h>
#define COL_MAJOR (0)
...
...
src/metric/binary_metric.hpp
View file @
5bee6489
#ifndef LIGHTGBM_METRIC_BINARY_METRIC_HPP_
#define LIGHTGBM_METRIC_BINARY_METRIC_HPP_
#include <LightGBM/metric.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/metric.h>
#include <algorithm>
#include <vector>
#include <sstream>
...
...
src/metric/map_metric.hpp
View file @
5bee6489
#ifndef LIGHTGBM_METRIC_MAP_METRIC_HPP_
#define LIGHTGBM_METRIC_MAP_METRIC_HPP_
#include <LightGBM/metric.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/metric.h>
#include <LightGBM/utils/openmp_wrapper.h>
#include <sstream>
...
...
src/metric/multiclass_metric.hpp
View file @
5bee6489
#ifndef LIGHTGBM_METRIC_MULTICLASS_METRIC_HPP_
#define LIGHTGBM_METRIC_MULTICLASS_METRIC_HPP_
#include <LightGBM/utils/log.h>
#include <LightGBM/metric.h>
#include <LightGBM/utils/log.h>
#include <cmath>
namespace
LightGBM
{
...
...
src/metric/rank_metric.hpp
View file @
5bee6489
#ifndef LIGHTGBM_METRIC_RANK_METRIC_HPP_
#define LIGHTGBM_METRIC_RANK_METRIC_HPP_
#include <LightGBM/utils/common.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/metric.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/utils/openmp_wrapper.h>
#include <sstream>
...
...
src/metric/regression_metric.hpp
View file @
5bee6489
#ifndef LIGHTGBM_METRIC_REGRESSION_METRIC_HPP_
#define LIGHTGBM_METRIC_REGRESSION_METRIC_HPP_
#include <LightGBM/utils/log.h>
#include <LightGBM/metric.h>
#include <LightGBM/utils/log.h>
#include <cmath>
namespace
LightGBM
{
...
...
src/metric/xentropy_metric.hpp
View file @
5bee6489
#ifndef LIGHTGBM_METRIC_XENTROPY_METRIC_HPP_
#define LIGHTGBM_METRIC_XENTROPY_METRIC_HPP_
#include <LightGBM/metric.h>
#include <LightGBM/meta.h>
#include <LightGBM/utils/log.h>
#include <LightGBM/utils/common.h>
#include <LightGBM/metric.h>
#include <algorithm>
#include <vector>
#include <sstream>
...
...
src/network/linkers.h
View file @
5bee6489
#ifndef LIGHTGBM_NETWORK_LINKERS_H_
#define LIGHTGBM_NETWORK_LINKERS_H_
#include <LightGBM/network.h>
#include <LightGBM/meta.h>
#include <LightGBM/config.h>
#include <LightGBM/network.h>
#include <algorithm>
#include <chrono>
...
...
src/objective/regression_objective.hpp
View file @
5bee6489
#ifndef LIGHTGBM_OBJECTIVE_REGRESSION_OBJECTIVE_HPP_
#define LIGHTGBM_OBJECTIVE_REGRESSION_OBJECTIVE_HPP_
#include <LightGBM/objective_function.h>
#include <LightGBM/meta.h>
#include <LightGBM/objective_function.h>
#include <LightGBM/utils/array_args.h>
namespace
LightGBM
{
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment