Fix hip-clang cmake symbols (#212)

ROCm · May 11, 2020 · 87d7229 · 87d7229
1 parent e5a6047
commit 87d7229
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,7 +53,7 @@ rocm_setup_version( VERSION ${VERSION_STRING} )
 list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
 
 # NOTE:  workaround until hcc & hip cmake modules fixes symlink logic in their config files; remove when fixed
-list( APPEND CMAKE_PREFIX_PATH /opt/rocm/hcc /opt/rocm/hip )
+list( APPEND CMAKE_PREFIX_PATH /opt/rocm /opt/rocm/hcc /opt/rocm/hip )
 
 option( BUILD_VERBOSE "Output additional build information" OFF )
 
@@ -82,13 +82,6 @@ find_library(
   HINTS "${CMAKE_PREFIX_PATH}/lib" )
 message("amdhip64: ${LIBAMDHIP64_LIBRARY}")
 
-# Look for libamdhip64
-find_library(
-  LIBAMDHIP64_LIBRARY
-  NAMES libamdhip64.so
-  HINTS "${CMAKE_PREFIX_PATH}/lib" )
-message("amdhip64: ${LIBAMDHIP64_LIBRARY}")
-
 # Quietly look for CUDA, but if not found it's not an error
 # The presense of hip is not sufficient to determine if we want a rocm or cuda backend
 option(TRY_CUDA "Look for CUDA and use that as a backend if found" ON)

diff --git a/clients/gtest/CMakeLists.txt b/clients/gtest/CMakeLists.txt
@@ -142,10 +142,10 @@ if( NOT CUDA_FOUND )
   target_compile_options( hipblas-test PRIVATE -mf16c)
 
   if( CUSTOM_TARGET )
-    target_link_libraries( hipblas-test PRIVATE hip::${CUSTOM_TARGET} )
+    target_link_libraries( hipblas-test PRIVATE hip::${CUSTOM_TARGET} hip::host )
   else( )
     if ( LIBAMDHIP64_LIBRARY )
-      target_link_libraries( hipblas-test PRIVATE hip::amdhip64 )
+      target_link_libraries( hipblas-test PRIVATE hip::amdhip64 hip::host )
     else ( )
       get_target_property( HIP_HCC_LOCATION hip::hip_hcc IMPORTED_LOCATION_RELEASE )
       target_link_libraries( hipblas-test PRIVATE ${HIP_HCC_LOCATION} )

diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt
@@ -46,10 +46,10 @@ foreach( exe example-sscal;example-sgemm;example-sgemm-strided-batched;example-c
   target_compile_options( ${exe} PRIVATE -mf16c)
 
   if( CUSTOM_TARGET )
-    target_link_libraries( ${exe} PRIVATE hip::${CUSTOM_TARGET} )
+    target_link_libraries( ${exe} PRIVATE hip::${CUSTOM_TARGET} hip::host )
   else( )
     if( LIBAMDHIP64_LIBRARY )
-      target_link_libraries( ${exe} PRIVATE hip::amdhip64 )
+      target_link_libraries( ${exe} PRIVATE hip::amdhip64 hip::host )
     else( )
       get_target_property( HIP_HCC_LOCATION hip::hip_hcc IMPORTED_LOCATION_RELEASE )
       target_link_libraries( ${exe} PRIVATE ${HIP_HCC_LOCATION} )

diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
@@ -70,7 +70,7 @@ if( NOT CUDA_FOUND )
 
   # Remove following when hcc is fixed; hcc emits following spurious warning ROCm v1.6.3
   # "clang-5.0: warning: argument unused during compilation: '-isystem /opt/rocm/include'"
-  if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$|.*/hipcc$" )
+  if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
     target_link_libraries( hipblas PRIVATE hip::hip_hcc )
   endif( )