From 241d5bab38bafb26a337f29239cd22c9c1d1297e Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Mon, 31 May 2021 13:24:33 -0400 Subject: [PATCH] SWDEV-288814 - Remove dependency on ROCclr HIP only has a dependency on ROCclr at build time. When exporting HIP, ROCClr is already embedded into the shared/static library. There is no reason to search for it. Change-Id: I8d7e8e58164e5585a1dfc9c998ecf02ca42d8aac [ROCm/clr commit: 815e8dd2a3681b461880cf5f8c741d740b6dbdff] --- projects/clr/hipamd/hip-config.cmake.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/projects/clr/hipamd/hip-config.cmake.in b/projects/clr/hipamd/hip-config.cmake.in index e696226834..914d71be17 100755 --- a/projects/clr/hipamd/hip-config.cmake.in +++ b/projects/clr/hipamd/hip-config.cmake.in @@ -139,7 +139,6 @@ include( "${CMAKE_CURRENT_LIST_DIR}/hip-targets.cmake" ) if(NOT WIN32) find_dependency(hsa-runtime64) find_dependency(Threads) - find_dependency(ROCclr) endif() #get_filename_component cannot resolve the symlinks if called from /opt/rocm/lib/hip @@ -174,14 +173,6 @@ if(HIP_RUNTIME MATCHES "rocclr") get_target_property(amdhip64_type hip::amdhip64 TYPE) message(STATUS "hip::amdhip64 is ${amdhip64_type}") - if(${amdhip64_type} STREQUAL "STATIC_LIBRARY") - # For cyclic dependence - get_target_property(link_interf_libs amdrocclr_static LINK_INTERFACE_LIBRARIES) - if(NOT "${link_interf_libs}" MATCHES "hip::amdhip64") - # Prevent repeatedly linking dependence - target_link_libraries(amdrocclr_static INTERFACE hip::amdhip64) - endif() - endif() if(NOT WIN32) set_target_properties(hip::device PROPERTIES