Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/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/f1ecd78a Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/f1ecd78a Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/f1ecd78a Branch: refs/heads/master Commit: f1ecd78acc0037531e31fcd74dd02a561eebca54 Parents: d7849a9 af23545 Author: xiezl <[email protected]> Authored: Wed May 27 11:06:57 2015 +0800 Committer: xiezl <[email protected]> Committed: Wed May 27 11:06:57 2015 +0800 ---------------------------------------------------------------------- Makefile.example | 91 ++++++++++++++++++++++++++++++++++++++++++ include/trainer/trainer.h | 2 + include/trainer/worker.h | 2 + src/trainer/trainer.cc | 14 +++---- 4 files changed, 102 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
