已合并
refactor: protobuf生成切换工程函数 #4532
zhengfeiteng创建于 8月27日
refactor: protobuf生成切换工程函数 #4532
已合并
共 52 个文件变更+54-124
| @@ -227,7 +227,7 @@ runtime在编译时,依赖的第三方开源软件列表如下: | |||
| 227 | | mockcpp_patch | 2.7-h5 | [mockcpp-2.7-h5.patch](https://gitcode.com/cann-src-third-party/mockcpp/releases/download/v2.7-h5/mockcpp-2.7-h5.patch) | | 227 | | mockcpp_patch | 2.7-h5 | [mockcpp-2.7-h5.patch](https://gitcode.com/cann-src-third-party/mockcpp/releases/download/v2.7-h5/mockcpp-2.7-h5.patch) | |
| 228 | | protobuf | 25.1 | [protobuf-25.1.tar.gz](https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz) | | 228 | | protobuf | 25.1 | [protobuf-25.1.tar.gz](https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz) | |
| 229 | | makeself | 2.5.0 | [makeself-release-2.5.0-patch1.tar.gz](https://gitcode.com/cann-src-third-party/makeself/releases/download/release-2.5.0-patch1.0/makeself-release-2.5.0-patch1.tar.gz) | | 229 | | makeself | 2.5.0 | [makeself-release-2.5.0-patch1.tar.gz](https://gitcode.com/cann-src-third-party/makeself/releases/download/release-2.5.0-patch1.0/makeself-release-2.5.0-patch1.tar.gz) | |
| 230 | -| cann-cmake | master-049 | [cmake-master-049.tar.gz](https://raw.gitcode.com/cann/cmake/archive/refs/heads/master-049.tar.gz) | | 230 | +| cann-cmake | master-053 | [cmake-master-053.tar.gz](https://raw.gitcode.com/cann/cmake/archive/refs/heads/master-053.tar.gz) | |
| 231 | 231 | ||
| 232 | > [!NOTE]注意 | 232 | > [!NOTE]注意 |
| 233 | > 如果您从其他地址下载,请确保版本号一致。 | 233 | > 如果您从其他地址下载,请确保版本号一致。 |
| @@ -229,7 +229,7 @@ The third-party open-source software dependencies for runtime compilation are as | |||
| 229 | | mockcpp_patch | 2.7-h5 | [mockcpp-2.7-h5.patch](https://gitcode.com/cann-src-third-party/mockcpp/releases/download/v2.7-h5/mockcpp-2.7-h5.patch) | | 229 | | mockcpp_patch | 2.7-h5 | [mockcpp-2.7-h5.patch](https://gitcode.com/cann-src-third-party/mockcpp/releases/download/v2.7-h5/mockcpp-2.7-h5.patch) | |
| 230 | | protobuf | 25.1 | [protobuf-25.1.tar.gz](https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz) | | 230 | | protobuf | 25.1 | [protobuf-25.1.tar.gz](https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz) | |
| 231 | | makeself | 2.5.0 | [makeself-release-2.5.0-patch1.tar.gz](https://gitcode.com/cann-src-third-party/makeself/releases/download/release-2.5.0-patch1.0/makeself-release-2.5.0-patch1.tar.gz) | | 231 | | makeself | 2.5.0 | [makeself-release-2.5.0-patch1.tar.gz](https://gitcode.com/cann-src-third-party/makeself/releases/download/release-2.5.0-patch1.0/makeself-release-2.5.0-patch1.tar.gz) | |
| 232 | -| cann-cmake | master-049 | [cmake-master-049.tar.gz](https://raw.gitcode.com/cann/cmake/archive/refs/heads/master-049.tar.gz) | | 232 | +| cann-cmake | master-053 | [cmake-master-053.tar.gz](https://raw.gitcode.com/cann/cmake/archive/refs/heads/master-053.tar.gz) | |
| 233 | 233 | ||
| 234 | > [!NOTE] | 234 | > [!NOTE] |
| 235 | > If you download from other addresses, ensure that the version numbers are consistent. | 235 | > If you download from other addresses, ensure that the version numbers are consistent. |
| @@ -9,7 +9,7 @@ | |||
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | 10 | ||
| 11 | if(NOT PROJECT_SOURCE_DIR) | 11 | if(NOT PROJECT_SOURCE_DIR) |
| 12 | - set(CANN_CMAKE_TAG "master-049") | 12 | + set(CANN_CMAKE_TAG "master-053") |
| 13 | if(CANN_3RD_LIB_PATH AND IS_DIRECTORY "${CANN_3RD_LIB_PATH}/cann-cmake") | 13 | if(CANN_3RD_LIB_PATH AND IS_DIRECTORY "${CANN_3RD_LIB_PATH}/cann-cmake") |
| 14 | include("${CANN_3RD_LIB_PATH}/cann-cmake/function/prepare.cmake") | 14 | include("${CANN_3RD_LIB_PATH}/cann-cmake/function/prepare.cmake") |
| 15 | else() | 15 | else() |
| @@ -18,7 +18,7 @@ if(NOT PROJECT_SOURCE_DIR) | |||
| 18 | FetchContent_Declare( | 18 | FetchContent_Declare( |
| 19 | cann-cmake | 19 | cann-cmake |
| 20 | URL "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz" | 20 | URL "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz" |
| 21 | - URL_HASH SHA256=19a3379a32007e279c4726d2c4b1e9a4eb8f7e187aa9f291e07c563ae3f5b321 | 21 | + URL_HASH SHA256=5ca4948c257f2ba8530d6f506e1fed3bb8d24a3ab347fb226599d37e51edc429 |
| 22 | ) | 22 | ) |
| 23 | else() | 23 | else() |
| 24 | FetchContent_Declare( | 24 | FetchContent_Declare( |
| @@ -11,74 +11,6 @@ | |||
| 11 | set(_FUNC_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}") | 11 | set(_FUNC_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}") |
| 12 | set(_ROOT_DIR "${_FUNC_CMAKE_DIR}/..") | 12 | set(_ROOT_DIR "${_FUNC_CMAKE_DIR}/..") |
| 13 | 13 | ||
| 14 | -function(protobuf_generate comp c_var h_var) | ||
| 15 | - if(NOT ARGN) | ||
| 16 | - message(SEND_ERROR "Error: protobuf_generate() called without any proto files") | ||
| 17 | - return() | ||
| 18 | - endif() | ||
| 19 | - set(${c_var}) | ||
| 20 | - set(${h_var}) | ||
| 21 | - set(_add_target FALSE) | ||
| 22 | - | ||
| 23 | - if (ENABLE_OPEN_SRC) | ||
| 24 | - set(_protoc_grogam "host_protoc") | ||
| 25 | - else() | ||
| 26 | - set(_protoc_grogam ${PROTOC_PROGRAM}) | ||
| 27 | - endif() | ||
| 28 | - | ||
| 29 | - set(extra_option "") | ||
| 30 | - foreach(arg ${ARGN}) | ||
| 31 | - if ("${arg}" MATCHES "--proto_path") | ||
| 32 | - set(extra_option ${arg}) | ||
| 33 | - endif() | ||
| 34 | - endforeach() | ||
| 35 | - | ||
| 36 | - | ||
| 37 | - | ||
| 38 | - foreach(file ${ARGN}) | ||
| 39 | - if("${file}" STREQUAL "TARGET") | ||
| 40 | - set(_add_target TRUE) | ||
| 41 | - continue() | ||
| 42 | - endif() | ||
| 43 | - | ||
| 44 | - if ("${file}" MATCHES "--proto_path") | ||
| 45 | - continue() | ||
| 46 | - endif() | ||
| 47 | - | ||
| 48 | - get_filename_component(abs_file ${file} ABSOLUTE) | ||
| 49 | - get_filename_component(file_name ${file} NAME_WE) | ||
| 50 | - get_filename_component(file_dir ${abs_file} PATH) | ||
| 51 | - get_filename_component(parent_subdir ${file_dir} NAME) | ||
| 52 | - | ||
| 53 | - if("${parent_subdir}" STREQUAL "proto") | ||
| 54 | - set(proto_output_path ${CMAKE_BINARY_DIR}/proto/${comp}/proto) | ||
| 55 | - else() | ||
| 56 | - set(proto_output_path ${CMAKE_BINARY_DIR}/proto/${comp}/proto/${parent_subdir}) | ||
| 57 | - endif() | ||
| 58 | - list(APPEND ${c_var} "${proto_output_path}/${file_name}.pb.cc") | ||
| 59 | - list(APPEND ${h_var} "${proto_output_path}/${file_name}.pb.h") | ||
| 60 | - | ||
| 61 | - add_custom_command( | ||
| 62 | - OUTPUT "${proto_output_path}/${file_name}.pb.cc" "${proto_output_path}/${file_name}.pb.h" | ||
| 63 | - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} | ||
| 64 | - COMMAND ${CMAKE_COMMAND} -E make_directory "${proto_output_path}" | ||
| 65 | - COMMAND ${CMAKE_COMMAND} -E echo "generate proto cpp_out ${comp} by ${abs_file}" | ||
| 66 | - COMMAND ${_protoc_grogam} -I${file_dir} ${extra_option} --cpp_out=${proto_output_path} ${abs_file} | ||
| 67 | - DEPENDS ${abs_file} ${_protoc_grogam} | ||
| 68 | - COMMENT "Running C++ protocol buffer compiler on ${file}" VERBATIM ) | ||
| 69 | - endforeach() | ||
| 70 | - | ||
| 71 | - if(_add_target) | ||
| 72 | - add_custom_target( | ||
| 73 | - ${comp} DEPENDS ${${c_var}} ${${h_var}} | ||
| 74 | - ) | ||
| 75 | - endif() | ||
| 76 | - | ||
| 77 | - set_source_files_properties(${${c_var}} ${${h_var}} PROPERTIES GENERATED TRUE) | ||
| 78 | - set(${c_var} ${${c_var}} PARENT_SCOPE) | ||
| 79 | - set(${h_var} ${${h_var}} PARENT_SCOPE) | ||
| 80 | -endfunction() | ||
| 81 | - | ||
| 82 | macro(install_package) | 14 | macro(install_package) |
| 83 | set(file_count 1) | 15 | set(file_count 1) |
| 84 | set(directory_count 1) | 16 | set(directory_count 1) |
| @@ -20,7 +20,7 @@ set(proto_src_files | |||
| 20 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/op_mapping_info.proto | 20 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/op_mapping_info.proto |
| 21 | ) | 21 | ) |
| 22 | 22 | ||
| 23 | -protobuf_generate(aicpu_cust PROTO_SRCS PROTO_HDRS ${proto_src_files}) | 23 | +generate_cann_protobuf(aicpu_cust PROTO_SRCS PROTO_HDRS ${proto_src_files}) |
| 24 | 24 | ||
| 25 | set(AICPU_TS_SRC_FILES | 25 | set(AICPU_TS_SRC_FILES |
| 26 | ${CMAKE_CURRENT_SOURCE_DIR}/core/aicpusd_interface_process.cpp | 26 | ${CMAKE_CURRENT_SOURCE_DIR}/core/aicpusd_interface_process.cpp |
| @@ -19,7 +19,7 @@ set(proto_src_files | |||
| 19 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/dynamic_sched.proto | 19 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/dynamic_sched.proto |
| 20 | ) | 20 | ) |
| 21 | 21 | ||
| 22 | -protobuf_generate(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) | 22 | +generate_cann_protobuf(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) |
| 23 | 23 | ||
| 24 | set(statistic_src_file | 24 | set(statistic_src_file |
| 25 | ${CMAKE_CURRENT_SOURCE_DIR}/statistic/aicpusd_period_statistic.cpp | 25 | ${CMAKE_CURRENT_SOURCE_DIR}/statistic/aicpusd_period_statistic.cpp |
| @@ -18,7 +18,7 @@ set(adumpHostProto | |||
| 18 | "${ADUMP_DIR}/proto/dump_task.proto" | 18 | "${ADUMP_DIR}/proto/dump_task.proto" |
| 19 | ) | 19 | ) |
| 20 | 20 | ||
| 21 | -protobuf_generate(adumpHostProto adumpHostProtoSrcs adumpHostProtoHeaders ${adumpHostProto} TARGET) | 21 | +generate_cann_protobuf(adumpHostProto adumpHostProtoSrcs adumpHostProtoHeaders ${adumpHostProto} TARGET) |
| 22 | 22 | ||
| 23 | # op_mapping_v2.proto: 兼容性设计,不能直接在op_mapping.proto新增字段,影响其他组件运行 | 23 | # op_mapping_v2.proto: 兼容性设计,不能直接在op_mapping.proto新增字段,影响其他组件运行 |
| 24 | set(adumpBaseProtoList | 24 | set(adumpBaseProtoList |
| @@ -26,7 +26,7 @@ set(adumpBaseProtoList | |||
| 26 | "${ADUMP_DIR}/proto/op_mapping_v2.proto" | 26 | "${ADUMP_DIR}/proto/op_mapping_v2.proto" |
| 27 | ) | 27 | ) |
| 28 | 28 | ||
| 29 | -protobuf_generate(ascend_dump_protos adumpBaseProtoSrcs adumpBaseProtoHeaders ${adumpBaseProtoList} TARGET) | 29 | +generate_cann_protobuf(ascend_dump_protos adumpBaseProtoSrcs adumpBaseProtoHeaders ${adumpBaseProtoList} TARGET) |
| 30 | 30 | ||
| 31 | ############################ adump_headers ############################ | 31 | ############################ adump_headers ############################ |
| 32 | add_library(adump_headers INTERFACE) | 32 | add_library(adump_headers INTERFACE) |
| @@ -12,7 +12,7 @@ set(adump_host_proto_files | |||
| 12 | "${ADUMP_DIR}/proto/op_mapping.proto" | 12 | "${ADUMP_DIR}/proto/op_mapping.proto" |
| 13 | "${ADUMP_DIR}/proto/dump_task.proto" | 13 | "${ADUMP_DIR}/proto/dump_task.proto" |
| 14 | ) | 14 | ) |
| 15 | -protobuf_generate(adump_host_proto adump_host_proto_srcs adump_host_proto_headers ${adump_host_proto_files} TARGET) | 15 | +generate_cann_protobuf(adump_host_proto adump_host_proto_srcs adump_host_proto_headers ${adump_host_proto_files} TARGET) |
| 16 | 16 | ||
| 17 | ####################### libascend_dump.so begin ########################### | 17 | ####################### libascend_dump.so begin ########################### |
| 18 | 18 | ||
| @@ -19,7 +19,7 @@ install(FILES | |||
| 19 | ####################### prof_collect end ########################### | 19 | ####################### prof_collect end ########################### |
| 20 | 20 | ||
| 21 | ####################### libdevprof begin ########################### | 21 | ####################### libdevprof begin ########################### |
| 22 | -protobuf_generate(devprof_proto | 22 | +generate_cann_protobuf(devprof_proto |
| 23 | CppPath | 23 | CppPath |
| 24 | HeaderPath | 24 | HeaderPath |
| 25 | ${CMAKE_CURRENT_SOURCE_DIR}/../../proto/profiler.proto | 25 | ${CMAKE_CURRENT_SOURCE_DIR}/../../proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler_proto | 10 | +generate_cann_protobuf(profiler_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${CMAKE_CURRENT_SOURCE_DIR}/../proto/profiler.proto | 13 | ${CMAKE_CURRENT_SOURCE_DIR}/../proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(msprofbin_proto | 10 | +generate_cann_protobuf(msprofbin_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${CMAKE_CURRENT_SOURCE_DIR}/../proto/profiler.proto | 13 | ${CMAKE_CURRENT_SOURCE_DIR}/../proto/profiler.proto |
| @@ -16,7 +16,7 @@ set(RUNTIME_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) | |||
| 16 | file(GLOB_RECURSE PROTO_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR} | 16 | file(GLOB_RECURSE PROTO_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR} |
| 17 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/platform_infos.proto) | 17 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/platform_infos.proto) |
| 18 | 18 | ||
| 19 | -protobuf_generate(platform_infos_proto PROTO_SRCS PROTO_HDRS ${PROTO_LIST} TARGET) | 19 | +generate_cann_protobuf(platform_infos_proto PROTO_SRCS PROTO_HDRS ${PROTO_LIST} TARGET) |
| 20 | 20 | ||
| 21 | if((DEFINED PRODUCT) AND (PRODUCT STREQUAL "ascend031")) | 21 | if((DEFINED PRODUCT) AND (PRODUCT STREQUAL "ascend031")) |
| 22 | set(PLATFORMFILE | 22 | set(PLATFORMFILE |
| @@ -21,7 +21,7 @@ endif() | |||
| 21 | set(PRODUCT_TYPE "DEFAULT") | 21 | set(PRODUCT_TYPE "DEFAULT") |
| 22 | set(lhisi_product false) | 22 | set(lhisi_product false) |
| 23 | 23 | ||
| 24 | -protobuf_generate(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) | 24 | +generate_cann_protobuf(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) |
| 25 | ###for queue_schedule so | 25 | ###for queue_schedule so |
| 26 | set (queue_schedule_server_files | 26 | set (queue_schedule_server_files |
| 27 | common/bqs_so_manager.cpp | 27 | common/bqs_so_manager.cpp |
| @@ -14,7 +14,7 @@ set(proto_src_files | |||
| 14 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/dynamic_sched_message.proto | 14 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/dynamic_sched_message.proto |
| 15 | ) | 15 | ) |
| 16 | 16 | ||
| 17 | -protobuf_generate(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) | 17 | +generate_cann_protobuf(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) |
| 18 | 18 | ||
| 19 | # qs_client | 19 | # qs_client |
| 20 | set(qs_client_files | 20 | set(qs_client_files |
| @@ -28,7 +28,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") | |||
| 28 | ) | 28 | ) |
| 29 | endif() | 29 | endif() |
| 30 | 30 | ||
| 31 | -protobuf_generate(tsd_host_proto PROTO_SRCS PROTO_HDRS ${PROTO_LIST} TARGET) | 31 | +generate_cann_protobuf(tsd_host_proto PROTO_SRCS PROTO_HDRS ${PROTO_LIST} TARGET) |
| 32 | 32 | ||
| 33 | add_library(tsdclient SHARED | 33 | add_library(tsdclient SHARED |
| 34 | ${tsdclient_all_sources} | 34 | ${tsdclient_all_sources} |
| @@ -18,7 +18,7 @@ set(adumpBaseProtoList | |||
| 18 | "${TOP_DIR}/src/dfx/adump/proto/dump_task.proto" | 18 | "${TOP_DIR}/src/dfx/adump/proto/dump_task.proto" |
| 19 | ) | 19 | ) |
| 20 | 20 | ||
| 21 | -protobuf_generate(adump_base_proto adumpBaseProtoSrc adumBaseProtoHeaders ${adumpBaseProtoList} TARGET) | 21 | +generate_cann_protobuf(adump_base_proto adumpBaseProtoSrc adumBaseProtoHeaders ${adumpBaseProtoList} TARGET) |
| 22 | add_dependencies(adump_base_proto ascend_protobuf_static) | 22 | add_dependencies(adump_base_proto ascend_protobuf_static) |
| 23 | ######################################################################## | 23 | ######################################################################## |
| 24 | 24 | ||
| @@ -19,7 +19,7 @@ set(adumpTinyProtoList | |||
| 19 | "${TOP_DIR}/src/dfx/adump/proto/dump_task.proto" | 19 | "${TOP_DIR}/src/dfx/adump/proto/dump_task.proto" |
| 20 | ) | 20 | ) |
| 21 | 21 | ||
| 22 | -protobuf_generate(adump_tiny_proto adumpTinyProtoSrc adumpTinyProtoHeaders ${adumpTinyProtoList} TARGET) | 22 | +generate_cann_protobuf(adump_tiny_proto adumpTinyProtoSrc adumpTinyProtoHeaders ${adumpTinyProtoList} TARGET) |
| 23 | add_dependencies(adump_tiny_proto ascend_protobuf_static) | 23 | add_dependencies(adump_tiny_proto ascend_protobuf_static) |
| 24 | ######################################################################## | 24 | ######################################################################## |
| 25 | 25 | ||
| @@ -97,7 +97,7 @@ set(adumpBaseProtoList | |||
| 97 | "${TOP_DIR}/metadef/proto/dump_task.proto" | 97 | "${TOP_DIR}/metadef/proto/dump_task.proto" |
| 98 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" | 98 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" |
| 99 | ) | 99 | ) |
| 100 | -protobuf_generate(adump_base_proto adumpBaseProtoSrc adumBaseProtoHeaders ${adumpBaseProtoList} TARGET) | 100 | +generate_cann_protobuf(adump_base_proto adumpBaseProtoSrc adumBaseProtoHeaders ${adumpBaseProtoList} TARGET) |
| 101 | 101 | ||
| 102 | add_executable(adump_base_stest | 102 | add_executable(adump_base_stest |
| 103 | ${adumpBaseSrc} | 103 | ${adumpBaseSrc} |
| @@ -96,7 +96,7 @@ set(adumpBaseDupProtoList | |||
| 96 | "${TOP_DIR}/metadef/proto/dump_task.proto" | 96 | "${TOP_DIR}/metadef/proto/dump_task.proto" |
| 97 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" | 97 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" |
| 98 | ) | 98 | ) |
| 99 | -protobuf_generate(adump_base_dup_proto adumpBaseDupProtoSrc adumBaseDupProtoHeaders ${adumpBaseDupProtoList} TARGET) | 99 | +generate_cann_protobuf(adump_base_dup_proto adumpBaseDupProtoSrc adumBaseDupProtoHeaders ${adumpBaseDupProtoList} TARGET) |
| 100 | 100 | ||
| 101 | add_executable(adump_base_dup_stest | 101 | add_executable(adump_base_dup_stest |
| 102 | ${adumpBaseDupUtestSrc} | 102 | ${adumpBaseDupUtestSrc} |
| @@ -88,7 +88,7 @@ set(adumpBaseTinyProtoList | |||
| 88 | "${TOP_DIR}/metadef/proto/dump_task.proto" | 88 | "${TOP_DIR}/metadef/proto/dump_task.proto" |
| 89 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" | 89 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" |
| 90 | ) | 90 | ) |
| 91 | -protobuf_generate(adump_base_tiny_proto adumpBaseTinyProtoSrc adumBaseTinyProtoHeaders ${adumpBaseTinyProtoList} TARGET) | 91 | +generate_cann_protobuf(adump_base_tiny_proto adumpBaseTinyProtoSrc adumBaseTinyProtoHeaders ${adumpBaseTinyProtoList} TARGET) |
| 92 | 92 | ||
| 93 | add_executable(adump_base_tiny_stest | 93 | add_executable(adump_base_tiny_stest |
| 94 | ${adumpBaseTinyUtestSrc} | 94 | ${adumpBaseTinyUtestSrc} |
| @@ -14,7 +14,7 @@ set(adumpBaseProtoList | |||
| 14 | "${TOP_DIR}/src/dfx/adump/proto/op_mapping.proto" | 14 | "${TOP_DIR}/src/dfx/adump/proto/op_mapping.proto" |
| 15 | "${TOP_DIR}/src/dfx/adump/proto/dump_task.proto" | 15 | "${TOP_DIR}/src/dfx/adump/proto/dump_task.proto" |
| 16 | ) | 16 | ) |
| 17 | -protobuf_generate(adump_base_proto adumpBaseProtoSrc adumBaseProtoHeaders ${adumpBaseProtoList} TARGET) | 17 | +generate_cann_protobuf(adump_base_proto adumpBaseProtoSrc adumBaseProtoHeaders ${adumpBaseProtoList} TARGET) |
| 18 | add_dependencies(adump_base_proto ascend_protobuf_static) | 18 | add_dependencies(adump_base_proto ascend_protobuf_static) |
| 19 | 19 | ||
| 20 | set(adxSrcList | 20 | set(adxSrcList |
| @@ -96,7 +96,7 @@ set(adumpBaseDupProtoList | |||
| 96 | "${TOP_DIR}/metadef/proto/dump_task.proto" | 96 | "${TOP_DIR}/metadef/proto/dump_task.proto" |
| 97 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" | 97 | "${SRC_CODE_ROOT_PATH}/inc/adump/dump_data.proto" |
| 98 | ) | 98 | ) |
| 99 | -protobuf_generate(adump_base_dup_proto adumpBaseDupProtoSrc adumBaseDupProtoHeaders ${adumpBaseDupProtoList} TARGET) | 99 | +generate_cann_protobuf(adump_base_dup_proto adumpBaseDupProtoSrc adumBaseDupProtoHeaders ${adumpBaseDupProtoList} TARGET) |
| 100 | 100 | ||
| 101 | add_executable(adump_base_dup_utest | 101 | add_executable(adump_base_dup_utest |
| 102 | ${adumpBaseDupUtestSrc} | 102 | ${adumpBaseDupUtestSrc} |
| @@ -17,7 +17,7 @@ set(proto_src_files | |||
| 17 | ${SRC_PATH}/proto/op_mapping_info.proto | 17 | ${SRC_PATH}/proto/op_mapping_info.proto |
| 18 | ) | 18 | ) |
| 19 | 19 | ||
| 20 | -protobuf_generate(aicpu_custom_proto PROTO_SRCS PROTO_HDRS ${proto_src_files} TARGET) | 20 | +generate_cann_protobuf(aicpu_custom_proto PROTO_SRCS PROTO_HDRS ${proto_src_files} TARGET) |
| 21 | 21 | ||
| 22 | set(LOCAL_SRC_FILES | 22 | set(LOCAL_SRC_FILES |
| 23 | ${SRC_PATH}/execute/main.cpp | 23 | ${SRC_PATH}/execute/main.cpp |
| @@ -18,7 +18,7 @@ set(proto_src_files | |||
| 18 | ${SRC_PATH}/proto/dynamic_sched.proto | 18 | ${SRC_PATH}/proto/dynamic_sched.proto |
| 19 | ) | 19 | ) |
| 20 | 20 | ||
| 21 | -protobuf_generate(aicpu_st_proto PROTO_SRCS PROTO_HDRS ${proto_src_files} TARGET) | 21 | +generate_cann_protobuf(aicpu_st_proto PROTO_SRCS PROTO_HDRS ${proto_src_files} TARGET) |
| 22 | 22 | ||
| 23 | set(statistic_src_file | 23 | set(statistic_src_file |
| 24 | ${SRC_PATH}/statistic/aicpusd_period_statistic.cpp | 24 | ${SRC_PATH}/statistic/aicpusd_period_statistic.cpp |
| @@ -18,7 +18,7 @@ set(proto_src_files | |||
| 18 | ${SRC_PATH}/proto/dynamic_sched.proto | 18 | ${SRC_PATH}/proto/dynamic_sched.proto |
| 19 | ) | 19 | ) |
| 20 | 20 | ||
| 21 | -protobuf_generate(aicpu_proto PROTO_SRCS PROTO_HDRS ${proto_src_files} TARGET) | 21 | +generate_cann_protobuf(aicpu_proto PROTO_SRCS PROTO_HDRS ${proto_src_files} TARGET) |
| 22 | 22 | ||
| 23 | set(COMMON_C_INCLUDES | 23 | set(COMMON_C_INCLUDES |
| 24 | ${SRC_PATH}/core/operator_kernel/communication | 24 | ${SRC_PATH}/core/operator_kernel/communication |
| @@ -64,7 +64,7 @@ target_link_libraries(msprof_utestonetrack_pub INTERFACE | |||
| 64 | -lpthread | 64 | -lpthread |
| 65 | ) | 65 | ) |
| 66 | 66 | ||
| 67 | -protobuf_generate(profiler | 67 | +generate_cann_protobuf(profiler |
| 68 | CppPath | 68 | CppPath |
| 69 | HeaderPath | 69 | HeaderPath |
| 70 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 70 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(acp_utest_proto | 10 | +generate_cann_protobuf(acp_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(application_utest_proto | 10 | +generate_cann_protobuf(application_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(device_utest_proto | 10 | +generate_cann_protobuf(device_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(job_wrapper_proto | 10 | +generate_cann_protobuf(job_wrapper_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(message_utest_proto | 10 | +generate_cann_protobuf(message_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(msprofiler_utest_proto | 10 | +generate_cann_protobuf(msprofiler_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -328,7 +328,7 @@ set_target_properties(msprofiler_utest | |||
| 328 | ) | 328 | ) |
| 329 | 329 | ||
| 330 | # msprof utest | 330 | # msprof utest |
| 331 | -protobuf_generate(msprof_utest_proto | 331 | +generate_cann_protobuf(msprof_utest_proto |
| 332 | CppPath | 332 | CppPath |
| 333 | HeaderPath | 333 | HeaderPath |
| 334 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 334 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(msprof_bin_utest_proto | 10 | +generate_cann_protobuf(msprof_bin_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(prof_hal_utest_proto | 10 | +generate_cann_protobuf(prof_hal_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -309,7 +309,7 @@ set(INCLUDE_DIR | |||
| 309 | ${CMAKE_BINARY_DIR}/proto/profiler | 309 | ${CMAKE_BINARY_DIR}/proto/profiler |
| 310 | ) | 310 | ) |
| 311 | 311 | ||
| 312 | -protobuf_generate(profiler | 312 | +generate_cann_protobuf(profiler |
| 313 | CppPath | 313 | CppPath |
| 314 | HeaderPath | 314 | HeaderPath |
| 315 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 315 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -231,7 +231,7 @@ set(SRC_FILE | |||
| 231 | ${DEVPROF_SRC_FILE} | 231 | ${DEVPROF_SRC_FILE} |
| 232 | ) | 232 | ) |
| 233 | 233 | ||
| 234 | -protobuf_generate(profiler | 234 | +generate_cann_protobuf(profiler |
| 235 | CppPath | 235 | CppPath |
| 236 | HeaderPath | 236 | HeaderPath |
| 237 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 237 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -933,8 +933,6 @@ add_library(profapi_share_st SHARED | |||
| 933 | ../../stub/error_manager_stub2.cpp | 933 | ../../stub/error_manager_stub2.cpp |
| 934 | ) | 934 | ) |
| 935 | 935 | ||
| 936 | -add_dependencies(profapi_share_st csec_src) | ||
| 937 | - | ||
| 938 | target_compile_definitions(profapi_share_st PRIVATE | 936 | target_compile_definitions(profapi_share_st PRIVATE |
| 939 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:WIN32> | 937 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:WIN32> |
| 940 | LLT_DATA_DIR="${LLT_DATA_DIR}" | 938 | LLT_DATA_DIR="${LLT_DATA_DIR}" |
| @@ -243,7 +243,7 @@ set(adprof_src | |||
| 243 | ${MSPROF_SOURCE_DIR}/dvvp/streamio/client/src/sender.cpp | 243 | ${MSPROF_SOURCE_DIR}/dvvp/streamio/client/src/sender.cpp |
| 244 | ) | 244 | ) |
| 245 | 245 | ||
| 246 | -protobuf_generate(profiler | 246 | +generate_cann_protobuf(profiler |
| 247 | CppPath | 247 | CppPath |
| 248 | HeaderPath | 248 | HeaderPath |
| 249 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 249 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -240,7 +240,7 @@ if(NOT BUILD_PROFILING_OPEN_PROJECT) | |||
| 240 | ) | 240 | ) |
| 241 | endif() | 241 | endif() |
| 242 | 242 | ||
| 243 | -protobuf_generate(profiler | 243 | +generate_cann_protobuf(profiler |
| 244 | CppPath | 244 | CppPath |
| 245 | HeaderPath | 245 | HeaderPath |
| 246 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 246 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(profiler | 10 | +generate_cann_protobuf(profiler |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(streamio_common_utest_proto | 10 | +generate_cann_protobuf(streamio_common_utest_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -7,7 +7,7 @@ | |||
| 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | # INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | -protobuf_generate(transport_proto | 10 | +generate_cann_protobuf(transport_proto |
| 11 | CppPath | 11 | CppPath |
| 12 | HeaderPath | 12 | HeaderPath |
| 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto | 13 | ${MSPROF_SOURCE_DIR}/dvvp/proto/profiler.proto |
| @@ -9,7 +9,7 @@ file(GLOB_RECURSE PROTO_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR} | |||
| 9 | 9 | ||
| 10 | set_legacy_protobuf() | 10 | set_legacy_protobuf() |
| 11 | 11 | ||
| 12 | -protobuf_generate(platform_infos_proto PROTO_SRCS PROTO_HDRS ${PROTO_LIST} TARGET) | 12 | +generate_cann_protobuf(platform_infos_proto PROTO_SRCS PROTO_HDRS ${PROTO_LIST} TARGET) |
| 13 | 13 | ||
| 14 | set (PLATFORM_SRC_FILES | 14 | set (PLATFORM_SRC_FILES |
| 15 | ${TOP_DIR}/ace/npuruntime/runtime/platform/platform_info.cpp | 15 | ${TOP_DIR}/ace/npuruntime/runtime/platform/platform_info.cpp |
| @@ -16,7 +16,7 @@ set(proto_src_files | |||
| 16 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/dynamic_sched_message.proto | 16 | ${CMAKE_CURRENT_SOURCE_DIR}/proto/dynamic_sched_message.proto |
| 17 | ) | 17 | ) |
| 18 | 18 | ||
| 19 | -protobuf_generate(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) | 19 | +generate_cann_protobuf(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) |
| 20 | 20 | ||
| 21 | set(common_compile_options | 21 | set(common_compile_options |
| 22 | -rdynamic | 22 | -rdynamic |
| @@ -18,7 +18,7 @@ set(SRC_PATH | |||
| 18 | ${TOP_DIR}/src/queue_schedule | 18 | ${TOP_DIR}/src/queue_schedule |
| 19 | ) | 19 | ) |
| 20 | # set_legacy_protobuf() | 20 | # set_legacy_protobuf() |
| 21 | -protobuf_generate(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) | 21 | +generate_cann_protobuf(aicpu PROTO_SRCS PROTO_HDRS ${proto_src_files}) |
| 22 | 22 | ||
| 23 | set(common_compile_options | 23 | set(common_compile_options |
| 24 | -rdynamic | 24 | -rdynamic |
| @@ -121,7 +121,7 @@ set(TSD_PROTO_SRC_FILE | |||
| 121 | file(GLOB_RECURSE RTOTO_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR} | 121 | file(GLOB_RECURSE RTOTO_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR} |
| 122 | ${TSD_PROTO_SRC_FILE} | 122 | ${TSD_PROTO_SRC_FILE} |
| 123 | ) | 123 | ) |
| 124 | -protobuf_generate(tsd_client_proto PROTO_SRCS PROTO_HDRS ${RTOTO_LIST}) | 124 | +generate_cann_protobuf(tsd_client_proto PROTO_SRCS PROTO_HDRS ${RTOTO_LIST}) |
| 125 | 125 | ||
| 126 | add_executable(tsd_client_utest | 126 | add_executable(tsd_client_utest |
| 127 | ${TSD_CLIENT_SRC_FILE} | 127 | ${TSD_CLIENT_SRC_FILE} |