Fix RHEL10 packaging for rcclras and rccl-UnitTests (#1831)
Signed-off-by: ravaidya <ravaidya@amd.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
bd55f876e9
Коммит
0adc5edc74
@@ -14,13 +14,11 @@ target_link_libraries(rcclras PRIVATE hip::host)
|
|||||||
target_link_libraries(rcclras PRIVATE dl)
|
target_link_libraries(rcclras PRIVATE dl)
|
||||||
|
|
||||||
if(BUILD_SHARED_LIBS)
|
if(BUILD_SHARED_LIBS)
|
||||||
target_link_libraries(rcclras PRIVATE rccl)
|
target_link_libraries(rcclras PRIVATE rccl hip::device)
|
||||||
set_property(TARGET rcclras PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_BINARY_DIR};${ROCM_PATH}/lib")
|
|
||||||
else()
|
else()
|
||||||
add_dependencies(rcclras rccl)
|
add_dependencies(rcclras rccl)
|
||||||
target_link_libraries(rcclras PRIVATE dl rt -lrccl -L${CMAKE_BINARY_DIR} -lamdhip64 -L${ROCM_PATH}/lib)
|
target_link_libraries(rcclras PRIVATE dl rt -lrccl -L${CMAKE_BINARY_DIR} -lamdhip64 -L${ROCM_PATH}/lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(rcclras PROPERTIES BUILD_RPATH "${CMAKE_BINARY_DIR};${ROCM_PATH}/lib")
|
|
||||||
|
|
||||||
rocm_install(TARGETS rcclras)
|
rocm_install(TARGETS rcclras)
|
||||||
|
|||||||
@@ -313,6 +313,9 @@ if [[ "${build_tests}" == true ]] || ([[ "${run_tests}" == true ]] && [[ ! -x ./
|
|||||||
cmake_common_options="${cmake_common_options} -DBUILD_TESTS=ON"
|
cmake_common_options="${cmake_common_options} -DBUILD_TESTS=ON"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Add build directory to RPATH for packaging dependency resolution
|
||||||
|
cmake_common_options="${cmake_common_options} -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,${PWD}\""
|
||||||
|
|
||||||
# Initiate RCCL CMake
|
# Initiate RCCL CMake
|
||||||
# Passing ONLY_FUNCS separately (not as part of ${cmake_common_options}) as
|
# Passing ONLY_FUNCS separately (not as part of ${cmake_common_options}) as
|
||||||
# ${ONLY_FUNCS} is a debug-only feature
|
# ${ONLY_FUNCS} is a debug-only feature
|
||||||
|
|||||||
@@ -159,13 +159,11 @@ if(BUILD_TESTS)
|
|||||||
target_link_libraries(${test_executable} PRIVATE ${RCCL_COMMON_LINK_LIBS})
|
target_link_libraries(${test_executable} PRIVATE ${RCCL_COMMON_LINK_LIBS})
|
||||||
if(BUILD_SHARED_LIBS)
|
if(BUILD_SHARED_LIBS)
|
||||||
target_link_libraries(${test_executable} PRIVATE rccl)
|
target_link_libraries(${test_executable} PRIVATE rccl)
|
||||||
set_property(TARGET ${test_executable} PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${ROCM_PATH}/lib;${CMAKE_BINARY_DIR}")
|
|
||||||
else()
|
else()
|
||||||
add_dependencies(${test_executable} rccl)
|
add_dependencies(${test_executable} rccl)
|
||||||
target_link_libraries(${test_executable} PRIVATE dl rt numa -lrccl -L${CMAKE_BINARY_DIR} -lrocm_smi64 -L${ROCM_PATH}/lib -L${ROCM_PATH}/rocm_smi/lib)
|
target_link_libraries(${test_executable} PRIVATE dl rt numa -lrccl -L${CMAKE_BINARY_DIR} -lrocm_smi64 -L${ROCM_PATH}/lib -L${ROCM_PATH}/rocm_smi/lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_property(TARGET ${test_executable} PROPERTY BUILD_RPATH "${CMAKE_BINARY_DIR};${ROCM_PATH}/lib")
|
|
||||||
rocm_install(TARGETS ${test_executable} COMPONENT tests)
|
rocm_install(TARGETS ${test_executable} COMPONENT tests)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user