Merged
fix(package): 排除7个aicpu公共头在pkg_inc/aicpu_common下的重复安装 #857
liu-weiAdd on Sep 15
fix(package): 排除7个aicpu公共头在pkg_inc/aicpu_common下的重复安装 #857
Merged
Total: 2 files changed+8-7
| @@ -97,6 +97,7 @@ install(DIRECTORY ${pkg_inc_src}/ | |||
| 97 | ) | 97 | ) |
| 98 | # aicpu_common 头文件源码已拆为两处：开源算子仓使用的在 include/op_common/aicpu_common 下， | 98 | # aicpu_common 头文件源码已拆为两处：开源算子仓使用的在 include/op_common/aicpu_common 下， |
| 99 | # 仅 opbase 内部使用的在 aicpu_common/ 下。装包时合并回同一目标路径，对下游保持不变。 | 99 | # 仅 opbase 内部使用的在 aicpu_common/ 下。装包时合并回同一目标路径，对下游保持不变。 |
| 100 | +# 以下 7 个公共头已由 aicpu_headers_src 规则扁平安装到 include/aicpu/，此处排除避免重复。 | ||
| 100 | set(aicpu_common_public ${CMAKE_CURRENT_SOURCE_DIR}/include/op_common/aicpu_common) | 101 | set(aicpu_common_public ${CMAKE_CURRENT_SOURCE_DIR}/include/op_common/aicpu_common) |
| 101 | install(DIRECTORY ${aicpu_common_public}/ | 102 | install(DIRECTORY ${aicpu_common_public}/ |
| 102 | DESTINATION ${CMAKE_SYSTEM_PROCESSOR}-linux/pkg_inc/aicpu_common | 103 | DESTINATION ${CMAKE_SYSTEM_PROCESSOR}-linux/pkg_inc/aicpu_common |
| @@ -104,6 +105,13 @@ install(DIRECTORY ${aicpu_common_public}/ | |||
| 104 | FILE_PERMISSIONS | 105 | FILE_PERMISSIONS |
| 105 | OWNER_READ OWNER_EXECUTE | 106 | OWNER_READ OWNER_EXECUTE |
| 106 | GROUP_READ GROUP_EXECUTE | 107 | GROUP_READ GROUP_EXECUTE |
| 108 | + PATTERN "cpu_attr_value.h" EXCLUDE | ||
| 109 | + PATTERN "cpu_tensor.h" EXCLUDE | ||
| 110 | + PATTERN "cpu_tensor_shape.h" EXCLUDE | ||
| 111 | + PATTERN "cpu_context.h" EXCLUDE | ||
| 112 | + PATTERN "cpu_types.h" EXCLUDE | ||
| 113 | + PATTERN "cpu_kernel.h" EXCLUDE | ||
| 114 | + PATTERN "cpu_kernel_register.h" EXCLUDE | ||
| 107 | ) | 115 | ) |
| 108 | # 私有头逐个列举，不能整目录安装：aicpu_common/ 下还有 .cc/.cpp/.proto/CMakeLists.txt， | 116 | # 私有头逐个列举，不能整目录安装：aicpu_common/ 下还有 .cc/.cpp/.proto/CMakeLists.txt， |
| 109 | # 以及不属于对外交付集、原本就不打包的 cust_op/cust_dlog_record.h。 | 117 | # 以及不属于对外交付集、原本就不打包的 cust_op/cust_dlog_record.h。 |
| @@ -49,12 +49,8 @@ | |||
| 49 | <file_info copy_type="source" src_path="" dst_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/common" install_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/common" install_type="all"> | 49 | <file_info copy_type="source" src_path="" dst_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/common" install_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/common" install_type="all"> |
| 50 | <file value="async_cpu_kernel.h" install_mod="550"/> | 50 | <file value="async_cpu_kernel.h" install_mod="550"/> |
| 51 | <file value="async_event_util.h" install_mod="550"/> | 51 | <file value="async_event_util.h" install_mod="550"/> |
| 52 | - <file value="cpu_context.h" install_mod="550"/> | ||
| 53 | <file value="cpu_kernel_cache.h" install_mod="550"/> | 52 | <file value="cpu_kernel_cache.h" install_mod="550"/> |
| 54 | - <file value="cpu_kernel.h" install_mod="550"/> | ||
| 55 | - <file value="cpu_kernel_register.h" install_mod="550"/> | ||
| 56 | <file value="cpu_kernel_utils.h" install_mod="550"/> | 53 | <file value="cpu_kernel_utils.h" install_mod="550"/> |
| 57 | - <file value="cpu_types.h" install_mod="550"/> | ||
| 58 | <file value="device_cpu_kernel.h" install_mod="550"/> | 54 | <file value="device_cpu_kernel.h" install_mod="550"/> |
| 59 | <file value="device.h" install_mod="550"/> | 55 | <file value="device.h" install_mod="550"/> |
| 60 | <file value="device_sharder.h" install_mod="550"/> | 56 | <file value="device_sharder.h" install_mod="550"/> |
| @@ -70,10 +66,7 @@ | |||
| 70 | </file_info> | 66 | </file_info> |
| 71 | <file_info copy_type="source" src_path="" dst_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/cpu_proto" install_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/cpu_proto" install_type="all"> | 67 | <file_info copy_type="source" src_path="" dst_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/cpu_proto" install_path="$(TARGET_ENV)/pkg_inc/aicpu_common/context/cpu_proto" install_type="all"> |
| 72 | <file value="attr_value_impl.h" install_mod="550"/> | 68 | <file value="attr_value_impl.h" install_mod="550"/> |
| 73 | - <file value="cpu_attr_value.h" install_mod="550"/> | ||
| 74 | <file value="cpu_node_def.h" install_mod="550"/> | 69 | <file value="cpu_node_def.h" install_mod="550"/> |
| 75 | - <file value="cpu_tensor.h" install_mod="550"/> | ||
| 76 | - <file value="cpu_tensor_shape.h" install_mod="550"/> | ||
| 77 | <file value="node_def_impl.h" install_mod="550"/> | 70 | <file value="node_def_impl.h" install_mod="550"/> |
| 78 | <file value="tensor_impl.h" install_mod="550"/> | 71 | <file value="tensor_impl.h" install_mod="550"/> |
| 79 | <file value="tensor_shape_impl.h" install_mod="550"/> | 72 | <file value="tensor_shape_impl.h" install_mod="550"/> |