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