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

Merge commit 'c0e0fc0c91dabdb86f68eed78e4a8f2b94fd1c2d'

Browse Source
This commit is contained in:
tqchen 2015-04-25 21:19:59 -07:00
commit 4abd76386b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subtree/rabit/include/dmlc/io.h
View File

@ -303,7 +303,7 @@ inline void Stream::Write(const std::vector<T> &vec) {
uint64_t sz = static_cast<uint64_t>(vec.size()); uint64_t sz = static_cast<uint64_t>(vec.size());
this->Write(&sz, sizeof(sz)); this->Write(&sz, sizeof(sz));
if (sz != 0) { if (sz != 0) {
this->Write(&vec[0], sizeof(T) * sz); this->Write(&vec[0], sizeof(T) * vec.size());
} }
} }
template<typename T> template<typename T>
@ -320,7 +320,7 @@ inline void Stream::Write(const std::string &str) {
uint64_t sz = static_cast<uint64_t>(str.length()); uint64_t sz = static_cast<uint64_t>(str.length());
this->Write(&sz, sizeof(sz)); this->Write(&sz, sizeof(sz));
if (sz != 0) { if (sz != 0) {
this->Write(&str[0], sizeof(char) * sz); this->Write(&str[0], sizeof(char) * str.length());
} }
} }
inline bool Stream::Read(std::string *out_str) { inline bool Stream::Read(std::string *out_str) {

3
subtree/rabit/windows/rabit/rabit.vcxproj
View File

@ -34,7 +34,7 @@
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
@ -86,6 +86,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>