@@ -160,7 +160,7 @@ target_link_libraries(ge_common_static PRIVATE | |||||
ascend_protobuf | ascend_protobuf | ||||
json | json | ||||
c_sec | c_sec | ||||
-lrt | |||||
$<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | |||||
-ldl | -ldl | ||||
) | ) | ||||
@@ -61,17 +61,18 @@ GE_COMMON_LOCAL_C_INCLUDES := \ | |||||
proto/tensorflow/types.proto \ | proto/tensorflow/types.proto \ | ||||
proto/tensorflow/resource_handle.proto \ | proto/tensorflow/resource_handle.proto \ | ||||
$(TOPDIR)inc \ | $(TOPDIR)inc \ | ||||
$(TOPDIR)metadef/inc \ | |||||
$(TOPDIR)graphengine/inc \ | |||||
$(TOPDIR)inc/external \ | $(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)libc_sec/include \ | ||||
$(TOPDIR)third_party/json/include \ | $(TOPDIR)third_party/json/include \ | ||||
$(TOPDIR)third_party/protobuf/include \ | $(TOPDIR)third_party/protobuf/include \ | ||||
$(TOPDIR)third_party/openssl/include/x86/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 \ | ||||
$(TOPDIR)graphengine/ge/common \ | $(TOPDIR)graphengine/ge/common \ | ||||
$(TOPDIR)graphengine/ge/common/op \ | $(TOPDIR)graphengine/ge/common/op \ | ||||
@@ -111,6 +111,6 @@ target_link_libraries(ge_executor PRIVATE | |||||
json | json | ||||
ascend_protobuf | ascend_protobuf | ||||
c_sec | c_sec | ||||
-lrt | |||||
$<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | |||||
-ldl | -ldl | ||||
) | ) |
@@ -72,9 +72,13 @@ local_ge_executor_c_include := \ | |||||
proto/task.proto \ | proto/task.proto \ | ||||
proto/om.proto \ | proto/om.proto \ | ||||
$(TOPDIR)inc/external \ | $(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)inc \ | ||||
$(TOPDIR)metadef/inc \ | |||||
$(TOPDIR)graphengine/inc \ | |||||
$(LOCAL_PATH)/../ \ | $(LOCAL_PATH)/../ \ | ||||
$(TOPDIR)graphengine/ge \ | $(TOPDIR)graphengine/ge \ | ||||
$(TOPDIR)libc_sec/include \ | $(TOPDIR)libc_sec/include \ | ||||
@@ -287,11 +287,15 @@ COMMON_LOCAL_C_INCLUDES := \ | |||||
proto/tensorflow/versions.proto \ | proto/tensorflow/versions.proto \ | ||||
$(LOCAL_PATH) ./ \ | $(LOCAL_PATH) ./ \ | ||||
$(TOPDIR)inc \ | $(TOPDIR)inc \ | ||||
$(TOPDIR)metadef/inc \ | |||||
$(TOPDIR)graphengine/inc \ | |||||
$(TOPDIR)inc/external \ | $(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)inc/runtime \ | ||||
$(TOPDIR)libc_sec/include \ | $(TOPDIR)libc_sec/include \ | ||||
$(TOPDIR)ops/built-in/op_proto/inc \ | $(TOPDIR)ops/built-in/op_proto/inc \ | ||||
@@ -301,7 +305,7 @@ COMMON_LOCAL_C_INCLUDES := \ | |||||
third_party/opencv/include \ | third_party/opencv/include \ | ||||
ANALYZER_LOCAL_INCLUDES := \ | ANALYZER_LOCAL_INCLUDES := \ | ||||
$(TOPDIR)framework/domi/analyzer \ | |||||
$(TOPDIR)graphengine/ge/analyzer \ | |||||
NEW_OMG_HOST_SRC_FILES := \ | NEW_OMG_HOST_SRC_FILES := \ | ||||
graph/preprocess/insert_op/util_insert_aipp_op.cc \ | graph/preprocess/insert_op/util_insert_aipp_op.cc \ | ||||
@@ -341,15 +345,18 @@ DEVICE_LOCAL_C_INCLUDES := \ | |||||
proto/tensorflow/versions.proto \ | proto/tensorflow/versions.proto \ | ||||
$(LOCAL_PATH) ./ \ | $(LOCAL_PATH) ./ \ | ||||
$(TOPDIR)inc \ | $(TOPDIR)inc \ | ||||
$(TOPDIR)metadef/inc \ | |||||
$(TOPDIR)graphengine/inc \ | |||||
$(TOPDIR)libc_sec/include \ | $(TOPDIR)libc_sec/include \ | ||||
$(TOPDIR)inc/external \ | $(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)inc/runtime \ | ||||
$(TOPDIR)ops/built-in/op_proto/inc \ | $(TOPDIR)ops/built-in/op_proto/inc \ | ||||
$(TOPDIR)framework/domi \ | |||||
$(TOPDIR)graphengine/ge \ | $(TOPDIR)graphengine/ge \ | ||||
$(TOPDIR)toolchain/ide/ide-daemon/external \ | $(TOPDIR)toolchain/ide/ide-daemon/external \ | ||||
third_party/json/include \ | third_party/json/include \ | ||||
@@ -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_lib_inc_path := proto/task.proto \ | ||||
${LOCAL_PATH} \ | ${LOCAL_PATH} \ | ||||
${TOPDIR}inc \ | ${TOPDIR}inc \ | ||||
${TOPDIR}metadef/inc \ | |||||
${TOPDIR}graphengine/inc \ | |||||
${TOPDIR}inc/external \ | ${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)libc_sec/include \ | ||||
${TOPDIR}third_party/protobuf/include \ | ${TOPDIR}third_party/protobuf/include \ | ||||
${TOPDIR}inc/framework \ | |||||
$(TOPDIR)framework/domi \ | |||||
${TOPDIR}graphengine/inc/framework \ | |||||
$(TOPDIR)graphengine/ge \ | $(TOPDIR)graphengine/ge \ | ||||
#compiler for host | #compiler for host | ||||
@@ -313,17 +313,20 @@ RUNNER_LOCAL_C_INCLUDES := \ | |||||
$(LOCAL_PATH)/../ \ | $(LOCAL_PATH)/../ \ | ||||
$(LOCAL_PATH)/../../ \ | $(LOCAL_PATH)/../../ \ | ||||
$(TOPDIR)inc \ | $(TOPDIR)inc \ | ||||
$(TOPDIR)inc/common \ | |||||
$(TOPDIR)metadef/inc \ | |||||
$(TOPDIR)graphengine/inc \ | |||||
$(TOPDIR)metadef/inc/common \ | |||||
$(TOPDIR)inc/external \ | $(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)inc/runtime \ | ||||
$(TOPDIR)libc_sec/include \ | $(TOPDIR)libc_sec/include \ | ||||
$(TOPDIR)ops/built-in/op_proto/inc \ | $(TOPDIR)ops/built-in/op_proto/inc \ | ||||
$(TOPDIR)framework/domi/analyzer \ | |||||
$(TOPDIR)graphengine/ge/analyzer \ | $(TOPDIR)graphengine/ge/analyzer \ | ||||
$(TOPDIR)toolchain/ide/ide-daemon/external \ | $(TOPDIR)toolchain/ide/ide-daemon/external \ | ||||
proto/fwk_adapter.proto \ | proto/fwk_adapter.proto \ | ||||
@@ -11,12 +11,15 @@ local_lib_src_files := memory_assigner.cc \ | |||||
local_lib_inc_path := ${LOCAL_PATH} \ | local_lib_inc_path := ${LOCAL_PATH} \ | ||||
${TOPDIR}inc \ | ${TOPDIR}inc \ | ||||
${TOPDIR}metadef/inc \ | |||||
${TOPDIR}graphengine/inc \ | |||||
${TOPDIR}inc/external \ | ${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)libc_sec/include \ | ||||
${TOPDIR}third_party/protobuf/include \ | ${TOPDIR}third_party/protobuf/include \ | ||||
${TOPDIR}inc/framework \ | |||||
$(TOPDIR)framework/domi \ | |||||
${TOPDIR}graphengine/inc/framework \ | |||||
$(TOPDIR)graphengine/ge \ | $(TOPDIR)graphengine/ge \ | ||||
#compiler for host | #compiler for host | ||||
@@ -9,12 +9,15 @@ local_lib_src_files := engine/host_cpu_engine.cc \ | |||||
local_lib_inc_path := proto/task.proto \ | local_lib_inc_path := proto/task.proto \ | ||||
${LOCAL_PATH} \ | ${LOCAL_PATH} \ | ||||
${TOPDIR}inc \ | ${TOPDIR}inc \ | ||||
${TOPDIR}metadef/inc \ | |||||
${TOPDIR}graphengine/inc \ | |||||
${TOPDIR}inc/external \ | ${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)libc_sec/include \ | ||||
${TOPDIR}third_party/protobuf/include \ | ${TOPDIR}third_party/protobuf/include \ | ||||
${TOPDIR}inc/framework \ | |||||
$(TOPDIR)framework/domi \ | |||||
${TOPDIR}graphengine/inc/framework \ | |||||
$(TOPDIR)graphengine/ge \ | $(TOPDIR)graphengine/ge \ | ||||
#compiler for host | #compiler for host | ||||
@@ -17,12 +17,15 @@ LOCAL_SRC_FILES := \ | |||||
LOCAL_C_INCLUDES := \ | LOCAL_C_INCLUDES := \ | ||||
$(LOCAL_PATH)/../ ./ \ | $(LOCAL_PATH)/../ ./ \ | ||||
$(TOPDIR)inc \ | $(TOPDIR)inc \ | ||||
$(TOPDIR)metadef/inc \ | |||||
$(TOPDIR)graphengine/inc \ | |||||
$(TOPDIR)inc/external \ | $(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)libc_sec/include \ | ||||
$(TOPDIR)inc/common/util \ | |||||
$(TOPDIR)metadef/inc/common/util \ | |||||
$(TOPDIR)parser \ | $(TOPDIR)parser \ | ||||
third_party/json/include \ | third_party/json/include \ | ||||
third_party/gflags/include \ | third_party/gflags/include \ | ||||
@@ -11,9 +11,13 @@ COMMON_LOCAL_C_INCLUDES := \ | |||||
$(LOCAL_PATH)/../ \ | $(LOCAL_PATH)/../ \ | ||||
$(LOCAL_PATH)/../../ \ | $(LOCAL_PATH)/../../ \ | ||||
$(TOPDIR)inc \ | $(TOPDIR)inc \ | ||||
$(TOPDIR)metadef/inc \ | |||||
$(TOPDIR)graphengine/inc \ | |||||
$(TOPDIR)inc/external \ | $(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 | #compiler for host libengine | ||||
include $(CLEAR_VARS) | include $(CLEAR_VARS) | ||||
@@ -56,4 +60,4 @@ LOCAL_SRC_FILES := $(COMMON_LOCAL_SRC_FILES) | |||||
LOCAL_LDFLAGS := -lrt -ldl | LOCAL_LDFLAGS := -lrt -ldl | ||||
include $(BUILD_SHARED_LIBRARY) | |||||
include $(BUILD_SHARED_LIBRARY) |
@@ -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/ | 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)) | mkdir_stub := $(shell mkdir -p $(out_path)) | ||||
local_stub := $(shell $(HI_PYTHON) $(stub_path)/gen_stubapi.py $(inc_path) $(out_path)) | local_stub := $(shell $(HI_PYTHON) $(stub_path)/gen_stubapi.py $(inc_path) $(out_path)) |