diff --git a/build.sh b/build.sh index 655cd78..a4d09e1 100644 --- a/build.sh +++ b/build.sh @@ -86,6 +86,8 @@ checkopts() } checkopts "$@" +git submodule update --init metadef + mk_dir() { local create_dir="$1" # the target to make @@ -152,12 +154,41 @@ generate_package() cd "${BASEPATH}" PARSER_LIB_PATH="lib" + ACL_PATH="acllib/lib64" + FWK_PATH="fwkacllib/lib64" + ATC_PATH="atc/lib64" + + COMMON_LIB=("libgraph.so" "libregister.so") + PARSER_LIB=("lib_caffe_parser.so" "libfmk_onnx_parser.so" "libfmk_parser.so" "libparser_common.so") + + rm -rf ${OUTPUT_PATH:?}/${FWK_PATH}/ + rm -rf ${OUTPUT_PATH:?}/${ACL_PATH}/ + rm -rf ${OUTPUT_PATH:?}/${ATC_PATH}/ + + mk_dir "${OUTPUT_PATH}/${FWK_PATH}" + mk_dir "${OUTPUT_PATH}/${ATC_PATH}" + mk_dir "${OUTPUT_PATH}/${ACL_PATH}" find output/ -name parser_lib.tar -exec rm {} \; cd "${OUTPUT_PATH}" - tar -cf parser_lib.tar "${PARSER_LIB_PATH}" + for lib in "${PARSER_LIB[@]}"; + do + find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \; + find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \; + done + + for lib in "${COMMON_LIB[@]}"; + do + find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \; + find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \; + done + + find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \; + find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libregister.a" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \; + + tar -cf parser_lib.tar fwkacllib acllib atc } if [[ "X$ENABLE_GE_UT" = "Xoff" ]]; then diff --git a/metadef b/metadef index 1cc55bc..a75b33c 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 1cc55bcae09902b3d158993dd57bfbd1d3337066 +Subproject commit a75b33c637a304d02cc0f073d2e5ea163a71f8dd