diff --git a/include/rabit/io.h b/include/rabit/io.h index d7597b915..b6b627b7f 100644 --- a/include/rabit/io.h +++ b/include/rabit/io.h @@ -38,7 +38,7 @@ struct MemoryFixSizeBuffer : public ISeekStream { utils::Assert(curr_ptr_ + size <= buffer_size_, "read can not have position excceed buffer length"); size_t nread = std::min(buffer_size_ - curr_ptr_, size); - if (nread != 0) memcpy(ptr, p_buffer_ + curr_ptr_, nread); + if (nread != 0) std::memcpy(ptr, p_buffer_ + curr_ptr_, nread); curr_ptr_ += nread; return nread; } @@ -46,7 +46,7 @@ struct MemoryFixSizeBuffer : public ISeekStream { if (size == 0) return; utils::Assert(curr_ptr_ + size <= buffer_size_, "write position exceed fixed buffer size"); - memcpy(p_buffer_ + curr_ptr_, ptr, size); + std::memcpy(p_buffer_ + curr_ptr_, ptr, size); curr_ptr_ += size; } virtual void Seek(size_t pos) { @@ -77,7 +77,7 @@ struct MemoryBufferStream : public ISeekStream { utils::Assert(curr_ptr_ <= p_buffer_->length(), "read can not have position excceed buffer length"); size_t nread = std::min(p_buffer_->length() - curr_ptr_, size); - if (nread != 0) memcpy(ptr, &(*p_buffer_)[0] + curr_ptr_, nread); + if (nread != 0) std::memcpy(ptr, &(*p_buffer_)[0] + curr_ptr_, nread); curr_ptr_ += nread; return nread; } @@ -86,7 +86,7 @@ struct MemoryBufferStream : public ISeekStream { if (curr_ptr_ + size > p_buffer_->length()) { p_buffer_->resize(curr_ptr_+size); } - memcpy(&(*p_buffer_)[0] + curr_ptr_, ptr, size); + std::memcpy(&(*p_buffer_)[0] + curr_ptr_, ptr, size); curr_ptr_ += size; } virtual void Seek(size_t pos) { diff --git a/src/allreduce_mock.h b/src/allreduce_mock.h index 11005f4ba..7a16c1393 100644 --- a/src/allreduce_mock.h +++ b/src/allreduce_mock.h @@ -81,6 +81,7 @@ class AllreduceMock : public AllreduceRobust { ComboSerializer com(global_model, local_model); AllreduceRobust::CheckPoint(&dum, &com); } + tsum_allreduce = 0.0; time_checkpoint = utils::GetTime(); double tcost = utils::GetTime() - tstart; if (report_stats != 0 && rank == 0) {