From 499758594fd942061ea9b8293002891b77b5db6f Mon Sep 17 00:00:00 2001 From: yejianwu Date: Fri, 2 Feb 2018 19:10:53 +0800 Subject: [PATCH] update for RUNTIME==local --- build_production_code.sh | 19 +++++++++++++++++-- clear_env.sh | 6 ++++-- env.sh | 4 +++- merge_libs.sh | 12 ++++++++++-- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/build_production_code.sh b/build_production_code.sh index 34676542..68f32fff 100644 --- a/build_production_code.sh +++ b/build_production_code.sh @@ -7,6 +7,16 @@ Usage() { CURRENT_DIR=`dirname $0` source ${CURRENT_DIR}/env.sh +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 +} build_target() { @@ -21,5 +31,10 @@ build_target() --copt="-DMACE_OBFUSCATE_LITERALS" || exit 1 } -build_target //codegen:generated_opencl_prod -build_target //codegen:generated_tuning_params +if [ x"$RUNTIME" = x"local" ]; then + build_local_target //codegen:generated_opencl_prod + build_local_target //codegen:generated_tuning_params +else + build_target //codegen:generated_opencl_prod + build_target //codegen:generated_tuning_params +fi diff --git a/clear_env.sh b/clear_env.sh index 3182ff60..40b30a4c 100644 --- a/clear_env.sh +++ b/clear_env.sh @@ -1,5 +1,7 @@ CURRENT_DIR=`dirname $0` source ${CURRENT_DIR}/env.sh -adb shell rm -rf $PHONE_DATA_DIR -rm -rf codegen/models codegen/opencl codegen/tuning +if [ x"$RUNTIME" != x"local" ]; then + adb shell rm -rf $PHONE_DATA_DIR + rm -rf codegen/models codegen/opencl codegen/tuning +fi diff --git a/env.sh b/env.sh index 49b2f28a..50163e5a 100644 --- a/env.sh +++ b/env.sh @@ -15,7 +15,6 @@ CL_CODEGEN_DIR=${CODEGEN_DIR}/opencl TUNING_CODEGEN_DIR=${CODEGEN_DIR}/tuning VERSION_SOURCE_PATH=${CODEGEN_DIR}/version GENERATED_MODEL_LIB_NAME="libgenerated_models.a" -GENERATED_MODEL_LIB_PATH="bazel-bin/codegen/${GENERATED_MODEL_LIB_NAME}" MACE_RUNTIME=cpu if [ x"$RUNTIME" = x"dsp" ]; then @@ -33,4 +32,7 @@ elif [ x"$RUNTIME" = x"cpu" ]; then elif [ x"$RUNTIME" = x"local" ];then DATA_TYPE="DT_FLOAT" DEVICE_TYPE="CPU" + GENERATED_MODEL_LIB_NAME="libgenerated_models.pic.a" fi + +GENERATED_MODEL_LIB_PATH="bazel-bin/codegen/${GENERATED_MODEL_LIB_NAME}" diff --git a/merge_libs.sh b/merge_libs.sh index d7d133a7..89de1135 100644 --- a/merge_libs.sh +++ b/merge_libs.sh @@ -31,10 +31,18 @@ mkdir -p ${LIBMACE_TEMP_DIR}/lib cp lib/mace/libmace.a \ lib/mace/libmace_prod.a \ - bazel-bin/codegen/libgenerated_opencl_prod.a \ - bazel-bin/codegen/libgenerated_tuning_params.a \ ${LIBMACE_TEMP_DIR}/lib/ +if [ x"RUNTIME" = x"local" ]; then + cp bazel-bin/codegen/libgenerated_opencl_prod.pic.a \ + bazel-bin/codegen/libgenerated_tuning_params.pic.a \ + ${LIBMACE_TEMP_DIR}/lib/ +else + cp bazel-bin/codegen/libgenerated_opencl_prod.a \ + bazel-bin/codegen/libgenerated_tuning_params.a \ + ${LIBMACE_TEMP_DIR}/lib/ +fi + echo "create ${LIBMACE_BUILD_DIR}/libmace/lib/libmace_${PROJECT_NAME}.a" > ${LIBMACE_TEMP_DIR}/libmace.mri for static_lib in `ls ${LIBMACE_TEMP_DIR}/lib/` do -- GitLab