From 912e9f4b6191e6e604a13898d4e58bb5a7ed14f2 Mon Sep 17 00:00:00 2001 From: Nilesh M Negi Date: Wed, 9 Oct 2024 23:52:04 -0500 Subject: [PATCH] [BUILD] Simplify CMake args for building MSCCLPP (#1363) Signed-off-by: nileshnegi [ROCm/rccl commit: 364a6c2130fcb7a3229c13d951afb4ee24f9e507] --- projects/rccl/cmake/MSCCLPP.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/rccl/cmake/MSCCLPP.cmake b/projects/rccl/cmake/MSCCLPP.cmake index 32104440fa..30e225d136 100644 --- a/projects/rccl/cmake/MSCCLPP.cmake +++ b/projects/rccl/cmake/MSCCLPP.cmake @@ -75,16 +75,19 @@ if(ENABLE_MSCCLPP) message(STATUS "Building mscclpp only for gfx942.") mscclpp_cmake_arg(CMAKE_PREFIX_PATH) - mscclpp_cmake_arg(CMAKE_SHARED_LINKER_FLAGS_INIT) - mscclpp_cmake_arg(CMAKE_EXE_LINKER_FLAGS_INIT) mscclpp_cmake_arg(CMAKE_INSTALL_RPATH_USE_LINK_PATH) mscclpp_cmake_arg(HIP_COMPILER) + + set(GFX942_VARIANT "gfx942") + if(BUILD_ADDRESS_SANITIZER) + set(GFX942_VARIANT "gfx942:xnack+") + endif() download_project(PROJ mscclpp_nccl # GIT_REPOSITORY https://github.com/microsoft/mscclpp.git # GIT_TAG 1e82dd444fc1ed8b7add354eebaab8a94e67d5fc INSTALL_DIR ${MSCCLPP_ROOT} - CMAKE_ARGS -DGPU_TARGETS=gfx942 -DBYPASS_GPU_CHECK=ON -DUSE_ROCM=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_APPS_NCCL=ON -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX= "${CMAKE_PREFIX_PATH_ARG}" "${CMAKE_SHARED_LINKER_FLAGS_INIT_ARG}" "${CMAKE_EXE_LINKER_FLAGS_INIT_ARG}" -DCMAKE_VERBOSE_MAKEFILE=1 "${CMAKE_INSTALL_RPATH_USE_LINK_PATH_ARG}" "${HIP_COMPILER_ARG}" -DFETCHCONTENT_SOURCE_DIR_JSON=${CMAKE_CURRENT_SOURCE_DIR}/ext-src/json + CMAKE_ARGS -DAMDGPU_TARGETS=${GFX942_VARIANT} -DGPU_TARGETS=${GFX942_VARIANT} -DBYPASS_GPU_CHECK=ON -DUSE_ROCM=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_APPS_NCCL=ON -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX= "${CMAKE_PREFIX_PATH_ARG}" -DCMAKE_VERBOSE_MAKEFILE=1 "${CMAKE_INSTALL_RPATH_USE_LINK_PATH_ARG}" "${HIP_COMPILER_ARG}" -DFETCHCONTENT_SOURCE_DIR_JSON=${CMAKE_CURRENT_SOURCE_DIR}/ext-src/json LOG_DOWNLOAD FALSE LOG_CONFIGURE FALSE LOG_BUILD FALSE