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
3e540eac
Unverified
Commit
3e540eac
authored
Mar 21, 2020
by
James Lamb
Committed by
GitHub
Mar 21, 2020
Browse files
[ci] fixed cpplint errors about namespace using-directives (#2927)
parent
9654f165
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
19 deletions
+37
-19
src/c_api.cpp
src/c_api.cpp
+31
-15
src/lightgbm_R.cpp
src/lightgbm_R.cpp
+6
-4
No files found.
src/c_api.cpp
View file @
3e540eac
...
@@ -553,7 +553,23 @@ class Booster {
...
@@ -553,7 +553,23 @@ class Booster {
}
// namespace LightGBM
}
// namespace LightGBM
using
namespace
LightGBM
;
// explicitly declare symbols from LightGBM namespace
using
LightGBM
::
AllgatherFunction
;
using
LightGBM
::
Booster
;
using
LightGBM
::
Common
::
CheckElementsIntervalClosed
;
using
LightGBM
::
Common
::
RemoveQuotationSymbol
;
using
LightGBM
::
Common
::
Vector2Ptr
;
using
LightGBM
::
Common
::
VectorSize
;
using
LightGBM
::
Config
;
using
LightGBM
::
data_size_t
;
using
LightGBM
::
Dataset
;
using
LightGBM
::
DatasetLoader
;
using
LightGBM
::
kZeroThreshold
;
using
LightGBM
::
LGBM_APIHandleException
;
using
LightGBM
::
Log
;
using
LightGBM
::
Network
;
using
LightGBM
::
Random
;
using
LightGBM
::
ReduceScatterFunction
;
// some help functions used to convert data
// some help functions used to convert data
...
@@ -785,10 +801,10 @@ int LGBM_DatasetCreateFromMats(int32_t nmat,
...
@@ -785,10 +801,10 @@ int LGBM_DatasetCreateFromMats(int32_t nmat,
}
}
}
}
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
ret
.
reset
(
loader
.
CostructFromSampleData
(
Common
::
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
ret
.
reset
(
loader
.
CostructFromSampleData
(
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
Common
::
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
ncol
,
ncol
,
Common
::
VectorSize
<
double
>
(
sample_values
).
data
(),
VectorSize
<
double
>
(
sample_values
).
data
(),
sample_cnt
,
total_nrow
));
sample_cnt
,
total_nrow
));
}
else
{
}
else
{
ret
.
reset
(
new
Dataset
(
total_nrow
));
ret
.
reset
(
new
Dataset
(
total_nrow
));
...
@@ -861,10 +877,10 @@ int LGBM_DatasetCreateFromCSR(const void* indptr,
...
@@ -861,10 +877,10 @@ int LGBM_DatasetCreateFromCSR(const void* indptr,
}
}
}
}
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
ret
.
reset
(
loader
.
CostructFromSampleData
(
Common
::
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
ret
.
reset
(
loader
.
CostructFromSampleData
(
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
Common
::
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
static_cast
<
int
>
(
num_col
),
static_cast
<
int
>
(
num_col
),
Common
::
VectorSize
<
double
>
(
sample_values
).
data
(),
VectorSize
<
double
>
(
sample_values
).
data
(),
sample_cnt
,
nrow
));
sample_cnt
,
nrow
));
}
else
{
}
else
{
ret
.
reset
(
new
Dataset
(
nrow
));
ret
.
reset
(
new
Dataset
(
nrow
));
...
@@ -929,10 +945,10 @@ int LGBM_DatasetCreateFromCSRFunc(void* get_row_funptr,
...
@@ -929,10 +945,10 @@ int LGBM_DatasetCreateFromCSRFunc(void* get_row_funptr,
}
}
}
}
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
ret
.
reset
(
loader
.
CostructFromSampleData
(
Common
::
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
ret
.
reset
(
loader
.
CostructFromSampleData
(
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
Common
::
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
static_cast
<
int
>
(
num_col
),
static_cast
<
int
>
(
num_col
),
Common
::
VectorSize
<
double
>
(
sample_values
).
data
(),
VectorSize
<
double
>
(
sample_values
).
data
(),
sample_cnt
,
nrow
));
sample_cnt
,
nrow
));
}
else
{
}
else
{
ret
.
reset
(
new
Dataset
(
nrow
));
ret
.
reset
(
new
Dataset
(
nrow
));
...
@@ -1002,10 +1018,10 @@ int LGBM_DatasetCreateFromCSC(const void* col_ptr,
...
@@ -1002,10 +1018,10 @@ int LGBM_DatasetCreateFromCSC(const void* col_ptr,
}
}
OMP_THROW_EX
();
OMP_THROW_EX
();
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
DatasetLoader
loader
(
config
,
nullptr
,
1
,
nullptr
);
ret
.
reset
(
loader
.
CostructFromSampleData
(
Common
::
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
ret
.
reset
(
loader
.
CostructFromSampleData
(
Vector2Ptr
<
double
>
(
&
sample_values
).
data
(),
Common
::
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
Vector2Ptr
<
int
>
(
&
sample_idx
).
data
(),
static_cast
<
int
>
(
sample_values
.
size
()),
static_cast
<
int
>
(
sample_values
.
size
()),
Common
::
VectorSize
<
double
>
(
sample_values
).
data
(),
VectorSize
<
double
>
(
sample_values
).
data
(),
sample_cnt
,
nrow
));
sample_cnt
,
nrow
));
}
else
{
}
else
{
ret
.
reset
(
new
Dataset
(
nrow
));
ret
.
reset
(
new
Dataset
(
nrow
));
...
@@ -1063,7 +1079,7 @@ int LGBM_DatasetGetSubset(
...
@@ -1063,7 +1079,7 @@ int LGBM_DatasetGetSubset(
CHECK_GT
(
num_used_row_indices
,
0
);
CHECK_GT
(
num_used_row_indices
,
0
);
const
int32_t
lower
=
0
;
const
int32_t
lower
=
0
;
const
int32_t
upper
=
full_dataset
->
num_data
()
-
1
;
const
int32_t
upper
=
full_dataset
->
num_data
()
-
1
;
Common
::
CheckElementsIntervalClosed
(
used_row_indices
,
lower
,
upper
,
num_used_row_indices
,
"Used indices of subset"
);
CheckElementsIntervalClosed
(
used_row_indices
,
lower
,
upper
,
num_used_row_indices
,
"Used indices of subset"
);
if
(
!
std
::
is_sorted
(
used_row_indices
,
used_row_indices
+
num_used_row_indices
))
{
if
(
!
std
::
is_sorted
(
used_row_indices
,
used_row_indices
+
num_used_row_indices
))
{
Log
::
Fatal
(
"used_row_indices should be sorted in Subset"
);
Log
::
Fatal
(
"used_row_indices should be sorted in Subset"
);
}
}
...
@@ -1755,7 +1771,7 @@ int LGBM_NetworkInit(const char* machines,
...
@@ -1755,7 +1771,7 @@ int LGBM_NetworkInit(const char* machines,
int
num_machines
)
{
int
num_machines
)
{
API_BEGIN
();
API_BEGIN
();
Config
config
;
Config
config
;
config
.
machines
=
Common
::
RemoveQuotationSymbol
(
std
::
string
(
machines
));
config
.
machines
=
RemoveQuotationSymbol
(
std
::
string
(
machines
));
config
.
local_listen_port
=
local_listen_port
;
config
.
local_listen_port
=
local_listen_port
;
config
.
num_machines
=
num_machines
;
config
.
num_machines
=
num_machines
;
config
.
time_out
=
listen_time_out
;
config
.
time_out
=
listen_time_out
;
...
...
src/lightgbm_R.cpp
View file @
3e540eac
...
@@ -32,7 +32,9 @@
...
@@ -32,7 +32,9 @@
return call_state;\
return call_state;\
}
}
using
namespace
LightGBM
;
using
LightGBM
::
Common
::
Join
;
using
LightGBM
::
Common
::
Split
;
using
LightGBM
::
Log
;
LGBM_SE
EncodeChar
(
LGBM_SE
dest
,
const
char
*
src
,
LGBM_SE
buf_len
,
LGBM_SE
actual_len
,
size_t
str_len
)
{
LGBM_SE
EncodeChar
(
LGBM_SE
dest
,
const
char
*
src
,
LGBM_SE
buf_len
,
LGBM_SE
actual_len
,
size_t
str_len
)
{
if
(
str_len
>
INT32_MAX
)
{
if
(
str_len
>
INT32_MAX
)
{
...
@@ -134,7 +136,7 @@ LGBM_SE LGBM_DatasetSetFeatureNames_R(LGBM_SE handle,
...
@@ -134,7 +136,7 @@ LGBM_SE LGBM_DatasetSetFeatureNames_R(LGBM_SE handle,
LGBM_SE
feature_names
,
LGBM_SE
feature_names
,
LGBM_SE
call_state
)
{
LGBM_SE
call_state
)
{
R_API_BEGIN
();
R_API_BEGIN
();
auto
vec_names
=
Common
::
Split
(
R_CHAR_PTR
(
feature_names
),
'\t'
);
auto
vec_names
=
Split
(
R_CHAR_PTR
(
feature_names
),
'\t'
);
std
::
vector
<
const
char
*>
vec_sptr
;
std
::
vector
<
const
char
*>
vec_sptr
;
int
len
=
static_cast
<
int
>
(
vec_names
.
size
());
int
len
=
static_cast
<
int
>
(
vec_names
.
size
());
for
(
int
i
=
0
;
i
<
len
;
++
i
)
{
for
(
int
i
=
0
;
i
<
len
;
++
i
)
{
...
@@ -163,7 +165,7 @@ LGBM_SE LGBM_DatasetGetFeatureNames_R(LGBM_SE handle,
...
@@ -163,7 +165,7 @@ LGBM_SE LGBM_DatasetGetFeatureNames_R(LGBM_SE handle,
CHECK_CALL
(
LGBM_DatasetGetFeatureNames
(
R_GET_PTR
(
handle
),
CHECK_CALL
(
LGBM_DatasetGetFeatureNames
(
R_GET_PTR
(
handle
),
ptr_names
.
data
(),
&
out_len
));
ptr_names
.
data
(),
&
out_len
));
CHECK_EQ
(
len
,
out_len
);
CHECK_EQ
(
len
,
out_len
);
auto
merge_str
=
Common
::
Join
<
char
*>
(
ptr_names
,
"
\t
"
);
auto
merge_str
=
Join
<
char
*>
(
ptr_names
,
"
\t
"
);
EncodeChar
(
feature_names
,
merge_str
.
c_str
(),
buf_len
,
actual_len
,
merge_str
.
size
()
+
1
);
EncodeChar
(
feature_names
,
merge_str
.
c_str
(),
buf_len
,
actual_len
,
merge_str
.
size
()
+
1
);
R_API_END
();
R_API_END
();
}
}
...
@@ -468,7 +470,7 @@ LGBM_SE LGBM_BoosterGetEvalNames_R(LGBM_SE handle,
...
@@ -468,7 +470,7 @@ LGBM_SE LGBM_BoosterGetEvalNames_R(LGBM_SE handle,
ptr_names
.
data
()));
ptr_names
.
data
()));
CHECK_EQ
(
out_len
,
len
);
CHECK_EQ
(
out_len
,
len
);
CHECK_GE
(
reserved_string_size
,
required_string_size
);
CHECK_GE
(
reserved_string_size
,
required_string_size
);
auto
merge_names
=
Common
::
Join
<
char
*>
(
ptr_names
,
"
\t
"
);
auto
merge_names
=
Join
<
char
*>
(
ptr_names
,
"
\t
"
);
EncodeChar
(
eval_names
,
merge_names
.
c_str
(),
buf_len
,
actual_len
,
merge_names
.
size
()
+
1
);
EncodeChar
(
eval_names
,
merge_names
.
c_str
(),
buf_len
,
actual_len
,
merge_names
.
size
()
+
1
);
R_API_END
();
R_API_END
();
}
}
...
...
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