From d0d073686d816ac73d706f9a6926224c82b60f7a Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Sun, 18 Oct 2020 20:17:39 +0800 Subject: [PATCH 1/3] update build.sh --- build.sh | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/build.sh b/build.sh index f72f2a2..e925fcc 100644 --- a/build.sh +++ b/build.sh @@ -29,7 +29,7 @@ usage() echo " -h Print usage" echo " -u Only compile ut, not execute" echo " -s Build st" - echo " -j[n] Set the number of threads used for building GraphEngine, default is 8" + echo " -j[n] Set the number of threads used for building Parser, default is 8" echo " -t Build and execute ut" echo " -c Build ut with coverage tag" echo " -v Display build command" @@ -142,46 +142,24 @@ echo "---------------- Parser output generated ----------------" generate_package() { cd "${BASEPATH}" - FWK_PATH="fwkacllib/lib64" - ATC_PATH="atc/lib64" - NNENGINE_PATH="plugin/nnengine/ge_config" - OPSKERNEL_PATH="plugin/opskernel" + PARSER_PATH="parser/lib64" - ATC_LIB=("libc_sec.so" "libge_common.so" "libge_compiler.so" "libgraph.so") - FWK_LIB=("libge_common.so" "libge_runner.so" "libgraph.so") + PARSER_LIB=("libfmk_parser.so" "libparser_common.so" "lib_caffe_parser.so" "libfmk_onnx_parser.so") - rm -rf ${OUTPUT_PATH:?}/${FWK_PATH}/ - rm -rf ${OUTPUT_PATH:?}/${ATC_PATH}/ - mk_dir "${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH}" - mk_dir "${OUTPUT_PATH}/${FWK_PATH}/${OPSKERNEL_PATH}" - mk_dir "${OUTPUT_PATH}/${ATC_PATH}/${NNENGINE_PATH}" - mk_dir "${OUTPUT_PATH}/${ATC_PATH}/${OPSKERNEL_PATH}" + rm -rf ${OUTPUT_PATH:?}/${PARSER_PATH}/ + mk_dir "${OUTPUT_PATH}/${PARSER_PATH}" - find output/ -name graphengine_lib.tar -exec rm {} \; - cp ge/engine_manager/engine_conf.json ${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH} - cp ge/engine_manager/engine_conf.json ${OUTPUT_PATH}/${ATC_PATH}/${NNENGINE_PATH} - - find output/ -maxdepth 1 -name libengine.so -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH}/../ \; - find output/ -maxdepth 1 -name libengine.so -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH}/${NNENGINE_PATH}/../ \; - - find output/ -maxdepth 1 -name libge_local_engine.so -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH}/${OPSKERNEL_PATH} \; - find output/ -maxdepth 1 -name libge_local_engine.so -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH}/${OPSKERNEL_PATH} \; + find output/ -name parser_lib.tar -exec rm {} \; cd "${OUTPUT_PATH}" - for lib in "${ATC_LIB[@]}"; - do - cp "$lib" "${OUTPUT_PATH}/${ATC_PATH}" - done - - for lib in "${FWK_LIB[@]}"; + for lib in "${PARSER_LIB[@]}"; do - cp "$lib" "${OUTPUT_PATH}/${FWK_PATH}" + find output/ -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${PARSER_PATH}/ \; done - - tar -cf graphengine_lib.tar fwkacllib/ atc/ + tar -cf parser_lib.tar parser } if [[ "X$ENABLE_GE_UT" = "Xoff" ]]; then generate_package fi -echo "---------------- GraphEngine package archive generated ----------------" +echo "---------------- Parser package archive generated ----------------" From 73dc01f103c0435382cc858ffd28b4934f3e6cc6 Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Mon, 19 Oct 2020 11:25:50 +0800 Subject: [PATCH 2/3] independent compile --- cmake/external_libs/protobuf_shared.cmake | 2 +- cmake/external_libs/protobuf_static.cmake | 2 +- cmake/external_libs/securec.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/external_libs/protobuf_shared.cmake b/cmake/external_libs/protobuf_shared.cmake index 3a84bc3..4477a93 100755 --- a/cmake/external_libs/protobuf_shared.cmake +++ b/cmake/external_libs/protobuf_shared.cmake @@ -17,7 +17,7 @@ ExternalProject_Add(protobuf_build URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz #SOURCE_DIR ${PARSER_DIR}/../../third_party/protobuf/src/protobuf-3.8.0 - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0 + DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PARSER_DIR}/../../third_party/protobuf/src/protobuf-3.8.0 #CONFIGURE_COMMAND ${CMAKE_COMMAND} #-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} #-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} diff --git a/cmake/external_libs/protobuf_static.cmake b/cmake/external_libs/protobuf_static.cmake index e5d296b..3a8681c 100755 --- a/cmake/external_libs/protobuf_static.cmake +++ b/cmake/external_libs/protobuf_static.cmake @@ -14,7 +14,7 @@ set(PROTOBUF_STATIC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf_static) ExternalProject_Add(protobuf_static_build URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz - SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 + SOURCE_DIR ${PARSER_DIR}/../../third_party/protobuf/src/protobuf-3.8.0 CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/cmake/external_libs/securec.cmake b/cmake/external_libs/securec.cmake index de873b0..b831b5e 100755 --- a/cmake/external_libs/securec.cmake +++ b/cmake/external_libs/securec.cmake @@ -14,7 +14,7 @@ ExternalProject_Add(c_sec_build URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz #SOURCE_DIR ${PARSER_DIR}/../libc_sec - PATCH_COMMAND patch -p1 < ${GE_CODE_DIR}/third_party/patch/securec/0001-add-securec-cmake-script.patch + PATCH_COMMAND patch -p1 < ${PARSER_DIR}/../../third_party/patch/securec/0001-add-securec-cmake-script.patch CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} From 91bcbebcf48eaea05a59ba926b1cce0ac5b88c78 Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Mon, 19 Oct 2020 19:20:03 +0800 Subject: [PATCH 3/3] add submodule metadef --- .gitmodules | 3 +++ CMakeLists.txt | 8 +++---- build.sh | 29 ++++++++--------------- cmake/external_libs/protobuf_shared.cmake | 3 ++- cmake/external_libs/protoc.cmake | 3 ++- cmake/external_libs/securec.cmake | 2 +- metadef | 1 + 7 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 .gitmodules create mode 160000 metadef diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..fe72c1e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "metadef"] + path = metadef + url = https://gitee.com/ascend/metadef.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b8ae7c..68a7e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,11 +49,11 @@ if (ENABLE_OPEN_SRC) find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR}) endif() - #set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef) + if (NOT DEFINED METADEF_DIR) + set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef) + endif() - #add_subdirectory(metadef) - #add_subdirectory(metadef/graph) - #add_subdirectory(metadef/register) + add_subdirectory(metadef) else() diff --git a/build.sh b/build.sh index e925fcc..75ffa39 100644 --- a/build.sh +++ b/build.sh @@ -100,8 +100,8 @@ echo "---------------- Parser build start ----------------" build_parser() { echo "create build directory and build Parser"; - mk_dir "${BUILD_PATH}/parser" - cd "${BUILD_PATH}/parser" + mk_dir "${BUILD_PATH}" + cd "${BUILD_PATH}" CMAKE_ARGS="-DBUILD_PATH=$BUILD_PATH -DGE_ONLY=$GE_ONLY" if [[ "X$ENABLE_GE_COV" = "Xon" ]]; then @@ -117,18 +117,16 @@ build_parser() CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_GE_ST=ON" fi - CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_OPEN_SRC=True" + CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_OPEN_SRC=True -DCMAKE_INSTALL_PREFIX=${OUTPUT_PATH}" echo "${CMAKE_ARGS}" - cmake ${CMAKE_ARGS} ../.. - make ${VERBOSE} -j${THREAD_NUM} + cmake ${CMAKE_ARGS} .. + make ${VERBOSE} -j${THREAD_NUM} && make install echo "Parser build success!" } g++ -v +mk_dir ${OUTPUT_PATH} build_parser echo "---------------- Parser build finished ----------------" -mk_dir ${OUTPUT_PATH} -cp -rf "${BUILD_PATH}/parser/"*.so "${OUTPUT_PATH}" -rm -rf "${OUTPUT_PATH}/"libproto* rm -f ${OUTPUT_PATH}/libgmock*.so rm -f ${OUTPUT_PATH}/libgtest*.so rm -f ${OUTPUT_PATH}/lib*_stub.so @@ -142,21 +140,14 @@ echo "---------------- Parser output generated ----------------" generate_package() { cd "${BASEPATH}" - PARSER_PATH="parser/lib64" - PARSER_LIB=("libfmk_parser.so" "libparser_common.so" "lib_caffe_parser.so" "libfmk_onnx_parser.so") - - rm -rf ${OUTPUT_PATH:?}/${PARSER_PATH}/ - mk_dir "${OUTPUT_PATH}/${PARSER_PATH}" + PARSER_LIB_PATH="lib" find output/ -name parser_lib.tar -exec rm {} \; - + cd "${OUTPUT_PATH}" - for lib in "${PARSER_LIB[@]}"; - do - find output/ -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${PARSER_PATH}/ \; - done - tar -cf parser_lib.tar parser + + tar -cf parser_lib.tar "${PARSER_LIB_PATH}" } if [[ "X$ENABLE_GE_UT" = "Xoff" ]]; then diff --git a/cmake/external_libs/protobuf_shared.cmake b/cmake/external_libs/protobuf_shared.cmake index 4477a93..bb4250c 100755 --- a/cmake/external_libs/protobuf_shared.cmake +++ b/cmake/external_libs/protobuf_shared.cmake @@ -56,4 +56,5 @@ install(FILES ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so ${PROTOBUF_SHARED_PK add_dependencies(protobuf protobuf_build) -set(HAVE_PROTOBUF TRUE CACHE BOOL "protobuf build add") +#set(HAVE_PROTOBUF TRUE CACHE BOOL "protobuf build add") +set(HAVE_PROTOBUF TRUE) diff --git a/cmake/external_libs/protoc.cmake b/cmake/external_libs/protoc.cmake index a6100db..00ec951 100755 --- a/cmake/external_libs/protoc.cmake +++ b/cmake/external_libs/protoc.cmake @@ -99,4 +99,5 @@ function(protobuf_generate_py comp py_var) endfunction() -set(HAVE_PROTOC TRUE CACHE BOOL "protoc build add") +#set(HAVE_PROTOC TRUE CACHE BOOL "protoc build add") +set(HAVE_PROTOC TRUE) diff --git a/cmake/external_libs/securec.cmake b/cmake/external_libs/securec.cmake index b831b5e..d88862d 100755 --- a/cmake/external_libs/securec.cmake +++ b/cmake/external_libs/securec.cmake @@ -14,7 +14,7 @@ ExternalProject_Add(c_sec_build URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz #SOURCE_DIR ${PARSER_DIR}/../libc_sec - PATCH_COMMAND patch -p1 < ${PARSER_DIR}/../../third_party/patch/securec/0001-add-securec-cmake-script.patch + PATCH_COMMAND patch -p1 < ${METADEF_DIR}/third_party/patch/securec/0001-add-securec-cmake-script.patch CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/metadef b/metadef new file mode 160000 index 0000000..693e892 --- /dev/null +++ b/metadef @@ -0,0 +1 @@ +Subproject commit 693e892fa66c5da9b8976d93e5418ded2614fc4f