You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2016/04/07 14:59:53 UTC
[2/2] incubator-singa git commit: SINGA-136 Support cuDNN v4
SINGA-136 Support cuDNN v4
Merge branch 'cudnnv4' into latest
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/369d8796
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/369d8796
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/369d8796
Branch: refs/heads/master
Commit: 369d8796075778724708ddc4cafba0f9170257dd
Parents: 5f67e57 3b2e895
Author: Wei Wang <wa...@comp.nus.edu.sg>
Authored: Thu Apr 7 20:52:11 2016 +0800
Committer: Wei Wang <wa...@comp.nus.edu.sg>
Committed: Thu Apr 7 20:58:29 2016 +0800
----------------------------------------------------------------------
examples/cifar10/cudnn_bm.conf | 42 +++++++++++++++++++++++++++++
include/singa/neuralnet/neuron_layer.h | 8 ++++--
src/neuralnet/neuron_layer/bm.cc | 12 +++------
src/neuralnet/neuron_layer/cudnn_bm.cc | 10 +++----
4 files changed, 56 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/369d8796/include/singa/neuralnet/neuron_layer.h
----------------------------------------------------------------------
diff --cc include/singa/neuralnet/neuron_layer.h
index 151cdf9,7c041f1..e6f0fd5
--- a/include/singa/neuralnet/neuron_layer.h
+++ b/include/singa/neuralnet/neuron_layer.h
@@@ -485,10 -480,7 +491,8 @@@ class CudnnBMLayer : public BMLayer, pu
cudnnTensorDescriptor_t bnScaleBiasDiff_desc_;
Blob<float> resultSaveMean_;
Blob<float> resultSaveInvVariance_;
- Blob<float> resultRunningMean_;
- Blob<float> resultRunningInvVariance_;
};
+#endif
#endif // USE_CUDNN
/******************** RBM layers *****************/
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/369d8796/src/neuralnet/neuron_layer/cudnn_bm.cc
----------------------------------------------------------------------
diff --cc src/neuralnet/neuron_layer/cudnn_bm.cc
index 257b8e3,d33c61d..ca90007
--- a/src/neuralnet/neuron_layer/cudnn_bm.cc
+++ b/src/neuralnet/neuron_layer/cudnn_bm.cc
@@@ -113,8 -111,8 +111,8 @@@ void CudnnBMLayer::ComputeFeature(int f
bnScale_->data().gpu_data(),
bnBias_->data().gpu_data(),
exponentialAverageFactor,
- resultRunningMean_.mutable_gpu_data(),
- resultRunningInvVariance_.mutable_gpu_data(),
- resultRunningMean_->data().mutable_gpu_data(),
- resultRunningInvVariance_->data().mutable_gpu_data(),
++ resultRunningMean_->mutable_data()->mutable_gpu_data(),
++ resultRunningInvVariance_->mutable_data()->mutable_gpu_data(),
epsilon,
resultSaveMean_.mutable_gpu_data(),
resultSaveInvVariance_.mutable_gpu_data()));