Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for VX (#1614)

Browse Source
This commit is contained in:
Vadim Khotilovich 2016-09-27 17:19:20 -05:00 committed by Tianqi Chen
parent 37bc122c90
commit 3efff6d052
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/c_api/c_api.cc
View File

@ -265,7 +265,7 @@ XGB_DLL int XGDMatrixCreateFromCSR(const xgboost::bst_ulong* indptr,
xgboost::bst_ulong nelem, xgboost::bst_ulong nelem,
DMatrixHandle* out) { DMatrixHandle* out) {
std::vector<size_t> indptr_(nindptr); std::vector<size_t> indptr_(nindptr);
for (bst_ulong i = 0; i < nindptr; ++i) { for (xgboost::bst_ulong i = 0; i < nindptr; ++i) {
indptr_[i] = static_cast<size_t>(indptr[i]); indptr_[i] = static_cast<size_t>(indptr[i]);
} }
return XGDMatrixCreateFromCSREx(&indptr_[0], indices, data, return XGDMatrixCreateFromCSREx(&indptr_[0], indices, data,
@ -292,7 +292,7 @@ XGB_DLL int XGDMatrixCreateFromCSCEx(const size_t* col_ptr,
builder.InitBudget(0, nthread); builder.InitBudget(0, nthread);
size_t ncol = nindptr - 1; // NOLINT(*) size_t ncol = nindptr - 1; // NOLINT(*)
#pragma omp parallel for schedule(static) #pragma omp parallel for schedule(static)
for (size_t i = 0; i < ncol; ++i) { // NOLINT(*) for (omp_ulong i = 0; i < static_cast<omp_ulong>(ncol); ++i) { // NOLINT(*)
int tid = omp_get_thread_num(); int tid = omp_get_thread_num();
for (size_t j = col_ptr[i]; j < col_ptr[i+1]; ++j) { for (size_t j = col_ptr[i]; j < col_ptr[i+1]; ++j) {
builder.AddBudget(indices[j], tid); builder.AddBudget(indices[j], tid);
@ -300,7 +300,7 @@ XGB_DLL int XGDMatrixCreateFromCSCEx(const size_t* col_ptr,
} }
builder.InitStorage(); builder.InitStorage();
#pragma omp parallel for schedule(static) #pragma omp parallel for schedule(static)
for (size_t i = 0; i < ncol; ++i) { // NOLINT(*) for (omp_ulong i = 0; i < static_cast<omp_ulong>(ncol); ++i) { // NOLINT(*)
int tid = omp_get_thread_num(); int tid = omp_get_thread_num();
for (size_t j = col_ptr[i]; j < col_ptr[i+1]; ++j) { for (size_t j = col_ptr[i]; j < col_ptr[i+1]; ++j) {
builder.Push(indices[j], builder.Push(indices[j],
@ -326,7 +326,7 @@ XGB_DLL int XGDMatrixCreateFromCSC(const xgboost::bst_ulong* col_ptr,
xgboost::bst_ulong nelem, xgboost::bst_ulong nelem,
DMatrixHandle* out) { DMatrixHandle* out) {
std::vector<size_t> col_ptr_(nindptr); std::vector<size_t> col_ptr_(nindptr);
for (bst_ulong i = 0; i < nindptr; ++i) { for (xgboost::bst_ulong i = 0; i < nindptr; ++i) {
col_ptr_[i] = static_cast<size_t>(col_ptr[i]); col_ptr_[i] = static_cast<size_t>(col_ptr[i]);
} }
return XGDMatrixCreateFromCSCEx(&col_ptr_[0], indices, data, return XGDMatrixCreateFromCSCEx(&col_ptr_[0], indices, data,