Merge branch 'update_build_output_dir' into 'master'

update mace_tools output construction

See merge request !328

tools/mace_tools.py

@@ -170,6 +170,11 @@ def merge_libs_and_tuning_results(target_soc, output_dir, model_output_dirs):
   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:
     configs = yaml.load(f)
@@ -258,7 +263,8 @@ def main(unused_args):
         # Transfer params by environment
         os.environ["MODEL_TAG"] = model_name
         print '=======================', model_name, '======================='
-        skip_validation = configs["models"][model_name].get("skip_validation", 0)
+        skip_validation = configs["models"][model_name].get(
+            "skip_validation", 0)
         model_config = configs["models"][model_name]
         for key in model_config:
           if key in ['input_nodes', 'output_nodes'] and isinstance(
@@ -273,9 +279,11 @@ 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_path_digest, target_soc,
-                                               target_abi)
+        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)
 
         if FLAGS.mode == "build" or FLAGS.mode == "all":
@@ -316,7 +324,8 @@ def main(unused_args):
         if FLAGS.mode == "benchmark":
           benchmark_model(target_soc, model_output_dir, option_args)
 
-        if FLAGS.mode == "validate" or (FLAGS.mode == "all" and skip_validation == 0):
+        if FLAGS.mode == "validate" or (FLAGS.mode == "all" and
+                                        skip_validation == 0):
           validate_model(target_soc, model_output_dir)
 
       if FLAGS.mode == "build" or FLAGS.mode == "merge" or FLAGS.mode == "all":
@@ -334,6 +343,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()

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`
 

tools/packaging_lib.sh

+#!/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!"