Commit d38ada73 authored by Guolin Ke's avatar Guolin Ke
Browse files

replace const handle* to const handle

parent 26b7e818
...@@ -59,7 +59,7 @@ DllExport const char* LGBM_GetLastError(); ...@@ -59,7 +59,7 @@ DllExport const char* LGBM_GetLastError();
*/ */
DllExport int LGBM_DatasetCreateFromFile(const char* filename, DllExport int LGBM_DatasetCreateFromFile(const char* filename,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out); DatasetHandle* out);
/*! /*!
...@@ -86,7 +86,7 @@ DllExport int LGBM_DatasetCreateFromCSR(const void* indptr, ...@@ -86,7 +86,7 @@ DllExport int LGBM_DatasetCreateFromCSR(const void* indptr,
int64_t nelem, int64_t nelem,
int64_t num_col, int64_t num_col,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out); DatasetHandle* out);
/*! /*!
...@@ -113,7 +113,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr, ...@@ -113,7 +113,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr,
int64_t nelem, int64_t nelem,
int64_t num_row, int64_t num_row,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out); DatasetHandle* out);
/*! /*!
...@@ -134,7 +134,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data, ...@@ -134,7 +134,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data,
int32_t ncol, int32_t ncol,
int is_row_major, int is_row_major,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out); DatasetHandle* out);
/*! /*!
...@@ -147,7 +147,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data, ...@@ -147,7 +147,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data,
* \return 0 when succeed, -1 when failure happens * \return 0 when succeed, -1 when failure happens
*/ */
DllExport int LGBM_DatasetGetSubset( DllExport int LGBM_DatasetGetSubset(
const DatasetHandle* handle, const DatasetHandle handle,
const int32_t* used_row_indices, const int32_t* used_row_indices,
int32_t num_used_row_indices, int32_t num_used_row_indices,
const char* parameters, const char* parameters,
......
...@@ -486,7 +486,7 @@ class _InnerDataset(object): ...@@ -486,7 +486,7 @@ class _InnerDataset(object):
"""process for reference dataset""" """process for reference dataset"""
ref_dataset = None ref_dataset = None
if isinstance(reference, _InnerDataset): if isinstance(reference, _InnerDataset):
ref_dataset = ctypes.byref(reference.handle) ref_dataset = reference.handle
elif reference is not None: elif reference is not None:
raise TypeError('Reference dataset should be None or dataset instance') raise TypeError('Reference dataset should be None or dataset instance')
"""start construct data""" """start construct data"""
...@@ -573,7 +573,7 @@ class _InnerDataset(object): ...@@ -573,7 +573,7 @@ class _InnerDataset(object):
ret.handle = ctypes.c_void_p() ret.handle = ctypes.c_void_p()
params_str = param_dict_to_str(params) params_str = param_dict_to_str(params)
_safe_call(_LIB.LGBM_DatasetGetSubset( _safe_call(_LIB.LGBM_DatasetGetSubset(
ctypes.byref(self.handle), self.handle,
used_indices.ctypes.data_as(ctypes.POINTER(ctypes.c_int32)), used_indices.ctypes.data_as(ctypes.POINTER(ctypes.c_int32)),
used_indices.shape[0], used_indices.shape[0],
c_str(params_str), c_str(params_str),
......
...@@ -239,7 +239,7 @@ DllExport const char* LGBM_GetLastError() { ...@@ -239,7 +239,7 @@ DllExport const char* LGBM_GetLastError() {
DllExport int LGBM_DatasetCreateFromFile(const char* filename, DllExport int LGBM_DatasetCreateFromFile(const char* filename,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out) { DatasetHandle* out) {
API_BEGIN(); API_BEGIN();
auto param = ConfigBase::Str2Map(parameters); auto param = ConfigBase::Str2Map(parameters);
...@@ -250,7 +250,7 @@ DllExport int LGBM_DatasetCreateFromFile(const char* filename, ...@@ -250,7 +250,7 @@ DllExport int LGBM_DatasetCreateFromFile(const char* filename,
*out = loader.LoadFromFile(filename); *out = loader.LoadFromFile(filename);
} else { } else {
*out = loader.LoadFromFileAlignWithOtherDataset(filename, *out = loader.LoadFromFileAlignWithOtherDataset(filename,
reinterpret_cast<const Dataset*>(*reference)); reinterpret_cast<const Dataset*>(reference));
} }
API_END(); API_END();
} }
...@@ -261,7 +261,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data, ...@@ -261,7 +261,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data,
int32_t ncol, int32_t ncol,
int is_row_major, int is_row_major,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out) { DatasetHandle* out) {
API_BEGIN(); API_BEGIN();
auto param = ConfigBase::Str2Map(parameters); auto param = ConfigBase::Str2Map(parameters);
...@@ -289,7 +289,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data, ...@@ -289,7 +289,7 @@ DllExport int LGBM_DatasetCreateFromMat(const void* data,
} else { } else {
ret.reset(new Dataset(nrow, io_config.num_class)); ret.reset(new Dataset(nrow, io_config.num_class));
ret->CopyFeatureMapperFrom( ret->CopyFeatureMapperFrom(
reinterpret_cast<const Dataset*>(*reference), reinterpret_cast<const Dataset*>(reference),
io_config.is_enable_sparse); io_config.is_enable_sparse);
} }
...@@ -313,7 +313,7 @@ DllExport int LGBM_DatasetCreateFromCSR(const void* indptr, ...@@ -313,7 +313,7 @@ DllExport int LGBM_DatasetCreateFromCSR(const void* indptr,
int64_t nelem, int64_t nelem,
int64_t num_col, int64_t num_col,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out) { DatasetHandle* out) {
API_BEGIN(); API_BEGIN();
auto param = ConfigBase::Str2Map(parameters); auto param = ConfigBase::Str2Map(parameters);
...@@ -351,7 +351,7 @@ DllExport int LGBM_DatasetCreateFromCSR(const void* indptr, ...@@ -351,7 +351,7 @@ DllExport int LGBM_DatasetCreateFromCSR(const void* indptr,
} else { } else {
ret.reset(new Dataset(nrow, io_config.num_class)); ret.reset(new Dataset(nrow, io_config.num_class));
ret->CopyFeatureMapperFrom( ret->CopyFeatureMapperFrom(
reinterpret_cast<const Dataset*>(*reference), reinterpret_cast<const Dataset*>(reference),
io_config.is_enable_sparse); io_config.is_enable_sparse);
} }
...@@ -375,7 +375,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr, ...@@ -375,7 +375,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr,
int64_t nelem, int64_t nelem,
int64_t num_row, int64_t num_row,
const char* parameters, const char* parameters,
const DatasetHandle* reference, const DatasetHandle reference,
DatasetHandle* out) { DatasetHandle* out) {
API_BEGIN(); API_BEGIN();
auto param = ConfigBase::Str2Map(parameters); auto param = ConfigBase::Str2Map(parameters);
...@@ -401,7 +401,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr, ...@@ -401,7 +401,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr,
} else { } else {
ret.reset(new Dataset(nrow, io_config.num_class)); ret.reset(new Dataset(nrow, io_config.num_class));
ret->CopyFeatureMapperFrom( ret->CopyFeatureMapperFrom(
reinterpret_cast<const Dataset*>(*reference), reinterpret_cast<const Dataset*>(reference),
io_config.is_enable_sparse); io_config.is_enable_sparse);
} }
...@@ -417,7 +417,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr, ...@@ -417,7 +417,7 @@ DllExport int LGBM_DatasetCreateFromCSC(const void* col_ptr,
} }
DllExport int LGBM_DatasetGetSubset( DllExport int LGBM_DatasetGetSubset(
const DatasetHandle* handle, const DatasetHandle handle,
const int32_t* used_row_indices, const int32_t* used_row_indices,
int32_t num_used_row_indices, int32_t num_used_row_indices,
const char* parameters, const char* parameters,
...@@ -426,7 +426,7 @@ DllExport int LGBM_DatasetGetSubset( ...@@ -426,7 +426,7 @@ DllExport int LGBM_DatasetGetSubset(
auto param = ConfigBase::Str2Map(parameters); auto param = ConfigBase::Str2Map(parameters);
IOConfig io_config; IOConfig io_config;
io_config.Set(param); io_config.Set(param);
auto full_dataset = reinterpret_cast<const Dataset*>(*handle); auto full_dataset = reinterpret_cast<const Dataset*>(handle);
auto ret = std::unique_ptr<Dataset>( auto ret = std::unique_ptr<Dataset>(
full_dataset->Subset(used_row_indices, full_dataset->Subset(used_row_indices,
num_used_row_indices, num_used_row_indices,
......
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