From 4d16ed5969d8963babd63ae650289dfb8fd633f4 Mon Sep 17 00:00:00 2001 From: Kai Li Date: Wed, 9 Jul 2014 09:47:28 +0800 Subject: [PATCH] Check the GPU mode to decide which memcpy to use --- src/caffe/util/math_functions.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/caffe/util/math_functions.cpp b/src/caffe/util/math_functions.cpp index df32093..9311a39 100644 --- a/src/caffe/util/math_functions.cpp +++ b/src/caffe/util/math_functions.cpp @@ -152,10 +152,10 @@ void caffe_add_scalar(const int N, const double alpha, double* Y) { template void caffe_copy(const int N, const Dtype* X, Dtype* Y) { if (X != Y) { - if (Caffe::mode() == Caffe::CPU) { - memcpy(Y, X, sizeof(Dtype) * N); - } else { + if (Caffe::mode() == Caffe::GPU) { CUDA_CHECK(cudaMemcpy(Y, X, sizeof(Dtype) * N, cudaMemcpyDefault)); + } else { + memcpy(Y, X, sizeof(Dtype) * N); } } } @@ -168,10 +168,10 @@ template void caffe_copy(const int N, const double* X, double* Y); void caffe_memcpy(const size_t N, const void* X, void* Y) { if (X != Y) { - if (Caffe::mode() == Caffe::CPU) { - memcpy(Y, X, N); - } else { + if (Caffe::mode() == Caffe::GPU) { CUDA_CHECK(cudaMemcpy(Y, X, N, cudaMemcpyDefault)); + } else { + memcpy(Y, X, N); } } } -- 2.7.4