!16103 [MS][LITE] move mindir proto to core

From: @jianghui58
Reviewed-by: @zhoufeng54,@jpc_chenjianping
Signed-off-by: @jpc_chenjianping

mindspore/ccsrc/CMakeLists.txt

@@ -184,7 +184,6 @@ if(ENABLE_DUMP_PROTO)
         "utils/checkpoint.proto"
         "utils/print.proto"
         "utils/node_strategy.proto"
-        "utils/mind_ir.proto"
     )
     ms_protobuf_generate_py(PY_SRCS PY_HDRS PY_PYS ${PROTO_PY})
 

mindspore/ccsrc/transform/express_ir/CMakeLists.txt

@@ -1,4 +1,5 @@
 file(GLOB_RECURSE _EXPORTER_IR_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
 set_property(SOURCE ${_EXPORTER_IR_SRC_FILES} PROPERTY COMPILE_DEFINITIONS
   SUBMODULE_ID=mindspore::SubModuleId::SM_EXPRESS)
-add_library(_mindspore_transform_express_ir_obj OBJECT ${_EXPORTER_IR_SRC_FILES})
+add_library(_mindspore_transform_express_ir_obj OBJECT ${_EXPORTER_IR_SRC_FILES})
+add_dependencies(_mindspore_transform_express_ir_obj mindspore_core)

mindspore/core/CMakeLists.txt

@@ -22,6 +22,14 @@ file(GLOB_RECURSE CORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
   "utils/*.cc"
   "load_mindir/*.cc"
   )
+
+file(GLOB_RECURSE PROTO_FILE RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "proto/*.proto")
+if(NOT(COMPILE_LITE))
+    ms_protobuf_generate_py(PROTO_SRCS PY_HDRS PY_PYS ${PROTO_FILE})
+else()
+    ms_protobuf_generate(PROTO_SRCS PROTO_HDRS ${PROTO_FILE})
+endif()
+
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -DHAVE_SNPRINTF")
   add_compile_definitions(BUILDING_DLL)
@@ -31,7 +39,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()
 
 set_property(SOURCE ${CORE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_CORE)
-add_library(mindspore_core STATIC ${CORE_SRC_LIST})
+add_library(mindspore_core STATIC ${CORE_SRC_LIST} ${PROTO_SRCS})
 target_link_libraries(mindspore_core PRIVATE mindspore_gvar)
 if(NOT(COMPILE_LITE))
     target_link_libraries(mindspore_core PRIVATE mindrt_mid)

mindspore/core/load_mindir/load_model.cc

@@ -25,6 +25,7 @@
 
 #include "load_mindir/load_model.h"
 #include "load_mindir/anf_model_parser.h"
+#include "proto/mind_ir.pb.h"
 
 using std::string;
 using std::vector;

mindspore/core/load_mindir/load_model.h

@@ -20,7 +20,6 @@
 #include <string>
 #include <memory>
 
-#include "proto/mind_ir.pb.h"
 #include "ir/func_graph.h"
 
 namespace mindspore {

mindspore/lite/tools/converter/CMakeLists.txt

@@ -186,8 +186,7 @@ endif()
 file(GLOB PROTO_FILE ""
         ${CMAKE_CURRENT_SOURCE_DIR}/parser/caffe/caffe.proto
         ${CMAKE_CURRENT_SOURCE_DIR}/parser/tf/proto/*.proto
-        ${CMAKE_CURRENT_SOURCE_DIR}/parser/onnx/onnx.proto
-        ${CCSRC_DIR}/utils/mind_ir.proto)
+        ${CMAKE_CURRENT_SOURCE_DIR}/parser/onnx/onnx.proto)
 
 ms_protobuf_generate(PROTO_SRCS PROTO_HDRS ${PROTO_FILE})
 add_library(proto_mid OBJECT ${PROTO_SRCS})