From ac0dd39252812aba1f67b9b0b0e18e62ea1742e6 Mon Sep 17 00:00:00 2001
From: Kai Li <kaili_kloud@163.com>
Date: Thu, 10 Jul 2014 01:57:16 +0800
Subject: [PATCH] Implement @Yangqing's solution to copy memory in the
 SyncedMemory

---
 src/caffe/syncedmem.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/caffe/syncedmem.cpp b/src/caffe/syncedmem.cpp
index 5d6d058..3f9a3be 100644
--- 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:
-- 
2.7.4