Merge branch 'model_header' into 'master'

Add model header template and move all generated file to same place.

See merge request !57

build_mace_run.sh

@@ -67,4 +67,7 @@ fi
 cp bazel-bin/examples/mace_run $MODEL_OUTPUT_DIR
 if [ "$EMBED_MODEL_DATA" = 0 ]; then
   cp codegen/models/${MODEL_TAG}/${MODEL_TAG}.data $MODEL_OUTPUT_DIR
-fi
+fi
\ No newline at end of file
+
+# copy model header file to build output dir
+cp codegen/models/${MODEL_TAG}/${MODEL_TAG}.h $MODEL_OUTPUT_DIR

generate_production_code.sh

@@ -20,8 +20,8 @@ if [ "$PULL_OR_NOT" = 1 ]; then
   rm -rf ${CL_BIN_DIR}
   mkdir -p ${CL_BIN_DIR}
   if [ x"$TARGET_ABI" != x"host" ]; then
-    adb pull ${KERNEL_DIR}/. ${CL_BIN_DIR}
-    adb pull ${PHONE_DATA_DIR}/mace_run.config ${CL_BIN_DIR}
+    adb pull ${KERNEL_DIR}/. ${CL_BIN_DIR} > /dev/null
+    adb pull ${PHONE_DATA_DIR}/mace_run.config ${CL_BIN_DIR} > /dev/null
   fi
 fi
 

merge_libs.sh

@@ -15,9 +15,12 @@ source ${CURRENT_DIR}/env.sh
 LIBMACE_BUILD_DIR=$1
 MODEL_OUTPUT_DIRS=$2
 MODEL_OUTPUT_DIRS_ARR=(${MODEL_OUTPUT_DIRS//,/ })
+MODEL_HEADER_DIR=${LIBMACE_BUILD_DIR}/libmace/include/mace/public
+MODEL_DATA_DIR=${LIBMACE_BUILD_DIR}/libmace/data
 
 rm -rf ${LIBMACE_BUILD_DIR}/libmace
 mkdir -p ${LIBMACE_BUILD_DIR}/libmace/lib
+mkdir -p ${MODEL_DATA_DIR}
 cp -rf ${LIBMACE_SOURCE_DIR}/include ${LIBMACE_BUILD_DIR}/libmace/
 cp ${LIBMACE_SOURCE_DIR}/lib/hexagon/libhexagon_controller.so ${LIBMACE_BUILD_DIR}/libmace/lib
 
@@ -38,6 +41,12 @@ for model_output_dir in ${MODEL_OUTPUT_DIRS_ARR[@]}; do
   for lib in ${model_output_dir}/*.a; do
     echo "addlib ${lib}" >> ${LIBMACE_TEMP_DIR}/libmace_${PROJECT_NAME}.mri
   done
+  for data_file in ${model_output_dir}/*.data; do
+    cp ${data_file} ${MODEL_DATA_DIR}
+  done
+  for header_file in ${model_output_dir}/*.h; do
+    cp ${header_file} ${MODEL_HEADER_DIR}
+  done
 done
 echo "save" >> ${LIBMACE_TEMP_DIR}/libmace_${PROJECT_NAME}.mri
 echo "end" >> ${LIBMACE_TEMP_DIR}/libmace_${PROJECT_NAME}.mri