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/8133ac5f Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/8133ac5f Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/8133ac5f Branch: refs/heads/master Commit: 8133ac5f75ed85c20faec541ed4958a2c737d5c3 Parents: 1c124e3 7d39f88 Author: xiezl <[email protected]> Authored: Wed Jun 24 21:54:03 2015 +0800 Committer: xiezl <[email protected]> Committed: Wed Jun 24 21:54:03 2015 +0800 ---------------------------------------------------------------------- Makefile.am | 26 +- Makefile.in | 1011 +- aclocal.m4 | 7371 +------ config.h.in | 9 +- config/config.guess | 615 +- config/config.sub | 434 +- config/depcomp | 637 +- config/install-sh | 538 +- config/ltmain.sh | 14884 +++++++------ config/missing | 453 +- configure | 32340 +++++++++++++--------------- examples/cifar10/Makefile | 20 - examples/cifar10/Makefile.example | 20 + examples/cifar10/cluster.conf | 1 + examples/cifar10/model-lmdb.conf | 218 - examples/cifar10/model-prefetch.conf | 241 - examples/cifar10/model.conf | 79 +- examples/mnist/Makefile.example | 22 + examples/mnist/cluster.conf | 4 +- examples/mnist/create_shard.cc | 17 +- examples/mnist/mlp-lmdb.conf | 223 - examples/mnist/mlp.conf | 221 - examples/mnist/model.conf | 224 + include/communication/msg.h | 33 +- include/communication/socket.h | 161 +- include/neuralnet/base_layer.h | 7 +- include/neuralnet/layer.h | 9 +- include/trainer/server.h | 20 +- include/trainer/trainer.h | 138 +- include/utils/blob.h | 2 +- include/utils/cluster.h | 13 +- include/utils/cluster_rt.h | 123 +- include/utils/common.h | 116 +- include/utils/data_shard.h | 99 +- include/utils/factory.h | 80 +- include/utils/param.h | 145 +- include/utils/singleton.h | 18 +- src/communication/msg.cc | 8 +- src/communication/socket.cc | 159 +- src/main.cc | 4 +- src/neuralnet/base_layer.cc | 13 +- src/neuralnet/layer.cc | 100 +- src/neuralnet/neuralnet.cc | 78 +- src/proto/cluster.proto | 47 +- src/proto/common.proto | 80 + src/proto/model.proto | 581 +- src/test/test_cluster.cc | 30 +- src/test/test_shard.cc | 64 + src/trainer/server.cc | 54 +- src/trainer/trainer.cc | 574 +- src/trainer/worker.cc | 31 +- src/utils/cluster.cc | 50 +- src/utils/cluster_rt.cc | 248 +- src/utils/common.cc | 54 +- src/utils/data_shard.cc | 308 +- src/utils/param.cc | 239 +- src/utils/updater.cc | 53 +- tool/cpplint.py | 12 +- 58 files changed, 28678 insertions(+), 34681 deletions(-) ----------------------------------------------------------------------
