Pre Merge pull request !83 from taoxudong/development

metadef

@@ -1 +1 @@
-Subproject commit 37465b85d30b67a0edcc6ea4acd2f11a9697c7af
+Subproject commit 25740c05a80cb4234b8bf60b4615bc9fd0c3c15b

parser/common/module.mk

@@ -69,10 +69,16 @@ LOCAL_C_INCLUDES := \
     proto/tensorflow/versions.proto \
     $(LOCAL_PATH) \
     $(TOPDIR)inc \
+    $(TOPDIR)metadef/inc \
+    $(TOPDIR)graphengine/inc \
+    $(TOPDIR)parser/inc \
     $(TOPDIR)inc/external \
-    $(TOPDIR)inc/external/graph \
-    $(TOPDIR)inc/framework \
-    $(TOPDIR)inc/common/util \
+    $(TOPDIR)metadef/inc/external \
+    $(TOPDIR)graphengine/inc/external \
+    $(TOPDIR)parser/inc/external \
+    $(TOPDIR)metadef/inc/external/graph \
+    $(TOPDIR)graphengine/inc/framework \
+    $(TOPDIR)metadef/inc/common/util \
     $(TOPDIR)graphengine/ge \
     $(TOPDIR)graphengine/ge/common \
     $(TOPDIR)parser/parser \

parser/module.mk

@@ -35,10 +35,16 @@ COMMON_LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/caffe \
     $(LOCAL_PATH)/../ \
     $(TOPDIR)inc \
+    $(TOPDIR)metadef/inc \
+    $(TOPDIR)graphengine/inc \
+    $(TOPDIR)parser/inc \
     $(TOPDIR)inc/external \
-    $(TOPDIR)inc/external/graph \
-    $(TOPDIR)inc/external/parser \
-    $(TOPDIR)inc/framework \
+    $(TOPDIR)metadef/inc/external \
+    $(TOPDIR)graphengine/inc/external \
+    $(TOPDIR)parser/inc/external \
+    $(TOPDIR)metadef/inc/external/graph \
+    $(TOPDIR)parser/inc/external/parser \
+    $(TOPDIR)graphengine/inc/framework \
     $(TOPDIR)parser/parser \
     $(TOPDIR)parser        \
     $(TOPDIR)graphengine/ge \

parser/onnx/module.mk

@@ -26,9 +26,15 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../ \
     $(TOPDIR)inc \
+    $(TOPDIR)metadef/inc \
+    $(TOPDIR)graphengine/inc \
+    $(TOPDIR)parser/inc \
     $(TOPDIR)inc/external \
-    $(TOPDIR)inc/external/graph \
-    $(TOPDIR)inc/framework \
+    $(TOPDIR)metadef/inc/external \
+    $(TOPDIR)graphengine/inc/external \
+    $(TOPDIR)parser/inc/external \
+    $(TOPDIR)metadef/inc/external/graph \
+    $(TOPDIR)graphengine/inc/framework \
     $(TOPDIR)parser \
     $(TOPDIR)parser/parser \
     $(TOPDIR)graphengine/ge \