Skip to content

GitLab

Unverified Commit 6f339d77 authored by Lucas David's avatar Lucas David Committed by GitHub
Browse files

[TYPO] DatasetLoader::ConstructFromSampleData (#3258) 



* ~ Modified name of method DatasetLoader::CostructFromSampleData to DatasetLoader::ConstructFromSampleData.
& Build passes for Debug, Debug_DLL, DLL and Release (not tested Debug_mpi and Release_mpi).

* ~ Refactored indentations.
Co-authored-by: default avatarGuolin Ke <guolin.ke@outlook.com>
Co-authored-by: default avatarNikita Titov <nekit94-08@mail.ru>
parent 1cf13dba
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
include/LightGBM/dataset_loader.h
View file @ 6f339d77
...@@ -27,7 +27,7 @@ class DatasetLoader { ...@@ -27,7 +27,7 @@ class DatasetLoader {
LIGHTGBM_EXPORT Dataset* LoadFromFileAlignWithOtherDataset(const char* filename, const Dataset* train_data); LIGHTGBM_EXPORT Dataset* LoadFromFileAlignWithOtherDataset(const char* filename, const Dataset* train_data);
LIGHTGBM_EXPORT Dataset* CostructFromSampleData(double** sample_values, LIGHTGBM_EXPORT Dataset* ConstructFromSampleData(double** sample_values,
int** sample_indices, int num_col, const int* num_per_col, int** sample_indices, int num_col, const int* num_per_col,
size_t total_sample_size, data_size_t num_data); size_t total_sample_size, data_size_t num_data);
......
src/c_api.cpp
View file @ 6f339d77
...@@ -921,9 +921,9 @@ int LGBM_DatasetCreateFromSampledColumn(double** sample_data, ...@@ -921,9 +921,9 @@ int LGBM_DatasetCreateFromSampledColumn(double** sample_data,
omp_set_num_threads(config.num_threads); omp_set_num_threads(config.num_threads);
} }
DatasetLoader loader(config, nullptr, 1, nullptr); DatasetLoader loader(config, nullptr, 1, nullptr);
*out = loader.CostructFromSampleData(sample_data, sample_indices, ncol, num_per_col, *out = loader.ConstructFromSampleData(sample_data, sample_indices, ncol, num_per_col,
num_sample_row, num_sample_row,
static_cast<data_size_t>(num_total_row)); static_cast<data_size_t>(num_total_row));
API_END(); API_END();
} }
...@@ -1069,11 +1069,11 @@ int LGBM_DatasetCreateFromMats(int32_t nmat, ...@@ -1069,11 +1069,11 @@ int LGBM_DatasetCreateFromMats(int32_t nmat,
} }
} }
DatasetLoader loader(config, nullptr, 1, nullptr); DatasetLoader loader(config, nullptr, 1, nullptr);
ret.reset(loader.CostructFromSampleData(Vector2Ptr<double>(&sample_values).data(), ret.reset(loader.ConstructFromSampleData(Vector2Ptr<double>(&sample_values).data(),
Vector2Ptr<int>(&sample_idx).data(), Vector2Ptr<int>(&sample_idx).data(),
ncol, ncol,
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));
ret->CreateValid( ret->CreateValid(
...@@ -1145,11 +1145,11 @@ int LGBM_DatasetCreateFromCSR(const void* indptr, ...@@ -1145,11 +1145,11 @@ int LGBM_DatasetCreateFromCSR(const void* indptr,
} }
} }
DatasetLoader loader(config, nullptr, 1, nullptr); DatasetLoader loader(config, nullptr, 1, nullptr);
ret.reset(loader.CostructFromSampleData(Vector2Ptr<double>(&sample_values).data(), ret.reset(loader.ConstructFromSampleData(Vector2Ptr<double>(&sample_values).data(),
Vector2Ptr<int>(&sample_idx).data(), Vector2Ptr<int>(&sample_idx).data(),
static_cast<int>(num_col), static_cast<int>(num_col),
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));
ret->CreateValid( ret->CreateValid(
...@@ -1213,11 +1213,11 @@ int LGBM_DatasetCreateFromCSRFunc(void* get_row_funptr, ...@@ -1213,11 +1213,11 @@ int LGBM_DatasetCreateFromCSRFunc(void* get_row_funptr,
} }
} }
DatasetLoader loader(config, nullptr, 1, nullptr); DatasetLoader loader(config, nullptr, 1, nullptr);
ret.reset(loader.CostructFromSampleData(Vector2Ptr<double>(&sample_values).data(), ret.reset(loader.ConstructFromSampleData(Vector2Ptr<double>(&sample_values).data(),
Vector2Ptr<int>(&sample_idx).data(), Vector2Ptr<int>(&sample_idx).data(),
static_cast<int>(num_col), static_cast<int>(num_col),
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));
ret->CreateValid( ret->CreateValid(
...@@ -1286,11 +1286,11 @@ int LGBM_DatasetCreateFromCSC(const void* col_ptr, ...@@ -1286,11 +1286,11 @@ 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(Vector2Ptr<double>(&sample_values).data(), ret.reset(loader.ConstructFromSampleData(Vector2Ptr<double>(&sample_values).data(),
Vector2Ptr<int>(&sample_idx).data(), Vector2Ptr<int>(&sample_idx).data(),
static_cast<int>(sample_values.size()), static_cast<int>(sample_values.size()),
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));
ret->CreateValid( ret->CreateValid(
......
src/io/dataset_loader.cpp
View file @ 6f339d77
...@@ -524,9 +524,9 @@ Dataset* DatasetLoader::LoadFromBinFile(const char* data_filename, const char* b ...@@ -524,9 +524,9 @@ Dataset* DatasetLoader::LoadFromBinFile(const char* data_filename, const char* b
} }
Dataset* DatasetLoader::CostructFromSampleData(double** sample_values, Dataset* DatasetLoader::ConstructFromSampleData(double** sample_values,
int** sample_indices, int num_col, const int* num_per_col, int** sample_indices, int num_col, const int* num_per_col,
size_t total_sample_size, data_size_t num_data) { size_t total_sample_size, data_size_t num_data) {
int num_total_features = num_col; int num_total_features = num_col;
if (Network::num_machines() > 1) { if (Network::num_machines() > 1) {
num_total_features = Network::GlobalSyncUpByMax(num_total_features); num_total_features = Network::GlobalSyncUpByMax(num_total_features);
......
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