update ge folder

CMakeLists.txt

@@ -20,7 +20,7 @@ add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY  ${PROJECT_BINARY_DIR})
 set(GE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
-set(GE_PROTO_DIR ${GE_SOURCE_DIR}/src)
+set(GE_PROTO_DIR ${GE_SOURCE_DIR}/)
 
 if (NOT BUILD_PATH)
     set(BUILD_PATH "${CMAKE_SOURCE_DIR}/build")
@@ -112,19 +112,19 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILE__='\"$(subst $(realpath ${CMAKE
 
 # compile libraries from following directories
 # libgraph is compiled in any situation
-add_subdirectory(${GE_SOURCE_DIR}/src/common/graph)
+add_subdirectory(${GE_SOURCE_DIR}/metadef/graph)
 if(ENABLE_D)
     # if MindSpore compiles in D mode, compile the following libraries
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/common)
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/ge_runtime)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/common)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/ge_runtime)
 elseif(GE_ONLY)
     # standalone GraphEngine compiles all following libraries
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/common)
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/ge_runtime)
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/ge_local_engine)
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/graph/build/memory)
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/)
-    add_subdirectory(${GE_SOURCE_DIR}/src/ge/plugin/engine)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/common)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/ge_runtime)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/ge_local_engine)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/graph/build/memory)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/)
+    add_subdirectory(${GE_SOURCE_DIR}/ge/plugin/engine)
 endif()
 
 # if (ENABLE_GE_COV OR ENABLE_GE_UT OR ENABLE_GE_ST)

build.sh

@@ -191,8 +191,8 @@ generate_package()
   mk_dir "${OUTPUT_PATH}/${ATC_PATH}/${OPSKERNEL_PATH}"
 
   find output/ -name graphengine_lib.tar -exec rm {} \;
-  cp src/ge/engine_manager/engine_conf.json ${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH}
-  cp src/ge/engine_manager/engine_conf.json ${OUTPUT_PATH}/${ATC_PATH}/${NNENGINE_PATH}
+  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}/../ \;

ge/CMakeLists.txt

@@ -39,15 +39,20 @@ ge_protobuf_generate(ge PROTO_HEADER_SRCS PROTO_HEADER_HDRS ${PROTO_HEADER_LIST}
 # include directories
 include_directories(${CMAKE_CURRENT_LIST_DIR})
 include_directories(${GE_SOURCE_DIR})
-include_directories(${GE_SOURCE_DIR}/src)
-include_directories(${GE_SOURCE_DIR}/src/ge/analyzer)
+include_directories(${GE_SOURCE_DIR}/ge)
+include_directories(${GE_SOURCE_DIR}/ge/analyzer)
 include_directories(${GE_SOURCE_DIR}/inc)
 include_directories(${GE_SOURCE_DIR}/inc/common/util)
+include_directories(${GE_SOURCE_DIR}/inc)
 include_directories(${GE_SOURCE_DIR}/inc/external)
-include_directories(${GE_SOURCE_DIR}/inc/external/graph)
+include_directories(${GE_SOURCE_DIR}/inc/external/ge)
 include_directories(${GE_SOURCE_DIR}/inc/framework)
 include_directories(${GE_SOURCE_DIR}/inc/framework/common)
-include_directories(${GE_SOURCE_DIR}/inc/graph)
+include_directories(${GE_SOURCE_DIR}/metadef)
+include_directories(${GE_SOURCE_DIR}/metadef/inc)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/external)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/external/graph)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/graph)
 include_directories(${GE_SOURCE_DIR}/third_party/fwkacllib)
 include_directories(${GE_SOURCE_DIR}/third_party/fwkacllib/inc)
 include_directories(${GE_SOURCE_DIR}/third_party/fwkacllib/inc/cce)

ge/client/CMakeLists.txt

@@ -17,14 +17,14 @@
 # add all proto files, generate corresponding .h and .cc files
 set(CMAKE_CXX_FLAGS "-Wno-unused-variable ${CMAKE_CXX_FLAGS}")
 file(GLOB PROTO_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR}
-        "../../proto/ge_api.proto"
+        "../proto/ge_api.proto"
         )
 
 file(GLOB PROTO_HEADER_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR}
-        "../../proto/ge_ir.proto"
-        "../../proto/task.proto"
-        "../../proto/om.proto"
-        "../../proto/insert_op.proto"
+        "../proto/ge_ir.proto"
+        "../proto/task.proto"
+        "../proto/om.proto"
+        "../proto/insert_op.proto"
         )
 
 file(GLOB SRC_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR}
@@ -36,14 +36,14 @@ ge_protobuf_generate(ge PROTO_HEADER_SRCS PROTO_HEADER_HDRS ${PROTO_HEADER_LIST}
 
 # include directories
 include_directories(${CMAKE_CURRENT_LIST_DIR})
-include_directories(${GE_SOURCE_DIR}/src/ge)
-include_directories(${GE_SOURCE_DIR}/src)
+include_directories(${GE_SOURCE_DIR}/ge)
 include_directories(${GE_SOURCE_DIR}/inc)
 include_directories(${GE_SOURCE_DIR}/inc/external)
-include_directories(${GE_SOURCE_DIR}/inc/external/graph)
 include_directories(${GE_SOURCE_DIR}/inc/common)
 include_directories(${GE_SOURCE_DIR}/inc/framework)
-include_directories(${GE_SOURCE_DIR}/inc/graph)
+include_directories(${GE_SOURCE_DIR}/metadef/inc)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/external/graph)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/graph)
 include_directories(${GE_SOURCE_DIR}/third_party/fwkacllib/inc)
 include_directories(${GE_SOURCE_DIR}/third_party/fwkacllib/inc/cce)
 include_directories(${CMAKE_BINARY_DIR})

ge/common/CMakeLists.txt

@@ -71,13 +71,15 @@ ge_protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
 # include directories
 include_directories(${CMAKE_CURRENT_LIST_DIR})
 include_directories(${CMAKE_CURRENT_LIST_DIR}/op)
-include_directories(${GE_SOURCE_DIR}/src/ge)
+include_directories(${GE_SOURCE_DIR}/ge)
 include_directories(${GE_SOURCE_DIR}/inc)
 include_directories(${GE_SOURCE_DIR}/inc/common/util)
 include_directories(${GE_SOURCE_DIR}/inc/external)
-include_directories(${GE_SOURCE_DIR}/inc/external/graph)
 include_directories(${GE_SOURCE_DIR}/inc/framework)
-include_directories(${GE_SOURCE_DIR}/inc/graph)
+include_directories(${GE_SOURCE_DIR}/metadef/inc)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/external)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/external/graph)
+include_directories(${GE_SOURCE_DIR}/metadef/inc/graph)
 include_directories(${GE_SOURCE_DIR}/third_party/fwkacllib/inc)
 include_directories(${GE_SOURCE_DIR}/third_party/fwkacllib/inc/cce)
 include_directories(${CMAKE_BINARY_DIR})