diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index f068baff..4537f8a5 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -160,7 +160,7 @@ target_link_libraries(ge_common_static PRIVATE ascend_protobuf json c_sec - -lrt + $<$>:-lrt> -ldl ) diff --git a/ge/common/ge_common.mk b/ge/common/ge_common.mk index 45ee1057..28536195 100755 --- a/ge/common/ge_common.mk +++ b/ge/common/ge_common.mk @@ -61,17 +61,18 @@ GE_COMMON_LOCAL_C_INCLUDES := \ proto/tensorflow/types.proto \ proto/tensorflow/resource_handle.proto \ $(TOPDIR)inc \ + $(TOPDIR)metadef/inc \ + $(TOPDIR)graphengine/inc \ $(TOPDIR)inc/external \ - $(TOPDIR)inc/external/graph \ - $(TOPDIR)inc/framework \ - $(TOPDIR)inc/common/util \ + $(TOPDIR)metadef/inc/external \ + $(TOPDIR)graphengine/inc/external \ + $(TOPDIR)metadef/inc/external/graph \ + $(TOPDIR)graphengine/inc/framework \ + $(TOPDIR)metadef/inc/common/util \ $(TOPDIR)libc_sec/include \ $(TOPDIR)third_party/json/include \ $(TOPDIR)third_party/protobuf/include \ $(TOPDIR)third_party/openssl/include/x86/include \ - $(TOPDIR)framework/domi \ - $(TOPDIR)framework/domi/common \ - $(TOPDIR)framework/domi/common/op \ $(TOPDIR)graphengine/ge \ $(TOPDIR)graphengine/ge/common \ $(TOPDIR)graphengine/ge/common/op \ diff --git a/ge/executor/CMakeLists.txt b/ge/executor/CMakeLists.txt index bba1927f..3d994cbb 100755 --- a/ge/executor/CMakeLists.txt +++ b/ge/executor/CMakeLists.txt @@ -111,6 +111,6 @@ target_link_libraries(ge_executor PRIVATE json ascend_protobuf c_sec - -lrt + $<$>:-lrt> -ldl ) diff --git a/ge/executor/module.mk b/ge/executor/module.mk index eaa611d2..4244ea92 100755 --- a/ge/executor/module.mk +++ b/ge/executor/module.mk @@ -72,9 +72,13 @@ local_ge_executor_c_include := \ proto/task.proto \ proto/om.proto \ $(TOPDIR)inc/external \ - $(TOPDIR)inc/external/graph \ - $(TOPDIR)inc/framework \ + $(TOPDIR)metadef/inc/external \ + $(TOPDIR)graphengine/inc/external \ + $(TOPDIR)metadef/inc/external/graph \ + $(TOPDIR)graphengine/inc/framework \ $(TOPDIR)inc \ + $(TOPDIR)metadef/inc \ + $(TOPDIR)graphengine/inc \ $(LOCAL_PATH)/../ \ $(TOPDIR)graphengine/ge \ $(TOPDIR)libc_sec/include \ diff --git a/ge/ge_inference.mk b/ge/ge_inference.mk index 81928c1b..3b1dba01 100755 --- a/ge/ge_inference.mk +++ b/ge/ge_inference.mk @@ -287,11 +287,15 @@ COMMON_LOCAL_C_INCLUDES := \ proto/tensorflow/versions.proto \ $(LOCAL_PATH) ./ \ $(TOPDIR)inc \ + $(TOPDIR)metadef/inc \ + $(TOPDIR)graphengine/inc \ $(TOPDIR)inc/external \ - $(TOPDIR)inc/external/graph \ - $(TOPDIR)inc/framework \ - $(TOPDIR)inc/framework/common \ - $(TOPDIR)inc/common \ + $(TOPDIR)metadef/inc/external \ + $(TOPDIR)graphengine/inc/external \ + $(TOPDIR)metadef/inc/external/graph \ + $(TOPDIR)graphengine/inc/framework \ + $(TOPDIR)graphengine/inc/framework/common \ + $(TOPDIR)metadef/inc/common \ $(TOPDIR)inc/runtime \ $(TOPDIR)libc_sec/include \ $(TOPDIR)ops/built-in/op_proto/inc \ @@ -301,7 +305,7 @@ COMMON_LOCAL_C_INCLUDES := \ third_party/opencv/include \ ANALYZER_LOCAL_INCLUDES := \ - $(TOPDIR)framework/domi/analyzer \ + $(TOPDIR)graphengine/ge/analyzer \ NEW_OMG_HOST_SRC_FILES := \ graph/preprocess/insert_op/util_insert_aipp_op.cc \ @@ -341,15 +345,18 @@ DEVICE_LOCAL_C_INCLUDES := \ proto/tensorflow/versions.proto \ $(LOCAL_PATH) ./ \ $(TOPDIR)inc \ + $(TOPDIR)metadef/inc \ + $(TOPDIR)graphengine/inc \ $(TOPDIR)libc_sec/include \ $(TOPDIR)inc/external \ - $(TOPDIR)inc/external/graph \ - $(TOPDIR)inc/common/util \ - $(TOPDIR)inc/framework \ - $(TOPDIR)inc/framework/common \ + $(TOPDIR)metadef/inc/external \ + $(TOPDIR)graphengine/inc/external \ + $(TOPDIR)metadef/inc/external/graph \ + $(TOPDIR)metadef/inc/common/util \ + $(TOPDIR)graphengine/inc/framework \ + $(TOPDIR)graphengine/inc/framework/common \ $(TOPDIR)inc/runtime \ $(TOPDIR)ops/built-in/op_proto/inc \ - $(TOPDIR)framework/domi \ $(TOPDIR)graphengine/ge \ $(TOPDIR)toolchain/ide/ide-daemon/external \ third_party/json/include \ diff --git a/ge/ge_local_engine/module.mk b/ge/ge_local_engine/module.mk index 0f95d352..a3c571d9 100755 --- a/ge/ge_local_engine/module.mk +++ b/ge/ge_local_engine/module.mk @@ -17,12 +17,15 @@ ops_kernel_builder_src_files := ops_kernel_store/ge_local_ops_kernel_builder.cc local_lib_inc_path := proto/task.proto \ ${LOCAL_PATH} \ ${TOPDIR}inc \ + ${TOPDIR}metadef/inc \ + ${TOPDIR}graphengine/inc \ ${TOPDIR}inc/external \ - ${TOPDIR}inc/external/graph \ + ${TOPDIR}metadef/inc/external \ + ${TOPDIR}graphengine/inc/external \ + ${TOPDIR}metadef/inc/external/graph \ $(TOPDIR)libc_sec/include \ ${TOPDIR}third_party/protobuf/include \ - ${TOPDIR}inc/framework \ - $(TOPDIR)framework/domi \ + ${TOPDIR}graphengine/inc/framework \ $(TOPDIR)graphengine/ge \ #compiler for host diff --git a/ge/ge_runner.mk b/ge/ge_runner.mk index 069c31a7..c9be823f 100644 --- a/ge/ge_runner.mk +++ b/ge/ge_runner.mk @@ -313,17 +313,20 @@ RUNNER_LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../../ \ $(TOPDIR)inc \ - $(TOPDIR)inc/common \ + $(TOPDIR)metadef/inc \ + $(TOPDIR)graphengine/inc \ + $(TOPDIR)metadef/inc/common \ $(TOPDIR)inc/external \ - $(TOPDIR)inc/external/graph \ - $(TOPDIR)inc/external/ge \ - $(TOPDIR)inc/framework \ - $(TOPDIR)inc/framework/common \ - $(TOPDIR)inc/graph \ + $(TOPDIR)metadef/inc/external \ + $(TOPDIR)graphengine/inc/external \ + $(TOPDIR)metadef/inc/external/graph \ + $(TOPDIR)graphengine/inc/external/ge \ + $(TOPDIR)graphengine/inc/framework \ + $(TOPDIR)graphengine/inc/framework/common \ + $(TOPDIR)metadef/inc/graph \ $(TOPDIR)inc/runtime \ $(TOPDIR)libc_sec/include \ $(TOPDIR)ops/built-in/op_proto/inc \ - $(TOPDIR)framework/domi/analyzer \ $(TOPDIR)graphengine/ge/analyzer \ $(TOPDIR)toolchain/ide/ide-daemon/external \ proto/fwk_adapter.proto \ diff --git a/ge/graph/build/memory/module.mk b/ge/graph/build/memory/module.mk index 2d669a50..73617794 100755 --- a/ge/graph/build/memory/module.mk +++ b/ge/graph/build/memory/module.mk @@ -11,12 +11,15 @@ local_lib_src_files := memory_assigner.cc \ local_lib_inc_path := ${LOCAL_PATH} \ ${TOPDIR}inc \ + ${TOPDIR}metadef/inc \ + ${TOPDIR}graphengine/inc \ ${TOPDIR}inc/external \ - ${TOPDIR}inc/external/graph \ + ${TOPDIR}metadef/inc/external \ + ${TOPDIR}graphengine/inc/external \ + ${TOPDIR}metadef/inc/external/graph \ $(TOPDIR)libc_sec/include \ ${TOPDIR}third_party/protobuf/include \ - ${TOPDIR}inc/framework \ - $(TOPDIR)framework/domi \ + ${TOPDIR}graphengine/inc/framework \ $(TOPDIR)graphengine/ge \ #compiler for host diff --git a/ge/host_cpu_engine/module.mk b/ge/host_cpu_engine/module.mk index 6c4932a3..e6cfce80 100644 --- a/ge/host_cpu_engine/module.mk +++ b/ge/host_cpu_engine/module.mk @@ -9,12 +9,15 @@ local_lib_src_files := engine/host_cpu_engine.cc \ local_lib_inc_path := proto/task.proto \ ${LOCAL_PATH} \ ${TOPDIR}inc \ + ${TOPDIR}metadef/inc \ + ${TOPDIR}graphengine/inc \ ${TOPDIR}inc/external \ - ${TOPDIR}inc/external/graph \ + ${TOPDIR}metadef/inc/external \ + ${TOPDIR}graphengine/inc/external \ + ${TOPDIR}metadef/inc/external/graph \ $(TOPDIR)libc_sec/include \ ${TOPDIR}third_party/protobuf/include \ - ${TOPDIR}inc/framework \ - $(TOPDIR)framework/domi \ + ${TOPDIR}graphengine/inc/framework \ $(TOPDIR)graphengine/ge \ #compiler for host diff --git a/ge/offline/module.mk b/ge/offline/module.mk index d84734d0..56eb9a52 100755 --- a/ge/offline/module.mk +++ b/ge/offline/module.mk @@ -17,12 +17,15 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../ ./ \ $(TOPDIR)inc \ + $(TOPDIR)metadef/inc \ + $(TOPDIR)graphengine/inc \ $(TOPDIR)inc/external \ - $(TOPDIR)inc/external/graph \ - $(TOPDIR)inc/framework \ - $(TOPDIR)inc/framework/domi \ + $(TOPDIR)metadef/inc/external \ + $(TOPDIR)graphengine/inc/external \ + $(TOPDIR)metadef/inc/external/graph \ + $(TOPDIR)graphengine/inc/framework \ $(TOPDIR)libc_sec/include \ - $(TOPDIR)inc/common/util \ + $(TOPDIR)metadef/inc/common/util \ $(TOPDIR)parser \ third_party/json/include \ third_party/gflags/include \ diff --git a/ge/plugin/engine/module.mk b/ge/plugin/engine/module.mk index 170cfc68..0e4a8e7f 100755 --- a/ge/plugin/engine/module.mk +++ b/ge/plugin/engine/module.mk @@ -11,9 +11,13 @@ COMMON_LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../../ \ $(TOPDIR)inc \ + $(TOPDIR)metadef/inc \ + $(TOPDIR)graphengine/inc \ $(TOPDIR)inc/external \ - $(TOPDIR)inc/framework \ - $(TOPDIR)inc/framework/common \ + $(TOPDIR)metadef/inc/external \ + $(TOPDIR)graphengine/inc/external \ + $(TOPDIR)graphengine/inc/framework \ + $(TOPDIR)graphengine/inc/framework/common \ #compiler for host libengine include $(CLEAR_VARS) @@ -56,4 +60,4 @@ LOCAL_SRC_FILES := $(COMMON_LOCAL_SRC_FILES) LOCAL_LDFLAGS := -lrt -ldl -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file +include $(BUILD_SHARED_LIBRARY) diff --git a/ge/stub/Makefile b/ge/stub/Makefile index 820fc70d..06c9afe4 100644 --- a/ge/stub/Makefile +++ b/ge/stub/Makefile @@ -1,6 +1,6 @@ -inc_path := $(shell pwd)/inc/external/ +inc_path := $(shell pwd)/graphengine/inc/external/ out_path := $(shell pwd)/out/ge/lib64/stub/ -stub_path := $(shell pwd)/framework/domi/stub/ +stub_path := $(shell pwd)/graphengine/ge/stub/ mkdir_stub := $(shell mkdir -p $(out_path)) local_stub := $(shell $(HI_PYTHON) $(stub_path)/gen_stubapi.py $(inc_path) $(out_path))