merge pull request 3; bug in compile using Makefile generated by configure
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/09c1b4ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/09c1b4ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/09c1b4ea Branch: refs/heads/master Commit: 09c1b4ea81bd1f4982a91d9a49052594272243aa Parents: 3921c29 Author: wang wei <[email protected]> Authored: Wed May 27 15:19:28 2015 +0800 Committer: wang wei <[email protected]> Committed: Wed May 27 15:19:28 2015 +0800 ---------------------------------------------------------------------- .gitignore | 2 +- examples/cifar10/model.conf | 8 ++++---- src/utils/cluster_rt.cc | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/09c1b4ea/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 8743732..577b6ef 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ build/ tmp/ include/proto/*.h src/proto/*.cc -src/proto/*.h +src/proto/*.pb.h .sync *lmdb *.binaryproto http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/09c1b4ea/examples/cifar10/model.conf ---------------------------------------------------------------------- diff --git a/examples/cifar10/model.conf b/examples/cifar10/model.conf index 2b17569..2105360 100644 --- a/examples/cifar10/model.conf +++ b/examples/cifar10/model.conf @@ -1,8 +1,8 @@ name: "cifar10-convnet" -train_steps: 2 -test_steps:2 -test_frequency:3 -display_frequency:2 +train_steps: 700 +test_steps:100 +test_frequency:300 +display_frequency:30 updater{ momentum:0.9 weight_decay:0.004 http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/09c1b4ea/src/utils/cluster_rt.cc ---------------------------------------------------------------------- diff --git a/src/utils/cluster_rt.cc b/src/utils/cluster_rt.cc index 6853a3a..fe9850f 100644 --- a/src/utils/cluster_rt.cc +++ b/src/utils/cluster_rt.cc @@ -1,4 +1,3 @@ -#include <zookeeper/zookeeper_log.h> #include "utils/cluster_rt.h" using std::to_string; @@ -116,7 +115,7 @@ bool ZKClusterRT::wJoinSGroup(int gid, int wid, int s_group){ sleep(SLEEP_SEC); continue; } - + LOG(ERROR) << "Unhandled ZK error code: " << ret << " (zoo_create)"; return false; } @@ -174,7 +173,7 @@ void ZKClusterRT::childChanges(zhandle_t *zh, int type, int state, const char *p string ZKClusterRT::getSGroupPath(int gid){ //return "/singa/status/sg"+to_string(gid); - return ZK_P_SINGA+ZK_P_STATUS+"/sg"+to_string(gid); + return ZK_P_SINGA+ZK_P_STATUS+"/sg"+to_string(gid); } string ZKClusterRT::getWorkerPath(int gid, int wid){
