From 3e51c41dcb226638b665c3ec574c0d4764b31692 Mon Sep 17 00:00:00 2001 From: Nilesh M Negi Date: Tue, 1 Jul 2025 16:37:14 -0500 Subject: [PATCH] [BUILD] Fix packaging for RAS (#1784) --- CMakeLists.txt | 2 ++ cmake/rcclRAS.cmake | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ae628058e..05a57c0a49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1197,7 +1197,9 @@ else() set(DEPENDS_HIP_RUNTIME "hip-runtime-amd" ) endif() rocm_package_add_dependencies(DEPENDS "${DEPENDS_HIP_RUNTIME} >= 4.5.0" "rocm-smi-lib >= 4.0.0") +set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) +set(CPACK_RPM_COMPONENT_INSTALL ON) set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt" "${ROCM_PATH}") find_file (DEBIAN debian_version debconf.conf PATHS /etc) diff --git a/cmake/rcclRAS.cmake b/cmake/rcclRAS.cmake index 66155d9e29..1d7eedc9ee 100644 --- a/cmake/rcclRAS.cmake +++ b/cmake/rcclRAS.cmake @@ -4,22 +4,23 @@ cmake_minimum_required(VERSION 3.16) message("Building rccl RAS client executable") -set(CMAKE_IGNORE_PATH "${ROCM_PATH}/lib" "${ROCM_PATH}/include") - add_executable(rcclras "${PROJECT_BINARY_DIR}/hipify/src/ras/client.cc") target_include_directories(rcclras PRIVATE ${PROJECT_BINARY_DIR}/include) target_include_directories(rcclras PRIVATE ${HIPIFY_DIR}/src) target_include_directories(rcclras PRIVATE ${HIPIFY_DIR}/src/include) +target_link_libraries(rcclras PRIVATE hip::host) +target_link_libraries(rcclras PRIVATE dl) + if(BUILD_SHARED_LIBS) target_link_libraries(rcclras PRIVATE rccl) - set_property(TARGET rcclras PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + set_property(TARGET rcclras PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_BINARY_DIR};${ROCM_PATH}/lib") else() - add_dependencies(rccl-UnitTests rccl) + add_dependencies(rcclras rccl) target_link_libraries(rcclras PRIVATE dl rt -lrccl -L${CMAKE_BINARY_DIR} -lamdhip64 -L${ROCM_PATH}/lib) endif() -set_target_properties(rcclras PROPERTIES BUILD_RPATH "${CMAKE_BINARY_DIR}") +set_target_properties(rcclras PROPERTIES BUILD_RPATH "${CMAKE_BINARY_DIR};${ROCM_PATH}/lib") rocm_install(TARGETS rcclras)