diff --git a/projects/rccl/CHANGELOG.md b/projects/rccl/CHANGELOG.md index 714ce33088..b79257aa6c 100644 --- a/projects/rccl/CHANGELOG.md +++ b/projects/rccl/CHANGELOG.md @@ -2,7 +2,16 @@ Full documentation for RCCL is available at [https://rccl.readthedocs.io](https://rccl.readthedocs.io) -## Unreleased - RCCL 2.26.6 for ROCm 7.0.0 +## Unreleased - RCCL 2.26.6 for ROCm 7.1.0 + +### Added + +### Changed +* The MSCCL++ feature is now disabled by default. The `--disable-mscclpp` build flag is replaced with `--enable-mscclpp` in the `rccl/install.sh` script. + +### Resolved issues + +## RCCL 2.26.6 for ROCm 7.0.0 ### Resolved issues diff --git a/projects/rccl/CMakeLists.txt b/projects/rccl/CMakeLists.txt index 7b3f251bb0..bb14414e2d 100644 --- a/projects/rccl/CMakeLists.txt +++ b/projects/rccl/CMakeLists.txt @@ -26,7 +26,7 @@ option(BUILD_TESTS "Build unit test programs" option(COLLTRACE "Collective Trace Option" ON) option(ENABLE_CODE_COVERAGE "Enable code coverage" OFF) option(ENABLE_MSCCL_KERNEL "Enable MSCCL while compiling" ON) -option(ENABLE_MSCCLPP "Enable MSCCL++" ON) +option(ENABLE_MSCCLPP "Enable MSCCL++" OFF) option(ENABLE_MSCCLPP_CLIP "Enable MSCCL++ CLIP" OFF) option(ENABLE_MSCCLPP_EXECUTOR "Enable MSCCL++ Executor" OFF) option(ENABLE_MSCCLPP_FORMAT_CHECKS "Enable formatting checks in MSCCL++" OFF) diff --git a/projects/rccl/README.md b/projects/rccl/README.md index b360972282..d25f661fb2 100644 --- a/projects/rccl/README.md +++ b/projects/rccl/README.md @@ -43,7 +43,7 @@ RCCL build & installation helper script --enable_backtrace Build with custom backtrace support --disable-colltrace Build without collective trace --disable-msccl-kernel Build without MSCCL kernels - --disable-mscclpp Build without MSCCL++ support + --enable-mscclpp Build with MSCCL++ support --enable-mscclpp-clip Build MSCCL++ with clip wrapper on bfloat16 and half addition routines --disable-roctx Build without ROCTX logging -f|--fast Quick-build RCCL (local gpu arch only, no backtrace, and collective trace support) diff --git a/projects/rccl/docs/install/installation.rst b/projects/rccl/docs/install/installation.rst index 7ddb1c0de2..4a0dd17bd5 100644 --- a/projects/rccl/docs/install/installation.rst +++ b/projects/rccl/docs/install/installation.rst @@ -57,7 +57,7 @@ The RCCL build and installation helper script options are as follows: --enable_backtrace Build with custom backtrace support --disable-colltrace Build without collective trace --disable-msccl-kernel Build without MSCCL kernels - --disable-mscclpp Build without MSCCL++ support + --enable-mscclpp Build with MSCCL++ support -f|--fast Quick-build RCCL (local gpu arch only, no backtrace, and collective trace support) -h|--help Prints this help message -i|--install Install RCCL library (see --prefix argument below) diff --git a/projects/rccl/install.sh b/projects/rccl/install.sh index 15a97abb28..73734f9c9b 100755 --- a/projects/rccl/install.sh +++ b/projects/rccl/install.sh @@ -26,7 +26,7 @@ install_library=false install_prefix="${ROCM_PATH}" log_trace=false msccl_kernel_enabled=true -mscclpp_enabled=true +mscclpp_enabled=false enable_mscclpp_clip=false num_parallel_jobs=$(nproc) npkit_enabled=false @@ -51,7 +51,7 @@ function display_help() echo " --enable_backtrace Build with custom backtrace support" echo " --disable-colltrace Build without collective trace" echo " --disable-msccl-kernel Build without MSCCL kernels" - echo " --disable-mscclpp Build without MSCCL++ support" + echo " --enable-mscclpp Build with MSCCL++ support" echo " --enable-mscclpp-clip Build MSCCL++ with clip wrapper on bfloat16 and half addition routines" echo " --disable-roctx Build without ROCTX logging" echo " -f|--fast Quick-build RCCL (local gpu arch only, no backtrace, and collective trace support)" @@ -82,7 +82,7 @@ function display_help() # check if we have a modern version of getopt that can handle whitespace and long parameters getopt -T if [[ "$?" -eq 4 ]]; then - GETOPT_PARSE=$(getopt --name "${0}" --options cdfhij:lprt --longoptions address-sanitizer,dependencies,debug,enable-code-coverage,enable_backtrace,disable-colltrace,disable-msccl-kernel,disable-mscclpp,fast,help,install,jobs:,local_gpu_only,amdgpu_targets:,no_clean,npkit-enable,log-trace,openmp-test-enable,roctx-enable,package_build,prefix:,rm-legacy-include-dir,run_tests_all,run_tests_quick,static,tests_build,time-trace,force-reduce-pipeline,verbose -- "$@") + GETOPT_PARSE=$(getopt --name "${0}" --options cdfhij:lprt --longoptions address-sanitizer,dependencies,debug,enable-code-coverage,enable_backtrace,disable-colltrace,disable-msccl-kernel,enable-mscclpp,fast,help,install,jobs:,local_gpu_only,amdgpu_targets:,no_clean,npkit-enable,log-trace,openmp-test-enable,roctx-enable,package_build,prefix:,rm-legacy-include-dir,run_tests_all,run_tests_quick,static,tests_build,time-trace,force-reduce-pipeline,verbose -- "$@") else echo "Need a new version of getopt" exit 1 @@ -104,7 +104,7 @@ while true; do --enable_backtrace) build_bfd=true; shift ;; --disable-colltrace) collective_trace=false; shift ;; --disable-msccl-kernel) msccl_kernel_enabled=false; shift ;; - --disable-mscclpp) mscclpp_enabled=false; shift ;; + --enable-mscclpp) mscclpp_enabled=true; shift ;; --enable-mscclpp-clip) enable_mscclpp_clip=true; shift ;; --disable-roctx) roctx_enabled=false; shift ;; -f | --fast) build_local_gpu_only=true; collective_trace=false; msccl_kernel_enabled=false; shift ;; @@ -247,8 +247,8 @@ if [[ "${msccl_kernel_enabled}" == false ]]; then cmake_common_options="${cmake_common_options} -DENABLE_MSCCL_KERNEL=OFF" fi -if [[ "${mscclpp_enabled}" == false ]]; then - cmake_common_options="${cmake_common_options} -DENABLE_MSCCLPP=OFF" +if [[ "${mscclpp_enabled}" == true ]]; then + cmake_common_options="${cmake_common_options} -DENABLE_MSCCLPP=ON" fi if [[ "${enable_mscclpp_clip}" == true ]]; then