From 1cdfd952934a03ae9f41be7b815d7659c7c9e8aa Mon Sep 17 00:00:00 2001
From: yejianwu <yejianwu@xiaomi.com>
Date: Mon, 19 Mar 2018 16:03:27 +0800
Subject: [PATCH] update device_id for target_soc not found error msg

---
 tools/benchmark.sh                 | 8 +++++++-
 tools/build_run_throughput_test.sh | 8 +++++++-
 tools/clear_env.sh                 | 8 +++++++-
 tools/env.sh                       | 4 ++++
 tools/generate_production_code.sh  | 8 +++++++-
 tools/tuning_run.sh                | 8 +++++++-
 tools/validate_tools.sh            | 8 +++++++-
 7 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/tools/benchmark.sh b/tools/benchmark.sh
index dbcc862c..409bfeb4 100644
--- a/tools/benchmark.sh
+++ b/tools/benchmark.sh
@@ -18,7 +18,13 @@ OPTION_ARGS=$3
 
 echo $OPTION_ARGS
 
-DEVICE_ID=`echo_device_id_by_soc $TARGET_SOC`
+RESULT_VALUE=`echo_device_id_by_soc $TARGET_SOC`
+if [ $? -ne 0 ]; then
+  echo $RESULT_VALUE
+  exit 1
+else
+  DEVICE_ID=$RESULT_VALUE
+fi
 
 if [ -f "$MODEL_OUTPUT_DIR/benchmark_model" ]; then
   rm -rf $MODEL_OUTPUT_DIR/benchmark_model
diff --git a/tools/build_run_throughput_test.sh b/tools/build_run_throughput_test.sh
index aa1bf074..ef148e6a 100644
--- a/tools/build_run_throughput_test.sh
+++ b/tools/build_run_throughput_test.sh
@@ -17,7 +17,13 @@ RUN_SECONDS=$2
 MERGED_LIB_FILE=$3
 MODEL_INPUT_DIR=$4
 
-DEVICE_ID=`echo_device_id_by_soc $TARGET_SOC`
+RESULT_VALUE=`echo_device_id_by_soc $TARGET_SOC`
+if [ $? -ne 0 ]; then
+  echo $RESULT_VALUE
+  exit 1
+else
+  DEVICE_ID=$RESULT_VALUE
+fi
 
 if [ "$CPU_MODEL_TAG" != '' ]; then
   CPU_MODEL_TAG_BUILD_FLAGS="--copt=-DMACE_CPU_MODEL_TAG=${CPU_MODEL_TAG}"
diff --git a/tools/clear_env.sh b/tools/clear_env.sh
index cc8a6f00..ef14f55b 100644
--- a/tools/clear_env.sh
+++ b/tools/clear_env.sh
@@ -13,7 +13,13 @@ CURRENT_DIR=`dirname $0`
 source ${CURRENT_DIR}/env.sh
 
 TARGET_SOC=$1
-DEVICE_ID=`echo_device_id_by_soc $TARGET_SOC`
+RESULT_VALUE=`echo_device_id_by_soc $TARGET_SOC`
+if [ $? -ne 0 ]; then
+  echo $RESULT_VALUE
+  exit 1
+else
+  DEVICE_ID=$RESULT_VALUE
+fi
 
 if [ x"$TARGET_ABI" != x"host" ]; then
   adb -s $DEVICE_ID shell rm -rf $PHONE_DATA_DIR || exit 1
diff --git a/tools/env.sh b/tools/env.sh
index 254ddd69..f48787a8 100644
--- a/tools/env.sh
+++ b/tools/env.sh
@@ -40,6 +40,10 @@ echo_device_id_by_soc()
     device_soc=`adb -s ${device} shell getprop | grep ro.board.platform | cut -d [ -f3 | cut -d ] -f1`
     if [ x"$TARGET_SOC" = x"$device_soc" ]; then
       echo "$device"
+      return 0
     fi
   done
+
+  echo "MACE ERROR: Not found device with soc ${TARGET_SOC}"
+  return 1
 }
diff --git a/tools/generate_production_code.sh b/tools/generate_production_code.sh
index c713b47a..f4f021c4 100644
--- a/tools/generate_production_code.sh
+++ b/tools/generate_production_code.sh
@@ -16,7 +16,13 @@ TARGET_SOC=$1
 CL_BIN_DIRS=$2
 PULL_OR_NOT=$3
 
-DEVICE_ID=`echo_device_id_by_soc $TARGET_SOC`
+RESULT_VALUE=`echo_device_id_by_soc $TARGET_SOC`
+if [ $? -ne 0 ]; then
+  echo $RESULT_VALUE
+  exit 1
+else
+  DEVICE_ID=$RESULT_VALUE
+fi
 
 if [ "$PULL_OR_NOT" = 1 ]; then
   CL_BIN_DIR=${CL_BIN_DIRS}
diff --git a/tools/tuning_run.sh b/tools/tuning_run.sh
index 1d9f57e5..c4e8dbe9 100644
--- a/tools/tuning_run.sh
+++ b/tools/tuning_run.sh
@@ -22,7 +22,13 @@ OPTION_ARGS=$7
 
 echo $OPTION_ARGS
 
-DEVICE_ID=`echo_device_id_by_soc $TARGET_SOC`
+RESULT_VALUE=`echo_device_id_by_soc $TARGET_SOC`
+if [ $? -ne 0 ]; then
+  echo $RESULT_VALUE
+  exit 1
+else
+  DEVICE_ID=$RESULT_VALUE
+fi
 
 if [ x"$TARGET_ABI" = x"host" ]; then
   MACE_CPP_MIN_VLOG_LEVEL=$VLOG_LEVEL \
diff --git a/tools/validate_tools.sh b/tools/validate_tools.sh
index 7e6159c4..1001ed80 100644
--- a/tools/validate_tools.sh
+++ b/tools/validate_tools.sh
@@ -16,7 +16,13 @@ TARGET_SOC=$1
 MODEL_OUTPUT_DIR=$2
 GENERATE_DATA_OR_NOT=$3
 
-DEVICE_ID=`echo_device_id_by_soc $TARGET_SOC`
+RESULT_VALUE=`echo_device_id_by_soc $TARGET_SOC`
+if [ $? -ne 0 ]; then
+  echo $RESULT_VALUE
+  exit 1
+else
+  DEVICE_ID=$RESULT_VALUE
+fi
 
 IFS=',' read -r -a INPUT_NAMES <<< "${INPUT_NODES}"
 IFS=',' read -r -a OUTPUT_NAMES <<< "${OUTPUT_NODES}"
-- 
GitLab