test

Author: amakropoulos

CMakeLists.txt

@@ -48,6 +48,45 @@ endif()
 
 set(LLAMA_CPP_ROOT ${CMAKE_SOURCE_DIR}/third_party/llama.cpp)
 
+if(ARCHITECTURE MATCHES "android" AND ARCHITECTURE MATCHES "vulkan")
+    # Derive triple from ANDROID_ABI
+    if(ANDROID_ABI STREQUAL "arm64-v8a")
+        set(ANDROID_ARCH_TRIPLE "aarch64-linux-android")
+    elseif(ANDROID_ABI STREQUAL "armeabi-v7a")
+        set(ANDROID_ARCH_TRIPLE "arm-linux-androideabi")
+    elseif(ANDROID_ABI STREQUAL "x86_64")
+        set(ANDROID_ARCH_TRIPLE "x86_64-linux-android")
+    elseif(ANDROID_ABI STREQUAL "x86")
+        set(ANDROID_ARCH_TRIPLE "i686-linux-android")
+    else()
+        message(FATAL_ERROR "Unknown ANDROID_ABI: ${ANDROID_ABI}")
+    endif()
+
+    message(STATUS "ANDROID_ABI=${ANDROID_ABI}")
+    message(STATUS "ANDROID_ARCH_TRIPLE=${ANDROID_ARCH_TRIPLE}")
+    message(STATUS "CMAKE_SYSROOT=${CMAKE_SYSROOT}")
+
+    set(Vulkan_LIBRARY "${CMAKE_SYSROOT}/usr/lib/${ANDROID_ARCH_TRIPLE}/26/libvulkan.so")
+    set(Vulkan_LIBRARY "${CMAKE_SYSROOT}/usr/lib/${ANDROID_ARCH_TRIPLE}/26/libvulkan.so" CACHE FILEPATH "" FORCE)
+    set(Vulkan_FOUND TRUE)
+    set(Vulkan_FOUND TRUE CACHE BOOL "" FORCE)
+    set(Vulkan_VERSION "1.3.275")
+    set(Vulkan_VERSION "1.3.275" CACHE STRING "" FORCE)
+    set(Vulkan_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/third_party/Vulkan-Headers/include")
+    set(Vulkan_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/third_party/Vulkan-Headers/include" CACHE PATH "" FORCE)
+
+    if(NOT EXISTS "${Vulkan_LIBRARY}")
+        message(FATAL_ERROR "Vulkan stub not found at: ${Vulkan_LIBRARY}")
+    endif()
+
+    find_program(Vulkan_GLSLC_EXECUTABLE
+        NAMES glslc
+        PATHS "/usr/bin" "/usr/local/bin"
+        NO_CMAKE_SYSTEM_PATH)
+    set(Vulkan_GLSLC_EXECUTABLE "${Vulkan_GLSLC_EXECUTABLE}" CACHE FILEPATH "" FORCE)
+endif()
+
+
 function(LLAMALIB_COMPILE_DEFS NAME)
     add_compile_definitions(${NAME} PRIVATE UNDREAMAI_EXPORTS)
     target_include_directories(${NAME} PRIVATE "${CMAKE_SOURCE_DIR}/include")
@@ -58,8 +97,9 @@ function(LLAMALIB_COMPILE_DEFS NAME)
         target_compile_definitions(${NAME} PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
         target_link_libraries(${NAME} PRIVATE cpp-httplib OpenSSL::SSL OpenSSL::Crypto)
     endif()
-    if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+    if(ARCHITECTURE MATCHES "android" AND ARCHITECTURE MATCHES "vulkan")
         target_link_options(${NAME} PRIVATE "-Wl,-z,max-page-size=16384")
+        target_link_libraries(${NAME} PRIVATE "${Vulkan_LIBRARY}")
     endif()
 endfunction()
 

third_party/CMakeLists.txt

@@ -141,49 +141,6 @@ add_custom_target(generate_assets ALL DEPENDS ${GENERATED_HEADERS})
 
 ################################################ BUILD ################################################
 
-if(ARCHITECTURE MATCHES "android")
-    # Derive triple from ANDROID_ABI
-    if(ANDROID_ABI STREQUAL "arm64-v8a")
-        set(ANDROID_ARCH_TRIPLE "aarch64-linux-android")
-    elseif(ANDROID_ABI STREQUAL "armeabi-v7a")
-        set(ANDROID_ARCH_TRIPLE "arm-linux-androideabi")
-    elseif(ANDROID_ABI STREQUAL "x86_64")
-        set(ANDROID_ARCH_TRIPLE "x86_64-linux-android")
-    elseif(ANDROID_ABI STREQUAL "x86")
-        set(ANDROID_ARCH_TRIPLE "i686-linux-android")
-    else()
-        message(FATAL_ERROR "Unknown ANDROID_ABI: ${ANDROID_ABI}")
-    endif()
-
-    message(STATUS "ANDROID_ABI=${ANDROID_ABI}")
-    message(STATUS "ANDROID_ARCH_TRIPLE=${ANDROID_ARCH_TRIPLE}")
-    message(STATUS "CMAKE_SYSROOT=${CMAKE_SYSROOT}")
-
-    if(ARCHITECTURE MATCHES "vulkan")
-        set(_VULKAN_LIB "${CMAKE_SYSROOT}/usr/lib/${ANDROID_ARCH_TRIPLE}/26/libvulkan.so")
-        message(STATUS "Vulkan_LIBRARY=${_VULKAN_LIB}")
-
-        if(NOT EXISTS "${_VULKAN_LIB}")
-            message(FATAL_ERROR "Vulkan stub not found at: ${_VULKAN_LIB}")
-        endif()
-
-        set(Vulkan_LIBRARY "${_VULKAN_LIB}")
-        set(Vulkan_LIBRARY "${_VULKAN_LIB}" CACHE FILEPATH "" FORCE)
-        set(Vulkan_FOUND TRUE)
-        set(Vulkan_FOUND TRUE CACHE BOOL "" FORCE)
-        set(Vulkan_VERSION "1.3.275")
-        set(Vulkan_VERSION "1.3.275" CACHE STRING "" FORCE)
-        set(Vulkan_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/third_party/Vulkan-Headers/include")
-        set(Vulkan_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/third_party/Vulkan-Headers/include" CACHE PATH "" FORCE)
-
-        find_program(Vulkan_GLSLC_EXECUTABLE
-            NAMES glslc
-            PATHS "/usr/bin" "/usr/local/bin"
-            NO_CMAKE_SYSTEM_PATH)
-        set(Vulkan_GLSLC_EXECUTABLE "${Vulkan_GLSLC_EXECUTABLE}" CACHE FILEPATH "" FORCE)
-    endif()
-endif()
-
 execute_process(
     COMMAND git rev-list --count HEAD
     WORKING_DIRECTORY ${LLAMA_CPP_ROOT}
@@ -217,6 +174,7 @@ endif()
 
 if(ARCHITECTURE MATCHES "android")
     if (TARGET ggml-vulkan)
-        target_include_directories(ggml-vulkan PRIVATE ${CMAKE_SOURCE_DIR}/third_party/Vulkan-Headers/include)
+        target_include_directories(ggml-vulkan PRIVATE ${Vulkan_INCLUDE_DIR})
+        target_link_libraries(ggml-vulkan PRIVATE "${Vulkan_LIBRARY}")
     endif()
 endif()