fix test build

RWKV · Oct 1, 2023 · 9a0611c · 9a0611c
1 parent b5f7a8d
commit 9a0611c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -434,11 +434,11 @@ endif()
 
 if (NOT RWKV_STANDALONE)
     set_property(TARGET ggml PROPERTY GGML_STANDALONE OFF)
-    if(NOT RWKV_HIPBLAS)
+    # if(NOT RWKV_HIPBLAS)
         enable_testing()
         add_subdirectory(tests)
         add_subdirectory(extras)
-    endif()
+    # endif()
 elseif()
     set_property(TARGET ggml PROPERTY GGML_STANDALONE ON)
 endif()
diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt
@@ -1,11 +1,20 @@
 function(rwkv_add_extra source)
     get_filename_component(EXTRA_TARGET ${source} NAME_WE)
     add_executable(rwkv_${EXTRA_TARGET} ${source})
-    target_link_libraries(rwkv_${EXTRA_TARGET} PRIVATE ggml rwkv)
-    if (RWKV_STATIC)
-        get_target_property(target_LINK_OPTIONS rwkv_${EXTRA_TARGET} LINK_OPTIONS)
-        list(REMOVE_ITEM target_LINK_OPTIONS "-static")
-        set_target_properties(rwkv_${EXTRA_TARGET} PROPERTIES LINK_OPTIONS "${target_LINK_OPTIONS}")
+    if(RWKV_HIPBLAS)
+        target_link_libraries(rwkv_${EXTRA_TARGET} PRIVATE ggml-rocm ggml rwkv)
+    else()
+        target_link_libraries(rwkv_${EXTRA_TARGET} PRIVATE ggml rwkv)
+    endif()
+
+     if (RWKV_STATIC)
+        if(RWKV_HIPBLAS)
+            message(FATAL_ERROR "Static linking not supported for HIP/ROCm")
+        else()
+            get_target_property(target_LINK_OPTIONS ${TEST_TARGET} LINK_OPTIONS)
+            list(REMOVE_ITEM target_LINK_OPTIONS "-static")
+            set_target_properties(${TEST_TARGET} PROPERTIES LINK_OPTIONS "${target_LINK_OPTIONS}")
+        endif()
     endif()
 endfunction()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -4,12 +4,20 @@ function(rwkv_add_test source)
     if (GGML_CUDA_SOURCES)
         set_property(TARGET ${TEST_TARGET} PROPERTY CUDA_ARCHITECTURES OFF)
     endif()
-    target_link_libraries(${TEST_TARGET} PRIVATE ggml rwkv)
+    if(RWKV_HIPBLAS)
+        target_link_libraries(${TEST_TARGET} PRIVATE ggml-rocm ggml rwkv)
+    else()
+        target_link_libraries(${TEST_TARGET} PRIVATE ggml rwkv)
+    endif()
     add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}> ${ARGN})
     if (RWKV_STATIC)
-        get_target_property(target_LINK_OPTIONS ${TEST_TARGET} LINK_OPTIONS)
-        list(REMOVE_ITEM target_LINK_OPTIONS "-static")
-        set_target_properties(${TEST_TARGET} PROPERTIES LINK_OPTIONS "${target_LINK_OPTIONS}")
+        if(RWKV_HIPBLAS)
+         message(FATAL_ERROR "Static linking not supported for HIP/ROCm")
+        else()
+            get_target_property(target_LINK_OPTIONS ${TEST_TARGET} LINK_OPTIONS)
+            list(REMOVE_ITEM target_LINK_OPTIONS "-static")
+            set_target_properties(${TEST_TARGET} PROPERTIES LINK_OPTIONS "${target_LINK_OPTIONS}")
+        endif()
     endif()
 endfunction()