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
5530f286
Commit
5530f286
authored
Jan 31, 2019
by
Guolin Ke
Browse files
fix #1981
parent
feeaf38f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
src/io/dataset.cpp
src/io/dataset.cpp
+7
-2
src/io/dataset_loader.cpp
src/io/dataset_loader.cpp
+2
-0
No files found.
src/io/dataset.cpp
View file @
5530f286
...
@@ -343,6 +343,10 @@ void Dataset::ResetConfig(const char* parameters) {
...
@@ -343,6 +343,10 @@ void Dataset::ResetConfig(const char* parameters) {
if
(
param
.
count
(
"zero_as_missing"
)
&&
io_config
.
zero_as_missing
!=
zero_as_missing_
)
{
if
(
param
.
count
(
"zero_as_missing"
)
&&
io_config
.
zero_as_missing
!=
zero_as_missing_
)
{
Log
::
Warning
(
"Cannot change zero_as_missing after constructed Dataset handle."
);
Log
::
Warning
(
"Cannot change zero_as_missing after constructed Dataset handle."
);
}
}
if
(
param
.
count
(
"sparse_threshold"
)
&&
io_config
.
sparse_threshold
!=
sparse_threshold_
)
{
Log
::
Warning
(
"Cannot change sparse_threshold after constructed Dataset handle."
);
}
if
(
!
io_config
.
monotone_constraints
.
empty
())
{
if
(
!
io_config
.
monotone_constraints
.
empty
())
{
CHECK
(
static_cast
<
size_t
>
(
num_total_features_
)
==
io_config
.
monotone_constraints
.
size
());
CHECK
(
static_cast
<
size_t
>
(
num_total_features_
)
==
io_config
.
monotone_constraints
.
size
());
monotone_types_
.
resize
(
num_features_
);
monotone_types_
.
resize
(
num_features_
);
...
@@ -434,7 +438,7 @@ void Dataset::CreateValid(const Dataset* dataset) {
...
@@ -434,7 +438,7 @@ void Dataset::CreateValid(const Dataset* dataset) {
1
,
1
,
bin_mappers
,
bin_mappers
,
num_data_
,
num_data_
,
dataset
->
sparse_threshold_
,
sparse_threshold_
,
is_enable_sparse
));
is_enable_sparse
));
feature2group_
.
push_back
(
i
);
feature2group_
.
push_back
(
i
);
feature2subfeature_
.
push_back
(
0
);
feature2subfeature_
.
push_back
(
0
);
...
@@ -621,7 +625,7 @@ void Dataset::SaveBinaryFile(const char* bin_filename) {
...
@@ -621,7 +625,7 @@ void Dataset::SaveBinaryFile(const char* bin_filename) {
writer
->
Write
(
binary_file_token
,
size_of_token
);
writer
->
Write
(
binary_file_token
,
size_of_token
);
// get size of header
// get size of header
size_t
size_of_header
=
sizeof
(
num_data_
)
+
sizeof
(
num_features_
)
+
sizeof
(
num_total_features_
)
size_t
size_of_header
=
sizeof
(
num_data_
)
+
sizeof
(
num_features_
)
+
sizeof
(
num_total_features_
)
+
sizeof
(
int
)
*
num_total_features_
+
sizeof
(
label_idx_
)
+
sizeof
(
num_groups_
)
+
sizeof
(
int
)
*
num_total_features_
+
sizeof
(
label_idx_
)
+
sizeof
(
num_groups_
)
+
sizeof
(
sparse_threshold_
)
+
3
*
sizeof
(
int
)
*
num_features_
+
sizeof
(
uint64_t
)
*
(
num_groups_
+
1
)
+
2
*
sizeof
(
int
)
*
num_groups_
+
sizeof
(
int8_t
)
*
num_features_
+
3
*
sizeof
(
int
)
*
num_features_
+
sizeof
(
uint64_t
)
*
(
num_groups_
+
1
)
+
2
*
sizeof
(
int
)
*
num_groups_
+
sizeof
(
int8_t
)
*
num_features_
+
sizeof
(
double
)
*
num_features_
+
sizeof
(
int
)
*
3
+
sizeof
(
bool
)
*
2
;
+
sizeof
(
double
)
*
num_features_
+
sizeof
(
int
)
*
3
+
sizeof
(
bool
)
*
2
;
// size of feature names
// size of feature names
...
@@ -639,6 +643,7 @@ void Dataset::SaveBinaryFile(const char* bin_filename) {
...
@@ -639,6 +643,7 @@ void Dataset::SaveBinaryFile(const char* bin_filename) {
writer
->
Write
(
&
min_data_in_bin_
,
sizeof
(
min_data_in_bin_
));
writer
->
Write
(
&
min_data_in_bin_
,
sizeof
(
min_data_in_bin_
));
writer
->
Write
(
&
use_missing_
,
sizeof
(
use_missing_
));
writer
->
Write
(
&
use_missing_
,
sizeof
(
use_missing_
));
writer
->
Write
(
&
zero_as_missing_
,
sizeof
(
zero_as_missing_
));
writer
->
Write
(
&
zero_as_missing_
,
sizeof
(
zero_as_missing_
));
writer
->
Write
(
&
sparse_threshold_
,
sizeof
(
sparse_threshold_
));
writer
->
Write
(
used_feature_map_
.
data
(),
sizeof
(
int
)
*
num_total_features_
);
writer
->
Write
(
used_feature_map_
.
data
(),
sizeof
(
int
)
*
num_total_features_
);
writer
->
Write
(
&
num_groups_
,
sizeof
(
num_groups_
));
writer
->
Write
(
&
num_groups_
,
sizeof
(
num_groups_
));
writer
->
Write
(
real_feature_idx_
.
data
(),
sizeof
(
int
)
*
num_features_
);
writer
->
Write
(
real_feature_idx_
.
data
(),
sizeof
(
int
)
*
num_features_
);
...
...
src/io/dataset_loader.cpp
View file @
5530f286
...
@@ -326,6 +326,8 @@ Dataset* DatasetLoader::LoadFromBinFile(const char* data_filename, const char* b
...
@@ -326,6 +326,8 @@ Dataset* DatasetLoader::LoadFromBinFile(const char* data_filename, const char* b
mem_ptr
+=
sizeof
(
dataset
->
use_missing_
);
mem_ptr
+=
sizeof
(
dataset
->
use_missing_
);
dataset
->
zero_as_missing_
=
*
(
reinterpret_cast
<
const
bool
*>
(
mem_ptr
));
dataset
->
zero_as_missing_
=
*
(
reinterpret_cast
<
const
bool
*>
(
mem_ptr
));
mem_ptr
+=
sizeof
(
dataset
->
zero_as_missing_
);
mem_ptr
+=
sizeof
(
dataset
->
zero_as_missing_
);
dataset
->
sparse_threshold_
=
*
(
reinterpret_cast
<
const
double
*>
(
mem_ptr
));
mem_ptr
+=
sizeof
(
dataset
->
sparse_threshold_
);
const
int
*
tmp_feature_map
=
reinterpret_cast
<
const
int
*>
(
mem_ptr
);
const
int
*
tmp_feature_map
=
reinterpret_cast
<
const
int
*>
(
mem_ptr
);
dataset
->
used_feature_map_
.
clear
();
dataset
->
used_feature_map_
.
clear
();
for
(
int
i
=
0
;
i
<
dataset
->
num_total_features_
;
++
i
)
{
for
(
int
i
=
0
;
i
<
dataset
->
num_total_features_
;
++
i
)
{
...
...
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