Implement @Yangqing's solution to copy memory in the SyncedMemory

diff --git a/src/caffe/syncedmem.cpp b/src/caffe/syncedmem.cpp
index 5d6d058..3f9a3be 100644 (file)
--- a/src/caffe/syncedmem.cpp
+++ b/src/caffe/syncedmem.cpp
@@ -33,8 +33,7 @@ inline void SyncedMemory::to_cpu() {
       CaffeMallocHost(&cpu_ptr_, size_);
       own_cpu_data_ = true;
     }
-    Caffe::set_mode(Caffe::GPU);
-    caffe_memcpy(size_, gpu_ptr_, cpu_ptr_);
+    CUDA_CHECK(cudaMemcpy(cpu_ptr_, gpu_ptr_, size_, cudaMemcpyDefault));
     head_ = SYNCED;
     break;
   case HEAD_AT_CPU:
@@ -54,8 +53,7 @@ inline void SyncedMemory::to_gpu() {
     if (gpu_ptr_ == NULL) {
       CUDA_CHECK(cudaMalloc(&gpu_ptr_, size_));
     }
-    Caffe::set_mode(Caffe::GPU);
-    caffe_memcpy(size_, cpu_ptr_, gpu_ptr_);
+    CUDA_CHECK(cudaMemcpy(gpu_ptr_, cpu_ptr_, size_, cudaMemcpyDefault));
     head_ = SYNCED;
     break;
   case HEAD_AT_GPU: