From 241e2075958106fe72ac520217985a3db9466b06 Mon Sep 17 00:00:00 2001
From: yejianwu <yejianwu@xiaomi.com>
Date: Fri, 23 Mar 2018 16:43:19 +0800
Subject: [PATCH] update mace_tools output construction

---
 tools/mace_tools.py    |  9 ++++++++-
 tools/merge_libs.sh    | 10 +++++-----
 tools/packaging_lib.sh | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 tools/packaging_lib.sh

diff --git a/tools/mace_tools.py b/tools/mace_tools.py
index 78c42fa1..13f54eb0 100644
--- a/tools/mace_tools.py
+++ b/tools/mace_tools.py
@@ -169,6 +169,10 @@ def merge_libs_and_tuning_results(target_soc, output_dir, model_output_dirs):
                                                        model_output_dirs_str)
   run_command(command)
 
+def packaging_lib_file(output_dir):
+  command = "bash tools/packaging_lib.sh {}".format(output_dir)
+  run_command(command)
+
 
 def parse_model_configs():
   with open(FLAGS.config) as f:
@@ -273,7 +277,8 @@ def main(unused_args):
         md5 = hashlib.md5()
         md5.update(model_config["model_file_path"])
         model_path_digest = md5.hexdigest()
-        model_output_dir = "%s/%s/%s/%s/%s" % (FLAGS.output_dir, model_name,
+        model_output_dir = "%s/%s/%s/%s/%s/%s/%s" % (FLAGS.output_dir, os.environ["PROJECT_NAME"],
+                                               "build", model_name,
                                                model_path_digest, target_soc,
                                                target_abi)
         model_output_dirs.append(model_output_dir)
@@ -334,6 +339,8 @@ def main(unused_args):
         build_run_throughput_test(target_soc, FLAGS.run_seconds,
                                   merged_lib_file, FLAGS.output_dir)
 
+  packaging_lib_file(FLAGS.output_dir)
+
 
 if __name__ == "__main__":
   FLAGS, unparsed = parse_args()
diff --git a/tools/merge_libs.sh b/tools/merge_libs.sh
index a2b02cd6..cc4cd4b0 100644
--- a/tools/merge_libs.sh
+++ b/tools/merge_libs.sh
@@ -22,18 +22,18 @@ MODEL_DATA_DIR=${LIBMACE_BUILD_DIR}/data
 if [ ! -d "${MODEL_HEADER_DIR}" ]; then
   mkdir -p ${MODEL_HEADER_DIR}
 fi
+cp -rf ${MACE_SOURCE_DIR}/mace/public/*.h ${LIBMACE_BUILD_DIR}/include/mace/public/
+
 if [ ! -d "${LIBMACE_BUILD_DIR}/${TARGET_ABI}" ]; then
   mkdir -p ${LIBMACE_BUILD_DIR}/${TARGET_ABI}
 fi
-if [ ! -d "${LIBMACE_BUILD_DIR}/hexagon" ]; then
-  mkdir -p ${LIBMACE_BUILD_DIR}/hexagon
-fi
 if [ ! -d "${MODEL_DATA_DIR}" ]; then
   mkdir -p ${MODEL_DATA_DIR}
 fi
 
-cp -rf ${MACE_SOURCE_DIR}/mace/public/*.h ${LIBMACE_BUILD_DIR}/include/mace/public/
-cp ${MACE_SOURCE_DIR}/mace/core/runtime/hexagon/libhexagon_controller.so ${LIBMACE_BUILD_DIR}/hexagon/
+if [ x"${TARGET_ABI}" = x"armeabi-v7a" ]; then
+  cp ${MACE_SOURCE_DIR}/mace/core/runtime/hexagon/libhexagon_controller.so ${LIBMACE_BUILD_DIR}/${TARGET_ABI}/
+fi
 
 LIBMACE_TEMP_DIR=`mktemp -d -t libmace.XXXX`
 
diff --git a/tools/packaging_lib.sh b/tools/packaging_lib.sh
new file mode 100644
index 00000000..60751487
--- /dev/null
+++ b/tools/packaging_lib.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+Usage() {
+  echo "Usage: bash tools/packaging_lib.sh libmace_output_dir"
+}
+
+if [ $# -lt 1 ]; then
+  Usage
+  exit 1
+fi
+
+CURRENT_DIR=`dirname $0`
+source ${CURRENT_DIR}/env.sh
+
+LIBMACE_BUILD_DIR=$1
+
+pushd $LIBMACE_BUILD_DIR/$PROJECT_NAME
+ls | grep -v build | xargs tar cvzf libmace_${PROJECT_NAME}.tar.gz
+popd
+
+echo "Packaging done!"
-- 
GitLab