Skip to content

Commit c27bdeb

Browse files
Fixed the use of the MSCCLPP_ENABLE_CLIP build flag
* Fixed the setting of the `MSCCLPP_ENABLE_CLIP` arg in the mscclpp build. It wasn't actually being defined in the C++ code at compile time, just passed to the cmake. * Updated CHANGELOG.md [rocm-systems] ROCm/rocm-systems#2773 (commit c90d4d6)
1 parent c523628 commit c27bdeb

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ Full documentation for RCCL is available at [https://rccl.readthedocs.io](https:
1414
* The MSCCL feature is now disabled by default. The `--disable-msccl-kernel` build flag is replaced with `--enable-msccl-kernel` in the `rccl/install.sh` script.
1515
* MSCCL and NPKIT are deprecated and will be removed in a future release of RCCL.
1616

17+
### Resolved Issues
18+
* Fixed MSCCLPP_ENABLE_CLIP CMake build flag, which was not being properly honored.
19+
1720
## Unreleased - RCCL 2.27.7 for ROCm 7.2.0
1821

1922
### Changed

cmake/MSCCLPP.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ function(add_mscclpp_targets)
177177
mscclpp
178178
INSTALL_DIR ${MSCCLPP_INSTALL_DIR}
179179
LIST_SEPARATOR %
180-
CMAKE_ARGS "-DGPU_TARGETS=${MSCCLPP_GPU_TARGETS}" -DMSCCLPP_BYPASS_GPU_CHECK=ON -DMSCCLPP_USE_ROCM=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DMSCCLPP_BUILD_APPS_NCCL=ON -DMSCCLPP_BUILD_PYTHON_BINDINGS=OFF -DMSCCLPP_BUILD_TESTS=OFF -DMSCCLPP_CLIP_ENABLED=${ENABLE_MSCCLPP_CLIP} -DMSCCLPP_ENABLE_EXECUTOR=${ENABLE_MSCCLPP_EXECUTOR} -DMSCCLPP_ENABLE_FORMAT_CHECKS=${ENABLE_MSCCLPP_FORMAT_CHECKS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_VERBOSE_MAKEFILE=1 "${CMAKE_INHERITED_ARGS}" -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DFETCHCONTENT_SOURCE_DIR_JSON=${JSON_SOURCE} -DEXT_SOURCE=${EXT_SOURCE}
180+
CMAKE_ARGS "-DGPU_TARGETS=${MSCCLPP_GPU_TARGETS}" -DMSCCLPP_BYPASS_GPU_CHECK=ON -DMSCCLPP_USE_ROCM=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DMSCCLPP_BUILD_APPS_NCCL=ON -DMSCCLPP_BUILD_PYTHON_BINDINGS=OFF -DMSCCLPP_BUILD_TESTS=OFF -DMSCCLPP_ENABLE_CLIP=${ENABLE_MSCCLPP_CLIP} -DMSCCLPP_ENABLE_EXECUTOR=${ENABLE_MSCCLPP_EXECUTOR} -DMSCCLPP_ENABLE_FORMAT_CHECKS=${ENABLE_MSCCLPP_FORMAT_CHECKS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_VERBOSE_MAKEFILE=1 "${CMAKE_INHERITED_ARGS}" -DFETCHCONTENT_SOURCE_DIR_JSON=${JSON_SOURCE}
181181
LOG_DOWNLOAD FALSE
182182
LOG_CONFIGURE FALSE
183183
LOG_BUILD FALSE

ext-src/remove-clip.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 712468d..e072852 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -144,6 +144,9 @@ endif()
6+
if(MSCCLPP_NPKIT_FLAGS)
7+
target_compile_definitions(mscclpp_obj PRIVATE ${MSCCLPP_NPKIT_FLAGS})
8+
endif()
9+
+if(MSCCLPP_ENABLE_CLIP)
10+
+ target_compile_definitions(mscclpp_obj PRIVATE MSCCLPP_CLIP_ENABLED)
11+
+endif()
12+
13+
# libmscclpp
14+
add_library(mscclpp SHARED)
115
diff --git a/apps/nccl/src/allreduce.hpp b/apps/nccl/src/allreduce.hpp
216
index fac105a..9ef93ce 100644
317
--- a/apps/nccl/src/allreduce.hpp

0 commit comments

Comments
 (0)