From 0a8cf0ebe309a8330426188f7d5b94470a9fca8e Mon Sep 17 00:00:00 2001 From: t00456437 Date: Tue, 17 Nov 2020 11:10:48 +0800 Subject: [PATCH] remove soft link and support other scene cmake --- metadef | 2 +- parser/common/module.mk | 12 +++++++++--- parser/module.mk | 12 +++++++++--- parser/onnx/module.mk | 10 ++++++++-- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/metadef b/metadef index 37465b8..25740c0 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 37465b85d30b67a0edcc6ea4acd2f11a9697c7af +Subproject commit 25740c05a80cb4234b8bf60b4615bc9fd0c3c15b diff --git a/parser/common/module.mk b/parser/common/module.mk index a811e0d..ae8d9a2 100644 --- a/parser/common/module.mk +++ b/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 \ diff --git a/parser/module.mk b/parser/module.mk index 2a09c8b..db6146e 100644 --- a/parser/module.mk +++ b/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 \ diff --git a/parser/onnx/module.mk b/parser/onnx/module.mk index 3710780..5c726e7 100644 --- a/parser/onnx/module.mk +++ b/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 \