From 8453e986e1cab11ab9461bf1eac9c58ed865e12f Mon Sep 17 00:00:00 2001
From: taoxiangdong <taoxiangdong1@huawei.com>
Date: Wed, 21 Oct 2020 12:40:16 +0800
Subject: [PATCH] update sync yellow zone code 20201020

---
 cmake/external_libs/protobuf_shared.cmake |  2 +-
 cmake/external_libs/protoc.cmake          |  2 +-
 parser/common/module.mk                   |  7 ++++---
 parser/func_to_graph/proto_python_rule.mk |  4 ++--
 parser/module.mk                          | 10 ++++++----
 parser/onnx/module.mk                     |  4 +++-
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cmake/external_libs/protobuf_shared.cmake b/cmake/external_libs/protobuf_shared.cmake
index 0581ae8..265b309 100755
--- a/cmake/external_libs/protobuf_shared.cmake
+++ b/cmake/external_libs/protobuf_shared.cmake
@@ -14,7 +14,7 @@ endif()
 set(protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
 set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
 ExternalProject_Add(protobuf_build
-	                URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
+                    URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
                     #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
 		            #SOURCE_DIR ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0
 		            DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0 <SOURCE_DIR>
diff --git a/cmake/external_libs/protoc.cmake b/cmake/external_libs/protoc.cmake
index ff49681..9ec86e2 100755
--- a/cmake/external_libs/protoc.cmake
+++ b/cmake/external_libs/protoc.cmake
@@ -15,7 +15,7 @@ endif()
 set(protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
 set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
 ExternalProject_Add(protoc_build
-	                URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
+                    URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
                     #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
                     SOURCE_DIR ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0
                     CONFIGURE_COMMAND ${CMAKE_COMMAND} -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=${protobuf_CXXFLAGS} -DCMAKE_CXX_LDFLAGS=${protobuf_LDFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/protoc <SOURCE_DIR>/cmake
diff --git a/parser/common/module.mk b/parser/common/module.mk
index 5a567c0..4eb3e74 100644
--- a/parser/common/module.mk
+++ b/parser/common/module.mk
@@ -73,9 +73,10 @@ LOCAL_C_INCLUDES := \
     $(TOPDIR)inc/external/graph \
     $(TOPDIR)inc/framework \
     $(TOPDIR)inc/common/util \
-    $(TOPDIR)framework/domi \
-    $(TOPDIR)framework/domi/common \
-    $(TOPDIR)framework/domi/parser \
+    $(TOPDIR)graphengine/ge \
+    $(TOPDIR)graphengine/ge/common \
+    $(TOPDIR)parser/parser \
+    $(TOPDIR)parser   \
     $(TOPDIR)third_party/json/include \
     $(TOPDIR)third_party/protobuf/include \
     libc_sec/include \
diff --git a/parser/func_to_graph/proto_python_rule.mk b/parser/func_to_graph/proto_python_rule.mk
index ece9732..cf442d5 100644
--- a/parser/func_to_graph/proto_python_rule.mk
+++ b/parser/func_to_graph/proto_python_rule.mk
@@ -2,7 +2,7 @@ include $(BUILD_SYSTEM)/base_rules.mk
 
 FUNCTION_TO_GRAPH_OUT_TIMESTAMP := $(HOST_OUT_ROOT)/func_to_graph/.timestamp
 
-PROTO_SRC_DIR = framework/domi/parser/func_to_graph/proto
+PROTO_SRC_DIR = parser/parser/func_to_graph/proto
 PY_PROTO_BUILD_DIR = $(HOST_OUT_ROOT)/tmp/function_to_graph/proto
 
 $(warning PRIVATE_PROTOC is $(PRIVATE_PROTOC))
@@ -14,4 +14,4 @@ $(FUNCTION_TO_GRAPH_OUT_TIMESTAMP): $(PRIVATE_PROTOC)
 
 $(LOCAL_BUILT_MODULE): $(FUNCTION_TO_GRAPH_OUT_TIMESTAMP)
 	mkdir -p $@
-	cp -rf $(PY_PROTO_BUILD_DIR)/* $@
\ No newline at end of file
+	cp -rf $(PY_PROTO_BUILD_DIR)/* $@
diff --git a/parser/module.mk b/parser/module.mk
index 319e7a6..502d44b 100644
--- a/parser/module.mk
+++ b/parser/module.mk
@@ -1,6 +1,6 @@
 
 LOCAL_PATH := $(call my-dir)
-include $(LOCAL_PATH)/../stub/Makefile
+include $(LOCAL_PATH)/stub/Makefile
 COMMON_LOCAL_C_INCLUDES := \
     proto/om.proto \
     proto/insert_op.proto \
@@ -39,7 +39,9 @@ COMMON_LOCAL_C_INCLUDES := \
     $(TOPDIR)inc/external/graph \
     $(TOPDIR)inc/external/parser \
     $(TOPDIR)inc/framework \
-    $(TOPDIR)framework/domi/parser \
+    $(TOPDIR)parser/parser \
+    $(TOPDIR)parser        \
+    $(TOPDIR)graphengine/ge \
     libc_sec/include \
     third_party/protobuf/include \
     third_party/json/include \
@@ -132,8 +134,8 @@ endif
 
 LOCAL_C_INCLUDES := $(COMMON_LOCAL_C_INCLUDES)
 
-LOCAL_SRC_FILES := ../../../out/ge/lib64/stub/tensorflow_parser.cc
-LOCAL_SRC_FILES += ../../../out/ge/lib64/stub/caffe_parser.cc
+LOCAL_SRC_FILES := ../../out/parser/lib64/stub/tensorflow_parser.cc
+LOCAL_SRC_FILES += ../../out/parser/lib64/stub/caffe_parser.cc
 
 
 LOCAL_SHARED_LIBRARIES :=
diff --git a/parser/onnx/module.mk b/parser/onnx/module.mk
index 394c369..531be98 100644
--- a/parser/onnx/module.mk
+++ b/parser/onnx/module.mk
@@ -29,7 +29,9 @@ LOCAL_C_INCLUDES := \
     $(TOPDIR)inc/external \
     $(TOPDIR)inc/external/graph \
     $(TOPDIR)inc/framework \
-    $(TOPDIR)framework/domi/parser \
+    $(TOPDIR)parser \
+    $(TOPDIR)parser/parser \
+    $(TOPDIR)graphengine/ge \
     libc_sec/include \
     third_party/protobuf/include \
     third_party/json/include \