From: Kai Li <kaili_kloud@163.com>
Date: Wed, 9 Jul 2014 17:57:16 +0000 (+0800)
Subject: Implement @Yangqing's solution to copy memory in the SyncedMemory
X-Git-Tag: submit/tizen/20180823.020014~653^2~77^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac0dd39252812aba1f67b9b0b0e18e62ea1742e6;p=platform%2Fupstream%2Fcaffeonacl.git

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
--- 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: