Merge SINGA-189 with the latest code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/7a191650 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/7a191650 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/7a191650 Branch: refs/heads/master Commit: 7a19165022b254a5d7f5b2a0cd4cdc36d95059e2 Parents: da23e57 fa2ea30 Author: Wei Wang <[email protected]> Authored: Fri Jun 3 11:10:15 2016 +0800 Committer: Wei Wang <[email protected]> Committed: Fri Jun 3 11:27:24 2016 +0800 ---------------------------------------------------------------------- include/singa/core/common.h | 2 +- src/model/layer/activation.cc | 10 +- src/model/layer/batchnorm.cc | 70 ++++++++ src/model/layer/batchnorm.h | 84 ++++++++++ src/model/layer/cudnn_activation.cc | 13 +- src/model/layer/cudnn_batchnorm.cc | 214 +++++++++++++++++++++++++ src/model/layer/cudnn_batchnorm.h | 60 +++++++ src/model/layer/cudnn_convolution.cc | 3 +- src/model/layer/cudnn_lrn.cc | 118 ++++++++++++++ src/model/layer/cudnn_lrn.h | 56 +++++++ src/model/layer/cudnn_pooling.cc | 7 +- src/model/layer/cudnn_softmax.cc | 4 +- src/model/layer/dense.cc | 86 ++++++++++ src/model/layer/dense.h | 70 ++++++++ src/model/layer/lrn.cc | 59 +++++++ src/model/layer/lrn.h | 70 ++++++++ src/model/layer/softmax.cc | 10 +- src/proto/model.proto | 34 +++- test/singa/test_activation.cc | 8 +- test/singa/test_cudnn_activation.cc | 6 +- test/singa/test_cudnn_batchnorm.cc | 257 ++++++++++++++++++++++++++++++ test/singa/test_cudnn_lrn.cc | 205 ++++++++++++++++++++++++ test/singa/test_cudnn_softmax.cc | 6 +- test/singa/test_dense.cc | 249 +++++++++++++++++++++++++++++ test/singa/test_softmax.cc | 6 +- 25 files changed, 1674 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
