From 894302da3762e42a71396fa5c5196ebf39b203de Mon Sep 17 00:00:00 2001
From: liuqi <liuqi10@xiaomi.com>
Date: Fri, 9 Mar 2018 17:07:37 +0800
Subject: [PATCH] Support multiple outputs' operation.

---
 mace_tools.py | 1 +
 tuning_run.sh | 8 ++++----
 validate.py   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mace_tools.py b/mace_tools.py
index 0d420cd0..0c0823ea 100644
--- a/mace_tools.py
+++ b/mace_tools.py
@@ -211,6 +211,7 @@ def main(unused_args):
     for model_name in configs["models"]:
       # Transfer params by environment
       os.environ["MODEL_TAG"] = model_name
+      print '=======================', model_name, '======================='
       model_config = configs["models"][model_name]
       for key in model_config:
         if key in ['input_nodes', 'output_nodes'] and isinstance(model_config[key], list):
diff --git a/tuning_run.sh b/tuning_run.sh
index 1e0e5d94..14099227 100644
--- a/tuning_run.sh
+++ b/tuning_run.sh
@@ -44,14 +44,14 @@ else
   IFS=',' read -r -a INPUT_NAMES <<< "${INPUT_NODES}"
   for NAME in "${INPUT_NAMES[@]}";do
     FORMATTED_NAME=$(sed s/[^[:alnum:]]/_/g <<< ${NAME})
-    adb push ${MODEL_OUTPUT_DIR}/${INPUT_FILE_NAME}_${FORMATTED_NAME} ${PHONE_DATA_DIR} || exit 1
+    adb push ${MODEL_OUTPUT_DIR}/${INPUT_FILE_NAME}_${FORMATTED_NAME} ${PHONE_DATA_DIR} > /dev/null || exit 1
   done
 
-  adb push ${MODEL_OUTPUT_DIR}/mace_run ${PHONE_DATA_DIR} || exit 1
+  adb </dev/null push ${MODEL_OUTPUT_DIR}/mace_run ${PHONE_DATA_DIR} > /dev/null || exit 1
   if [ "$EMBED_MODEL_DATA" = 0 ]; then
-    adb push ${MODEL_OUTPUT_DIR}/${MODEL_TAG}.data ${PHONE_DATA_DIR} || exit 1
+    adb push ${MODEL_OUTPUT_DIR}/${MODEL_TAG}.data ${PHONE_DATA_DIR} > /dev/null || exit 1
   fi
-  adb push lib/hexagon/libhexagon_controller.so ${PHONE_DATA_DIR} || exit 1
+  adb push lib/hexagon/libhexagon_controller.so ${PHONE_DATA_DIR} > /dev/null || exit 1
   
   mace_adb_output=`adb </dev/null shell \
     "LD_LIBRARY_PATH=${PHONE_DATA_DIR} \
diff --git a/validate.py b/validate.py
index 758f7cfd..289ec308 100644
--- a/validate.py
+++ b/validate.py
@@ -95,7 +95,7 @@ def validate_caffe_model(input_names, input_shapes, output_names, output_shapes)
   net.forward()
 
   for i in range(len(output_names)):
-    value = net.blobs[output_names[i]].data[0]
+    value = net.blobs[net.top_names[output_names[i]][0]].data[0]
     out_shape = output_shapes[i]
     out_shape[1], out_shape[2], out_shape[3] = out_shape[3], out_shape[1], out_shape[2]
     value = value.reshape(out_shape).transpose((0, 2, 3, 1))
-- 
GitLab