Skip to content

Commit 305c4c3

Browse files
adam360xsystems-assistant[bot]
authored andcommitted
[ROCM-21190] Fix RVS linking in the rock
## Motivation RVS isn't properly detected in 7.13+ (The rock versions) ## Technical Details Fix cmake and compile paths Signed-off-by: Adam360x <Adam.pryor@amd.com> [rocm-systems] ROCm/rocm-systems#6149 (commit 07eb6b8)
1 parent 78b6e9c commit 305c4c3

2 files changed

Lines changed: 3 additions & 24 deletions

File tree

cmake_modules/Findrvs.cmake

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,34 +37,12 @@ find_package_handle_standard_args(
3737
)
3838

3939
if(${NAME}_FOUND AND NOT TARGET ${NAME}::${NAME})
40-
add_library(${NAME}::${NAME} UNKNOWN IMPORTED)
40+
add_library(${NAME}::${NAME} SHARED IMPORTED)
4141
set_target_properties(
4242
${NAME}::${NAME}
4343
PROPERTIES
4444
IMPORTED_LOCATION "${${NAME}_LIBRARY}"
4545
INTERFACE_COMPILE_OPTIONS "${PC_${NAME}_CFLAGS_OTHER}"
4646
INTERFACE_INCLUDE_DIRECTORIES "${${NAME}_INCLUDE_DIR}"
4747
)
48-
find_library(rocm-core NAMES rocm-core REQUIRED)
49-
find_package(yaml-cpp REQUIRED)
50-
find_package(rocblas REQUIRED)
51-
find_package(hipblaslt REQUIRED)
52-
find_package(hsakmt REQUIRED)
53-
find_package(hip REQUIRED)
54-
find_package(hiprand REQUIRED)
55-
find_package(hsa-runtime64 REQUIRED)
56-
find_package(amd_smi REQUIRED)
57-
target_link_libraries(
58-
${NAME}::${NAME}
59-
INTERFACE
60-
${rocm-core}
61-
yaml-cpp
62-
roc::rocblas
63-
roc::hipblaslt
64-
hsakmt::hsakmt
65-
hip::amdhip64
66-
hip::hiprand
67-
hsa-runtime64::hsa-runtime64
68-
amd_smi
69-
)
7048
endif()

rdc_libs/rdc_modules/rdc_rvs/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ if(BUILD_RVS)
3434

3535
set(RDC_LIB_MODULES ${RDC_LIB_MODULES} ${RDC_RVS_LIB} PARENT_SCOPE)
3636
add_library(${RDC_RVS_LIB} SHARED ${RDC_RVS_LIB_SRC_LIST} ${RDC_RVS_LIB_INC_LIST})
37+
find_package(yaml-cpp REQUIRED)
3738
target_link_libraries(
3839
${RDC_RVS_LIB}
39-
PRIVATE ${RDC_LIB} ${BOOTSTRAP_LIB} rvs::rvs pthread dl
40+
PRIVATE ${RDC_LIB} ${BOOTSTRAP_LIB} rvs::rvs yaml-cpp pthread dl
4041
)
4142
target_include_directories(
4243
${RDC_RVS_LIB}

0 commit comments

Comments
 (0)