Merge branch 'master' of https://github.com/apache/incubator-singa
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/017b0425 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/017b0425 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/017b0425 Branch: refs/heads/master Commit: 017b042508f451704a8c1b9c2e1cec6576a86d6c Parents: 24960c9 9d07f3c Author: wang sheng <[email protected]> Authored: Wed Jun 17 14:07:33 2015 +0800 Committer: wang sheng <[email protected]> Committed: Wed Jun 17 14:07:33 2015 +0800 ---------------------------------------------------------------------- examples/cifar10/cluster.conf | 4 ++-- include/neuralnet/base_layer.h | 26 +++++++++++++------------- include/neuralnet/layer.h | 26 +++++++++++++------------- include/trainer/worker.h | 2 +- src/neuralnet/base_layer.cc | 26 +++++++++++++------------- src/neuralnet/layer.cc | 32 ++++++++++++++++---------------- src/proto/model.proto | 2 ++ src/trainer/trainer.cc | 3 +-- src/trainer/worker.cc | 10 +++++----- 9 files changed, 66 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
