Merge export_local_lib to export_lib.

tools/export_lib.sh

@@ -71,6 +71,17 @@ build_target()
     $DSP_MODE_BUILD_FLAGS || exit -1
 }
 
+build_local_target()
+{
+  BAZEL_TARGET=$1
+  bazel build --verbose_failures -c opt --strip always $BAZEL_TARGET \
+    --copt="-std=c++11" \
+    --copt="-D_GLIBCXX_USE_C99_MATH_TR1" \
+    --copt="-Werror=return-type" \
+    --copt="-DMACE_OBFUSCATE_LITERALS" \
+    --define openmp=true || exit -1
+}
+
 merge_libs()
 {
   CREATE_LIB_NAME=$1
@@ -113,10 +124,17 @@ bash mace/tools/git/gen_version_source.sh ${CODEGEN_DIR}/version/version.cc || e
 
 echo "Step 3: Build libmace targets"
 bazel clean
-for target in ${all_targets[*]}
-do
-  build_target ${target}
-done
+if [ x"${RUNTIME}" = x"local" ]; then
+  for target in ${all_targets[*]}
+  do
+    build_local_target ${target}
+  done
+else
+  for target in ${all_targets[*]}
+  do
+    build_target ${target}
+  done
+fi
 
 
 echo "Step 4: Create mri files and generate merged libs"

tools/export_local_lib.sh

-#!/bin/bash
-
-set -e
-
-Usage() {
-  echo "Usage: ./tools/export_local_lib.sh export_include_dir export_lib_dir"
-  echo "eg: ./tools/export_local_lib.sh ../include ../lib/libmace_v7"
-}
-
-if [ $# -lt 2 ]; then
-  Usage
-  exit -1
-fi
-
-EXPORT_INCLUDE_DIR=$1
-EXPORT_LIB_DIR=$2
-
-MACE_SOURCE_DIR=`/bin/pwd`
-CODEGEN_DIR=${MACE_SOURCE_DIR}/mace/codegen
-VERSION_CODEGEN_DIR=${CODEGEN_DIR}/version
-STRIP="--strip always"
-
-# TO REMOVE
-LIBMACE_TEMP_DIR=`mktemp -d -t libmace.XXXX`
-
-LIBMACE_NAME="libmace"
-LIBMACE_DEV_NAME="libmace_dev"
-LIBMACE_PROD_NAME="libmace_prod"
-
-libmace_targets=(
-  "//mace/ops:ops"
-  "//mace/kernels:kernels"
-  "//mace/codegen:generated_version"
-  "//mace/core:core"
-  "//mace/utils:logging"
-)
-
-libmace_dev_targets=(
-  "//mace/codegen:generated_opencl_dev"
-  "//mace/core:opencl_dev"
-  "//mace/utils:tuner_dev"
-)
-
-libmace_prod_targets=(
-  "//mace/core:opencl_prod"
-  "//mace/utils:tuner_prod"
-)
-
-all_targets=(${libmace_targets[*]} ${libmace_dev_targets[*]} ${libmace_prod_targets[*]})
-
-build_target()
-{
-  BAZEL_TARGET=$1
-  bazel build --verbose_failures -c opt --strip always $BAZEL_TARGET \
-    --copt="-std=c++11" \
-    --copt="-D_GLIBCXX_USE_C99_MATH_TR1" \
-    --copt="-Werror=return-type" \
-    --copt="-DMACE_OBFUSCATE_LITERALS" \
-    --define openmp=true || exit -1
-}
-
-merge_libs()
-{
-  CREATE_LIB_NAME=$1
-  LIBS_LIST=$2
-  echo "create ${LIBMACE_TEMP_DIR}/${CREATE_LIB_NAME}.a" > ${LIBMACE_TEMP_DIR}/${CREATE_LIB_NAME}.mri || exit -1
-
-  for lib_target in ${LIBS_LIST[*]}
-  do
-    lib_dir=`echo ${lib_target} | cut -d: -f1`
-    lib_dir=${lib_dir#//}
-    lib_name_prefix=lib`echo ${lib_target} | cut -d: -f2`
-    bin_path="${MACE_SOURCE_DIR}/bazel-bin/${lib_dir}/${lib_name_prefix}"
-    if [ -f "${bin_path}.a" ]; then
-      bin_path="${bin_path}.a"
-    else
-      bin_path="${bin_path}.lo"
-    fi
-    echo "addlib ${bin_path}" >> ${LIBMACE_TEMP_DIR}/${CREATE_LIB_NAME}.mri || exit -1
-  done
-
-  echo "save" >> ${LIBMACE_TEMP_DIR}/${CREATE_LIB_NAME}.mri || exit -1
-  echo "end" >> ${LIBMACE_TEMP_DIR}/${CREATE_LIB_NAME}.mri || exit -1
-
-  $ANDROID_NDK_HOME/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar \
-    -M < ${LIBMACE_TEMP_DIR}/${CREATE_LIB_NAME}.mri || exit -1
-}
-
-echo "Step 1: Generate encrypted opencl source"
-python mace/python/tools/encrypt_opencl_codegen.py \
-    --cl_kernel_dir=./mace/kernels/opencl/cl/ \
-    --output_path=${CODEGEN_DIR}/opencl/opencl_encrypt_program.cc || exit -1
-
-
-echo "Step 2: Generate version source"
-rm -rf ${VERSION_CODEGEN_DIR}
-mkdir ${VERSION_CODEGEN_DIR}
-bash mace/tools/git/gen_version_source.sh ${CODEGEN_DIR}/version/version.cc || exit -1
-
-
-echo "Step 3: Build libmace targets"
-bazel clean
-for target in ${all_targets[*]}
-do
-  build_target ${target}
-done
-
-echo "Step 4: Create mri files and generate merged libs"
-merge_libs "libmace" "${libmace_targets[*]}"
-merge_libs "libmace_dev" "${libmace_dev_targets[*]}"
-merge_libs "libmace_prod" "${libmace_prod_targets[*]}"
-
-echo "Step 5: Export lib"
-rm -rf ${EXPORT_INCLUDE_DIR}
-mkdir -p ${EXPORT_INCLUDE_DIR}/mace/core/public
-rm -rf ${EXPORT_LIB_DIR}
-mkdir -p ${EXPORT_LIB_DIR}
-
-cp ${MACE_SOURCE_DIR}/mace/core/public/* ${EXPORT_INCLUDE_DIR}/mace/core/public || exit -1
-cp ${LIBMACE_TEMP_DIR}/libmace.a ${LIBMACE_TEMP_DIR}/libmace_dev.a ${LIBMACE_TEMP_DIR}/libmace_prod.a ${EXPORT_LIB_DIR}/ || exit -1
-
-echo "Step 6: Remove temporary file"
-rm -rf ${LIBMACE_TEMP_DIR}
-
-echo "Done!"