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

Merge pull request #694 from khotilov/warnings_fixes

Browse Source 
small fixes for make and gcc warnings
This commit is contained in:
Tianqi Chen 2015-12-19 06:50:40 +08:00
commit 77434964ab
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,5 +1,5 @@
export CC = $(if $(shell which gcc-5),gcc-5,gcc) export CC = $(if $(shell which gcc-5 2>/dev/null),gcc-5,gcc)
export CXX = $(if $(shell which g++-5),g++-5,g++) export CXX = $(if $(shell which g++-5 2>/dev/null),g++-5,g++)
export MPICXX = mpicxx export MPICXX = mpicxx
export LDFLAGS= -pthread -lm export LDFLAGS= -pthread -lm

7
java/create_wrap.sh
View File

@ -1,4 +1,10 @@
#!/usr/bin/env sh
echo "build java wrapper" echo "build java wrapper"
# cd to script's directory
pushd `dirname $0` > /dev/null
cd .. cd ..
make java make java
cd java cd java
@ -12,4 +18,5 @@ fi
rm -f xgboost4j/src/main/resources/lib/libxgboostjavawrapper.so rm -f xgboost4j/src/main/resources/lib/libxgboostjavawrapper.so
mv libxgboostjavawrapper.so xgboost4j/src/main/resources/lib/ mv libxgboostjavawrapper.so xgboost4j/src/main/resources/lib/
popd > /dev/null
echo "complete" echo "complete"

2
src/io/dmlc_simple.cpp
View File

@ -153,7 +153,7 @@ class StdFile : public dmlc::Stream {
return std::fread(ptr, 1, size, fp); return std::fread(ptr, 1, size, fp);
} }
virtual void Write(const void *ptr, size_t size) { virtual void Write(const void *ptr, size_t size) {
std::fwrite(ptr, size, 1, fp); Check(std::fwrite(ptr, size, 1, fp) == 1, "StdFile::Write: fwrite error!");
} }
virtual void Seek(size_t pos) { virtual void Seek(size_t pos) {
std::fseek(fp, static_cast<long>(pos), SEEK_SET); // NOLINT(*) std::fseek(fp, static_cast<long>(pos), SEEK_SET); // NOLINT(*)

2
src/utils/io.h
View File

@ -33,7 +33,7 @@ class FileStream : public ISeekStream {
return std::fread(ptr, size, 1, fp); return std::fread(ptr, size, 1, fp);
} }
virtual void Write(const void *ptr, size_t size) { virtual void Write(const void *ptr, size_t size) {
std::fwrite(ptr, size, 1, fp); Check(std::fwrite(ptr, size, 1, fp) == 1, "FileStream::Write: fwrite error!");
} }
virtual void Seek(size_t pos) { virtual void Seek(size_t pos) {
std::fseek(fp, static_cast<long>(pos), SEEK_SET); // NOLINT(*) std::fseek(fp, static_cast<long>(pos), SEEK_SET); // NOLINT(*)