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

Update dmlc-core submodule (#3221)

Browse Source 
* Update dmlc-core submodule

* Fix dense_parser to work with the latest dmlc-core

* Specify location of Google Test

* Add more source files in dmlc-minimum to get latest dmlc-core working

* Update dmlc-core submodule
This commit is contained in:
Philip Hyunsu Cho 2018-05-09 18:55:29 -07:00 committed by GitHub
parent 039dbe6aec
commit 9a8211f668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -106,7 +106,7 @@ endif()
# dmlc-core # dmlc-core
add_subdirectory(dmlc-core) add_subdirectory(dmlc-core)
set(LINK_LIBRARIES dmlccore rabit) set(LINK_LIBRARIES dmlc rabit)
if(USE_CUDA) if(USE_CUDA)

2
amalgamation/dmlc-minimum0.cc
View File

@ -7,6 +7,8 @@
#include "../dmlc-core/src/io/recordio_split.cc" #include "../dmlc-core/src/io/recordio_split.cc"
#include "../dmlc-core/src/io/input_split_base.cc" #include "../dmlc-core/src/io/input_split_base.cc"
#include "../dmlc-core/src/io/local_filesys.cc" #include "../dmlc-core/src/io/local_filesys.cc"
#include "../dmlc-core/src/io/filesys.cc"
#include "../dmlc-core/src/io/indexed_recordio_split.cc"
#include "../dmlc-core/src/data.cc" #include "../dmlc-core/src/data.cc"
#include "../dmlc-core/src/io.cc" #include "../dmlc-core/src/io.cc"
#include "../dmlc-core/src/recordio.cc" #include "../dmlc-core/src/recordio.cc"

2
dmlc-core

@ -1 +1 @@
Subproject commit b5bec5481df86e8e6728d8bd80a61d87ef3b2cd5 Subproject commit dadcd97fdceb5f395e963b2a637f6ed377f59fc4

5
plugin/dense_parser/dense_libsvm.cc
View File

@ -69,7 +69,7 @@ class DensifyParser : public dmlc::Parser<IndexType> {
std::vector<xgboost::bst_float> dense_value_; std::vector<xgboost::bst_float> dense_value_;
}; };
template<typename IndexType> template<typename IndexType, typename DType = real_t>
Parser<IndexType> * Parser<IndexType> *
CreateDenseLibSVMParser(const std::string& path, CreateDenseLibSVMParser(const std::string& path,
const std::map<std::string, std::string>& args, const std::map<std::string, std::string>& args,
@ -82,5 +82,6 @@ CreateDenseLibSVMParser(const std::string& path,
} }
} // namespace data } // namespace data
DMLC_REGISTER_DATA_PARSER(uint32_t, dense_libsvm, data::CreateDenseLibSVMParser<uint32_t>); DMLC_REGISTER_DATA_PARSER(uint32_t, real_t, dense_libsvm,
data::CreateDenseLibSVMParser<uint32_t __DMLC_COMMA real_t>);
} // namespace dmlc } // namespace dmlc

4
tests/travis/run_test.sh
View File

@ -118,7 +118,7 @@ if [ ${TASK} == "cmake_test" ]; then
# Build/test without AVX # Build/test without AVX
mkdir build && cd build mkdir build && cd build
cmake .. -DGOOGLE_TEST=ON cmake .. -DGOOGLE_TEST=ON -DGTEST_ROOT=../gtest/
make make
cd .. cd ..
./testxgboost ./testxgboost
@ -126,7 +126,7 @@ if [ ${TASK} == "cmake_test" ]; then
# Build/test with AVX # Build/test with AVX
mkdir build && cd build mkdir build && cd build
cmake .. -DGOOGLE_TEST=ON -DUSE_AVX=ON cmake .. -DGOOGLE_TEST=ON -DUSE_AVX=ON -DGTEST_ROOT=../gtest/
make make
cd .. cd ..
./testxgboost ./testxgboost