Pre Merge pull request !873 from 陈华/development

ge/module.mk

@@ -2,3 +2,4 @@ LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/ge_inference.mk
 include $(LOCAL_PATH)/ge_runner.mk
+

inc/framework/common/ge_types.h

@@ -37,9 +37,7 @@ enum FrameworkType {
   MINDSPORE = 1,
   TENSORFLOW = 3,
   ANDROID_NN,
-#ifndef ONLY_COMPILE_OPEN_SRC
   ONNX,
-#endif
   FRAMEWORK_RESERVED,
 };
 

inc/framework/omg/parser/model_parser.h

@@ -65,7 +65,6 @@ class ModelParser {
    */
   virtual Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) = 0;
 
-#ifndef ONLY_COMPILE_OPEN_SRC
   /**
    * @ingroup domi_omg
    * @brief Parse relevant data from memory and save it to graph
@@ -77,7 +76,6 @@ class ModelParser {
    * @author
    */
   virtual Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) = 0;
-#endif
 
   /**
    * @ingroup domi_omg