From b8be6b1ba425acaf540d23160cb364e3c9d9974e Mon Sep 17 00:00:00 2001 From: Jeff Donahue Date: Tue, 5 Aug 2014 16:59:14 -0700 Subject: [PATCH] Create caffe_{,gpu_}memset functions to replace {m,cudaM}emset's. --- include/caffe/util/math_functions.hpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/caffe/util/math_functions.hpp b/include/caffe/util/math_functions.hpp index 744dc84..6004e93 100644 --- a/include/caffe/util/math_functions.hpp +++ b/include/caffe/util/math_functions.hpp @@ -6,6 +6,7 @@ #include "glog/logging.h" +#include "caffe/common.hpp" #include "caffe/util/device_alternate.hpp" #include "caffe/util/mkl_alternate.hpp" @@ -38,6 +39,10 @@ void caffe_copy(const int N, const Dtype *X, Dtype *Y); template void caffe_set(const int N, const Dtype alpha, Dtype *X); +inline void caffe_memset(const size_t N, const int alpha, void* X) { + memset(X, alpha, N); +} + template void caffe_add_scalar(const int N, const Dtype alpha, Dtype *X); @@ -165,6 +170,14 @@ void caffe_gpu_memcpy(const size_t N, const void *X, void *Y); template void caffe_gpu_set(const int N, const Dtype alpha, Dtype *X); +inline void caffe_gpu_memset(const size_t N, const int alpha, void* X) { +#ifndef CPU_ONLY + CUDA_CHECK(cudaMemset(X, alpha, N)); // NOLINT(caffe/alt_fn) +#else + NO_GPU; +#endif +} + template void caffe_gpu_add_scalar(const int N, const Dtype alpha, Dtype *X); -- 2.7.4