Repository: incubator-singa Updated Branches: refs/heads/master 040cbb2e1 -> efdf6d711
SINGA-136 Support cuDNN v4 cudnn_convolution.cc: Add cudnn Vesrion Macro Support cuDNN V4 Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/afc50a95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/afc50a95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/afc50a95 Branch: refs/heads/master Commit: afc50a9551fed1d83589d07e7cf16084bed8a011 Parents: 348c5e5 Author: seaok <[email protected]> Authored: Wed Apr 6 07:32:00 2016 +0800 Committer: seaok <[email protected]> Committed: Wed Apr 6 07:32:00 2016 +0800 ---------------------------------------------------------------------- src/neuralnet/neuron_layer/cudnn_convolution.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/afc50a95/src/neuralnet/neuron_layer/cudnn_convolution.cc ---------------------------------------------------------------------- diff --git a/src/neuralnet/neuron_layer/cudnn_convolution.cc b/src/neuralnet/neuron_layer/cudnn_convolution.cc index ca67a7d..560ee63 100644 --- a/src/neuralnet/neuron_layer/cudnn_convolution.cc +++ b/src/neuralnet/neuron_layer/cudnn_convolution.cc @@ -151,6 +151,16 @@ void CudnnConvLayer::ComputeFeature(int flag, const vector<Layer*>& srclayers) { data_.mutable_gpu_data())); if (bias_) { beta = 1.f; + +#if CUDNN_MAJOR == 4 + CHECK_CUDNN(cudnnAddTensor(handle_, + &alpha, + bias_desc_, + bias_->data().gpu_data(), + &beta, + my_desc_, + data_.mutable_gpu_data())); +#else CHECK_CUDNN(cudnnAddTensor(handle_, CUDNN_ADD_SAME_C, &alpha, @@ -159,6 +169,7 @@ void CudnnConvLayer::ComputeFeature(int flag, const vector<Layer*>& srclayers) { &beta, my_desc_, data_.mutable_gpu_data())); +#endif } }
