Travis

diff --git a/include/caffe/common.hpp b/include/caffe/common.hpp
index 392bf2560c488c9eeb1daa7d5d21ad165ab57dd2..0d5c7436c77a5dae446c7c857a453054f056f87e 100644 (file)
--- a/include/caffe/common.hpp
+++ b/include/caffe/common.hpp
@@ -517,7 +517,7 @@ class Caffe {
   static std::mutex caffe_mutex_, pstream_mutex_, cublas_mutex_, cudnn_mutex_, seed_mutex_;
   static std::unordered_map<std::uint64_t, std::shared_ptr<Caffe>> thread_instance_map_;
 
-  static std::atomic_ulong epoch_count_;
+  static std::atomic<size_t> epoch_count_;
   shared_ptr<CudaStream> curand_stream_;
 
  private:

diff --git a/src/caffe/common.cpp b/src/caffe/common.cpp
index 26a516b09d947fe032b7b8cbdb2359de7114d722..d45c671c7de88b6aa13bcc969cf643b418187188 100644 (file)
--- a/src/caffe/common.cpp
+++ b/src/caffe/common.cpp
@@ -22,7 +22,7 @@ int Caffe::thread_count_ = 0;
 int Caffe::restored_iter_ = -1;
 std::atomic<uint64_t> Caffe::root_seed_(Caffe::SEED_NOT_SET);
 // NOLINT_NEXT_LINE(runtime/int)
-std::atomic_ulong Caffe::epoch_count_(static_cast<unsigned long>(-1L));
+std::atomic<size_t> Caffe::epoch_count_(static_cast<size_t>(-1L));
 
 std::mutex Caffe::caffe_mutex_;
 std::mutex Caffe::pstream_mutex_;