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 2015/06/28 04:16:32 UTC
[7/7] incubator-singa git commit: Merge branch 'master' of
https://github.com/apache/incubator-singa
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/cce3aebe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/cce3aebe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/cce3aebe
Branch: refs/heads/master
Commit: cce3aebef3c26c17ee702865a17f454c4e5b2ecc
Parents: 9d2d859 7d9c0fb
Author: xiezl <xi...@comp.nus.edu.sg>
Authored: Sun Jun 28 00:16:49 2015 +0800
Committer: xiezl <xi...@comp.nus.edu.sg>
Committed: Sun Jun 28 00:16:49 2015 +0800
----------------------------------------------------------------------
bin/singa-cleanup.sh | 43 ---------------------
bin/singa-run.sh | 85 ++++++++++++++++++++++++++++++++++--------
bin/singa-stop.sh | 71 +++++++++++++++++++++++++++++++++++
bin/zk-service.sh | 28 ++++++--------
examples/cifar10/hostfile | 3 +-
include/trainer/trainer.h | 2 +-
include/utils/blob.h | 1 +
include/utils/common.h | 16 +++++---
src/main.cc | 12 ++++--
src/proto/cluster.proto | 2 +-
src/trainer/server.cc | 9 +++--
src/trainer/trainer.cc | 42 +++++++++++----------
src/trainer/worker.cc | 11 ++++--
src/utils/blob.cc | 2 +-
src/utils/cluster.cc | 4 +-
src/utils/common.cc | 56 +++++++++++++++++++---------
src/utils/param.cc | 30 +++++++++------
17 files changed, 271 insertions(+), 146 deletions(-)
----------------------------------------------------------------------