已合并
删除打包时将hccl打包了的逻辑 #4219
wanghan创建于 7月9日
删除打包时将hccl打包了的逻辑 #4219
已合并
共 2 个文件变更+15-6
| @@ -64,7 +64,13 @@ if(NOT "${DPRODUCT_SIDE}" STREQUAL "device") | |||
| 64 | DESTINATION ${INSTALL_LIBRARY_DIR}/asc/impl/adv_api/detail | 64 | DESTINATION ${INSTALL_LIBRARY_DIR}/asc/impl/adv_api/detail |
| 65 | ${INSTALL_OPTIONAL} COMPONENT asc-devkit FILES_MATCHING | 65 | ${INSTALL_OPTIONAL} COMPONENT asc-devkit FILES_MATCHING |
| 66 | PATTERN "*.h" | 66 | PATTERN "*.h" |
| 67 | - PATTERN "CMakeLists.txt" EXCLUDE) | 67 | + PATTERN "CMakeLists.txt" EXCLUDE |
| 68 | + PATTERN "hccl_inner_dl.h" EXCLUDE | ||
| 69 | + PATTERN "hccl_rank_graph_dl.h" EXCLUDE | ||
| 70 | + PATTERN "hccl_res_dl.h" EXCLUDE | ||
| 71 | + PATTERN "hcomm_dlsym.h" EXCLUDE | ||
| 72 | + PATTERN "hcomm_host_profiling_dl.h" EXCLUDE | ||
| 73 | + REGEX "common/adapter_error_manager_pub\\.h$" EXCLUDE) | ||
| 68 | 74 | ||
| 69 | # copy tiling to asc impl | 75 | # copy tiling to asc impl |
| 70 | install( | 76 | install( |
| @@ -78,6 +84,14 @@ if(NOT "${DPRODUCT_SIDE}" STREQUAL "device") | |||
| 78 | install( | 84 | install( |
| 79 | DIRECTORY ${ASCENDC_INCLUDE_DIR}/adv_api/ | 85 | DIRECTORY ${ASCENDC_INCLUDE_DIR}/adv_api/ |
| 80 | DESTINATION ${INSTALL_LIBRARY_DIR}/asc/include/adv_api/ | 86 | DESTINATION ${INSTALL_LIBRARY_DIR}/asc/include/adv_api/ |
| 87 | + ${INSTALL_OPTIONAL} COMPONENT asc-devkit | ||
| 88 | + REGEX "hccl/internal" EXCLUDE) | ||
| 89 | + | ||
| 90 | + install( | ||
| 91 | + FILES | ||
| 92 | + ${ASCENDC_INCLUDE_DIR}/adv_api/hccl/internal/hccl_msg.h | ||
| 93 | + ${ASCENDC_INCLUDE_DIR}/adv_api/hccl/internal/hccl_tiling_msg.h | ||
| 94 | + DESTINATION ${INSTALL_LIBRARY_DIR}/asc/include/adv_api/hccl/internal | ||
| 81 | ${INSTALL_OPTIONAL} COMPONENT asc-devkit) | 95 | ${INSTALL_OPTIONAL} COMPONENT asc-devkit) |
| 82 | 96 | ||
| 83 | # generate softlink | 97 | # generate softlink |
| @@ -45,7 +45,6 @@ | |||
| 45 | <path value="$(TARGET_ENV)/tikcpp/ascendc_kernel_cmake/fwk_modules/util/makeself"/> | 45 | <path value="$(TARGET_ENV)/tikcpp/ascendc_kernel_cmake/fwk_modules/util/makeself"/> |
| 46 | <path value="$(TARGET_ENV)/pkg_inc" install_softlink="pkg_inc"/> | 46 | <path value="$(TARGET_ENV)/pkg_inc" install_softlink="pkg_inc"/> |
| 47 | <path value="$(TARGET_ENV)/pkg_inc/asc"/> | 47 | <path value="$(TARGET_ENV)/pkg_inc/asc"/> |
| 48 | - <path value="$(TARGET_ENV)/pkg_inc/asc/hccl"/> | ||
| 49 | <path value="$(TARGET_ENV)/ascendc" install_softlink="compiler/ascendc"/> | 48 | <path value="$(TARGET_ENV)/ascendc" install_softlink="compiler/ascendc"/> |
| 50 | <path value="$(TARGET_ENV)/ascendc/include"/> | 49 | <path value="$(TARGET_ENV)/ascendc/include"/> |
| 51 | <path value="$(TARGET_ENV)/ascendc/include/basic_api"/> | 50 | <path value="$(TARGET_ENV)/ascendc/include/basic_api"/> |
| @@ -105,10 +104,6 @@ | |||
| 105 | <file value="tiling" install_mod="550" entity="true"/> | 104 | <file value="tiling" install_mod="550" entity="true"/> |
| 106 | </file_info> | 105 | </file_info> |
| 107 | 106 | ||
| 108 | - <file_info copy_type="delivery" src_path="lib/host/asc/include/adv_api" dst_path="$(TARGET_ENV)/asc/include/adv_api/hccl" install_path="$(TARGET_ENV)/asc/include/adv_api/hccl" install_type="all"> | ||
| 109 | - <file value="internal" install_softlink="$(TARGET_ENV)/pkg_inc/asc/hccl/internal" install_mod="550" entity="true"/> | ||
| 110 | - </file_info> | ||
| 111 | - | ||
| 112 | <file_info copy_type="delivery" src_path="lib/host/asc/include" dst_path="$(TARGET_ENV)/asc/include" install_path="$(TARGET_ENV)/asc/include" install_type="all"> | 107 | <file_info copy_type="delivery" src_path="lib/host/asc/include" dst_path="$(TARGET_ENV)/asc/include" install_path="$(TARGET_ENV)/asc/include" install_type="all"> |
| 113 | <file value="interface" install_softlink="$(TARGET_ENV)/ascendc/include/basic_api/interface;$(TARGET_ENV)/tikcpp/tikcfw/interface;$(TARGET_ENV)/include/ascendc/basic_api/interface" install_mod="550" entity="true"/> | 108 | <file value="interface" install_softlink="$(TARGET_ENV)/ascendc/include/basic_api/interface;$(TARGET_ENV)/tikcpp/tikcfw/interface;$(TARGET_ENV)/include/ascendc/basic_api/interface" install_mod="550" entity="true"/> |
| 114 | <file value="kernel_operator.h" install_softlink="$(TARGET_ENV)/ascendc/include/basic_api/kernel_operator.h;$(TARGET_ENV)/tikcpp/tikcfw/kernel_operator.h;$(TARGET_ENV)/include/ascendc/basic_api/kernel_operator.h" install_mod="550" entity="true"/> | 109 | <file value="kernel_operator.h" install_softlink="$(TARGET_ENV)/ascendc/include/basic_api/kernel_operator.h;$(TARGET_ENV)/tikcpp/tikcfw/kernel_operator.h;$(TARGET_ENV)/include/ascendc/basic_api/kernel_operator.h" install_mod="550" entity="true"/> |