!17 add metadef submodule

Merge pull request !17 from taoxiangdong/master

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "metadef"]
+	path = metadef
+	url = https://gitee.com/ascend/metadef.git

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()
 

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"
@@ -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,46 +140,17 @@ 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"
-
-  ATC_LIB=("libc_sec.so" "libge_common.so" "libge_compiler.so" "libgraph.so")
-  FWK_LIB=("libge_common.so" "libge_runner.so" "libgraph.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}"
-
-  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} \;
+  PARSER_LIB_PATH="lib"
 
+  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[@]}";
-  do
-    cp "$lib" "${OUTPUT_PATH}/${FWK_PATH}"
-  done
 
-  tar -cf graphengine_lib.tar fwkacllib/ atc/
+  tar -cf parser_lib.tar "${PARSER_LIB_PATH}"
 }
 
 if [[ "X$ENABLE_GE_UT" = "Xoff" ]]; then
   generate_package
 fi
-echo "---------------- GraphEngine package archive generated ----------------"
+echo "---------------- Parser package archive generated ----------------"

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 <SOURCE_DIR>
+                    DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PARSER_DIR}/../../third_party/protobuf/src/protobuf-3.8.0 <SOURCE_DIR>
                     #CONFIGURE_COMMAND ${CMAKE_COMMAND}
                     #-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
                     #-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -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)

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}

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)

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 < ${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}

metadef

@@ -0,0 +1 @@
+Subproject commit 693e892fa66c5da9b8976d93e5418ded2614fc4f