已合并
fix: 修复build.sh参数文档、移除未使用依赖、版本号升级至9.2.0 #4729
DragonBornHD84创建于 7月30日
fix: 修复build.sh参数文档、移除未使用依赖、版本号升级至9.2.0 #4729
已合并
共 6 个文件变更+15-20
| @@ -55,7 +55,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ | |||
| 55 | curl wget openssh-client iputils-ping net-tools lsof \ | 55 | curl wget openssh-client iputils-ping net-tools lsof \ |
| 56 | zip unzip \ | 56 | zip unzip \ |
| 57 | build-essential cmake ninja-build ccache pkg-config \ | 57 | build-essential cmake ninja-build ccache pkg-config \ |
| 58 | - autoconf automake libtool gperf \ | 58 | + autoconf automake libtool \ |
| 59 | gdb gdbserver lcov \ | 59 | gdb gdbserver lcov \ |
| 60 | git git-lfs \ | 60 | git git-lfs \ |
| 61 | vim htop tree zsh clangd whiptail \ | 61 | vim htop tree zsh clangd whiptail \ |
| @@ -53,8 +53,10 @@ usage() { | |||
| 53 | echo " --pkg Compile package" | 53 | echo " --pkg Compile package" |
| 54 | echo " --pkg-type=<TYPE> Specify package type (TYPE options: run/rpm/deb/all or comma-separated values, eg: deb,rpm), Default: run" | 54 | echo " --pkg-type=<TYPE> Specify package type (TYPE options: run/rpm/deb/all or comma-separated values, eg: deb,rpm), Default: run" |
| 55 | echo " all builds run, rpm and deb packages" | 55 | echo " all builds run, rpm and deb packages" |
| 56 | - echo " -p, --cann_path Set the cann package installation directory, eg: /usr/local/Ascend/cann" | 56 | + echo " -p, --cann_path Set the cann package installation directory, eg: /usr/local/Ascend/cann |
| 57 | - echo " -j Compile thread nums, default is 32, eg: -j 8" | 57 | + Default: /usr/local/Ascend/cann (root) or \$HOME/Ascend/cann (non-root)" |
| 58 | + echo " -j Compile thread nums, default is 32, eg: -j 8 | ||
| 59 | + Adjusted to CPU core count if it exceeds the core count" | ||
| 58 | echo " --cann_3rd_lib_path Set the path for third-party library dependencies, eg: ./build" | 60 | echo " --cann_3rd_lib_path Set the path for third-party library dependencies, eg: ./build" |
| 59 | echo " --asan Enable ASAN (address Sanitizer)" | 61 | echo " --asan Enable ASAN (address Sanitizer)" |
| 60 | echo $dotted_line | 62 | echo $dotted_line |
| @@ -71,8 +73,10 @@ usage() { | |||
| 71 | echo "Test Options:" | 73 | echo "Test Options:" |
| 72 | echo $dotted_line | 74 | echo $dotted_line |
| 73 | echo " -t, --test Build and run all unit tests" | 75 | echo " -t, --test Build and run all unit tests" |
| 74 | - echo " -p, --cann_path Set the cann package installation directory, eg: /usr/local/Ascend/cann" | 76 | + echo " -p, --cann_path Set the cann package installation directory, eg: /usr/local/Ascend/cann |
| 75 | - echo " -j Compile thread nums, default is 32, eg: -j 8" | 77 | + Default: /usr/local/Ascend/cann (root) or \$HOME/Ascend/cann (non-root)" |
| 78 | + echo " -j Compile thread nums, default is 32, eg: -j 8 | ||
| 79 | + Adjusted to CPU core count if it exceeds the core count" | ||
| 76 | echo " --adv_test Build and run the adv part of unit tests" | 80 | echo " --adv_test Build and run the adv part of unit tests" |
| 77 | echo " --adv_test_two Build and run the adv_test_two part of unit tests" | 81 | echo " --adv_test_two Build and run the adv_test_two part of unit tests" |
| 78 | echo " --arm_test Build and run the arm part of unit tests" | 82 | echo " --arm_test Build and run the arm part of unit tests" |
| @@ -108,9 +112,11 @@ usage() { | |||
| 108 | echo " The following are all supported arguments:" | 112 | echo " The following are all supported arguments:" |
| 109 | echo $dotted_line | 113 | echo $dotted_line |
| 110 | echo " -h, --help Display help information" | 114 | echo " -h, --help Display help information" |
| 111 | - echo " -j Compile thread nums, default is 32, eg: -j 8" | 115 | + echo " -j Compile thread nums, default is 32, eg: -j 8 |
| 116 | + Adjusted to CPU core count if it exceeds the core count" | ||
| 112 | echo " -t, --test Build and run all unit tests" | 117 | echo " -t, --test Build and run all unit tests" |
| 113 | - echo " -p, --cann_path Set the cann package installation directory, eg: /usr/local/Ascend/cann" | 118 | + echo " -p, --cann_path Set the cann package installation directory, eg: /usr/local/Ascend/cann |
| 119 | + Default: /usr/local/Ascend/cann (root) or \$HOME/Ascend/cann (non-root)" | ||
| 114 | echo " --adv_test Build and run the adv part of unit tests" | 120 | echo " --adv_test Build and run the adv part of unit tests" |
| 115 | echo " --adv_test_two Build and run the adv_test_two part of unit tests" | 121 | echo " --adv_test_two Build and run the adv_test_two part of unit tests" |
| 116 | echo " --arm_test Build and run the arm part of unit tests" | 122 | echo " --arm_test Build and run the arm part of unit tests" |
| @@ -26,15 +26,6 @@ target_include_directories(asc_hccl_headers INTERFACE | |||
| 26 | 26 | ||
| 27 | if(BUILD_OPEN_PROJECT) | 27 | if(BUILD_OPEN_PROJECT) |
| 28 | add_cann_third_party(json) | 28 | add_cann_third_party(json) |
| 29 | - add_cann_third_party(rdma-core) | ||
| 30 | - | ||
| 31 | - if(NOT TARGET rdma_core_headers) | ||
| 32 | - add_library(rdma_core_headers INTERFACE) | ||
| 33 | - | ||
| 34 | - target_include_directories(rdma_core_headers INTERFACE | ||
| 35 | - ${RDMA_CORE_INCLUDE_DIR} | ||
| 36 | - ) | ||
| 37 | - endif() | ||
| 38 | endif() | 29 | endif() |
| 39 | 30 | ||
| 40 | add_subdirectory(framework) | 31 | add_subdirectory(framework) |
| @@ -46,7 +46,6 @@ function(_add_mc2_server_object target_name attach_to_mc2_server) | |||
| 46 | ${_mc2_server_orion_head_list} | 46 | ${_mc2_server_orion_head_list} |
| 47 | ) | 47 | ) |
| 48 | target_link_libraries(${target_name} PRIVATE | 48 | target_link_libraries(${target_name} PRIVATE |
| 49 | - rdma_core_headers | ||
| 50 | ascend_hal | 49 | ascend_hal |
| 51 | c_sec | 50 | c_sec |
| 52 | unified_dlog | 51 | unified_dlog |
| @@ -119,7 +118,6 @@ function(configure_mc2_server_minimal_target) | |||
| 119 | ) | 118 | ) |
| 120 | 119 | ||
| 121 | target_link_libraries(mc2_server PRIVATE | 120 | target_link_libraries(mc2_server PRIVATE |
| 122 | - rdma_core_headers | ||
| 123 | -Wl,--no-as-needed | 121 | -Wl,--no-as-needed |
| 124 | ascend_hal | 122 | ascend_hal |
| 125 | c_sec | 123 | c_sec |
| @@ -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 | -set_package(hccl VERSION "9.0.0") | 10 | +set_package(hccl VERSION "9.2.0") |
| 11 | 11 | ||
| 12 | set_build_dependencies(hcomm ">=8.5") | 12 | set_build_dependencies(hcomm ">=8.5") |
| 13 | set_build_dependencies(runtime ">=8.5") | 13 | set_build_dependencies(runtime ">=8.5") |
| @@ -8,7 +8,7 @@ | |||
| 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 | 10 | ||
| 11 | -set_cann_package(asc-devkit VERSION "9.1.0") | 11 | +set_cann_package(asc-devkit VERSION "9.2.0") |
| 12 | 12 | ||
| 13 | set_cann_build_dependencies(runtime "CUR_MAJOR_MINOR_VER") | 13 | set_cann_build_dependencies(runtime "CUR_MAJOR_MINOR_VER") |
| 14 | set_cann_build_dependencies(metadef "CUR_MAJOR_MINOR_VER") | 14 | set_cann_build_dependencies(metadef "CUR_MAJOR_MINOR_VER") |