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/27 15:47:59 UTC

[3/4] incubator-singa git commit: SINGA-26 Run distributed training in a single command

SINGA-26 Run distributed training in a single command

fix the bug that single-node command cannot kill processes


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/3af32e54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/3af32e54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/3af32e54

Branch: refs/heads/master
Commit: 3af32e54028ba356c0aa75e08890296dccc561bf
Parents: 064f95e
Author: wang sheng <wa...@gmail.com>
Authored: Sun Jun 28 03:53:31 2015 +0800
Committer: wang sheng <wa...@gmail.com>
Committed: Sun Jun 28 03:53:31 2015 +0800

----------------------------------------------------------------------
 bin/singa-run.sh  | 10 +++++-----
 bin/singa-stop.sh |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3af32e54/bin/singa-run.sh
----------------------------------------------------------------------
diff --git a/bin/singa-run.sh b/bin/singa-run.sh
index b69fe5d..697ae75 100755
--- a/bin/singa-run.sh
+++ b/bin/singa-run.sh
@@ -63,13 +63,13 @@ cd $BASE
 
 # clenup singa data
 if [ -z $host_path ] ; then
-  . $BIN/singa-stop.sh
+  $BIN/singa-stop.sh 
 else
-  . $BIN/singa-stop.sh $host_path
+  $BIN/singa-stop.sh $host_path
 fi
 
 # start zookeeper
-. $BIN/zk-service.sh start 2>/dev/null
+$BIN/zk-service.sh start 2>/dev/null
 
 # wait for zk service to be up
 sleep 3
@@ -100,7 +100,7 @@ fi
 
 # cleanup singa data
 if [ -z $host_path ] ; then
-  . $BIN/singa-stop.sh
+  $BIN/singa-stop.sh
 else
-  . $BIN/singa-stop.sh $host_path
+  $BIN/singa-stop.sh $host_path
 fi

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3af32e54/bin/singa-stop.sh
----------------------------------------------------------------------
diff --git a/bin/singa-stop.sh b/bin/singa-stop.sh
index acded75..75f2a5a 100755
--- a/bin/singa-stop.sh
+++ b/bin/singa-stop.sh
@@ -45,7 +45,7 @@ HOST_FILE=$1
 if [ $# = 0 ] ; then
   echo kill singa @ localhost ...
   cmd="killall -s SIGKILL "$PROC_NAME
-  exec $cmd
+  $cmd
 elif [ $# = 1 ] ; then
   ssh_options="-oStrictHostKeyChecking=no \
   -oUserKnownHostsFile=/dev/null \