Merge branch 'pull4'
Conflicts:
examples/cifar10/model.conf.example
SINGA-7 Implement shared memory Hogwild algorithm
merge pull request 4
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/bfc09c13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/bfc09c13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/bfc09c13
Branch: refs/heads/master
Commit: bfc09c13eacdc6d79eadaebfbebaed1f70feb236
Parents: e990442 d5f9b9c
Author: wang sheng <[email protected]>
Authored: Mon Jun 15 14:28:51 2015 +0800
Committer: wang sheng <[email protected]>
Committed: Mon Jun 15 14:28:51 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 -
examples/cifar10/cluster.conf.example | 6 -
examples/cifar10/model-lmdb.conf.example | 218 -
examples/cifar10/model-prefetch.conf.example | 241 -
examples/cifar10/model.conf.example | 218 -
examples/mnist/cluster.conf.example | 5 -
examples/mnist/conv.conf.example | 175 -
examples/mnist/mlp-lmdb.conf.example | 223 -
examples/mnist/mlp.conf.example | 221 -
include/communication/msg.h | 6 +-
include/trainer/trainer.h | 7 +-
include/trainer/worker.h | 59 +-
include/utils/cluster.h | 8 +
include/utils/param.h | 71 +-
src/proto/cluster.pb.h | 1131 ---
src/proto/cluster.proto | 5 +
src/proto/model.pb.h | 8671 ---------------------
src/trainer/server.cc | 7 +-
src/trainer/trainer.cc | 85 +-
src/trainer/worker.cc | 130 +-
src/utils/param.cc | 278 +-
21 files changed, 246 insertions(+), 11520 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/bfc09c13/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/bfc09c13/src/trainer/worker.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/bfc09c13/src/utils/param.cc
----------------------------------------------------------------------
