pre-compiled vulkan shaders

Author: l3utterfly

common/common.cpp

@@ -1012,6 +1012,9 @@ struct llama_model_params common_model_params_to_llama(common_params & params) {
     auto mparams = llama_model_default_params();
 
     if (!params.devices.empty()) {
+        // add nullptr to the end just in case
+        params.devices.push_back(nullptr);
+
         mparams.devices = params.devices.data();
     }
     if (params.n_gpu_layers != -1) {

ggml/src/ggml-vulkan/CMakeLists.txt

@@ -1,13 +1,31 @@
 find_package(Vulkan COMPONENTS glslc REQUIRED)
 
 if (Vulkan_FOUND)
+    if(CMAKE_CROSSCOMPILING)
+        if(DEFINED ENV{VULKAN_SDK})
+            set(Vulkan_GLSLC_EXECUTABLE "$ENV{VULKAN_SDK}/Bin/glslc.exe")
+        else()
+            message(FATAL_ERROR "VULKAN_SDK environment variable not set")
+        endif()
+    endif()
+
     message(STATUS "Vulkan found")
 
     ggml_add_backend_library(ggml-vulkan
                              ggml-vulkan.cpp
                              ../../include/ggml-vulkan.h
                             )
 
+    # Add NDK Vulkan includes for Android
+    if(ANDROID)
+        target_include_directories(ggml-vulkan PRIVATE
+                $ENV{VULKAN_SDK}/Include
+        )
+        target_compile_definitions(ggml-vulkan PRIVATE
+                VK_USE_PLATFORM_ANDROID_KHR
+        )
+    endif()
+
     # Compile a test shader to determine whether GL_NV_cooperative_matrix2 is supported.
     # If it's not, there will be an error to stderr.
     # If it's supported, set a define to indicate that we should compile those shaders
@@ -59,34 +77,37 @@ if (Vulkan_FOUND)
         add_compile_definitions(GGML_VULKAN_RUN_TESTS)
     endif()
 
-    add_subdirectory(vulkan-shaders)
+    if(NOT CMAKE_CROSSCOMPILING)
+        add_subdirectory(vulkan-shaders)
 
-    set (_ggml_vk_genshaders_cmd vulkan-shaders-gen)
-    set (_ggml_vk_header     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
-    set (_ggml_vk_source     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp)
-    set (_ggml_vk_input_dir  ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
-    set (_ggml_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
+        set (_ggml_vk_genshaders_cmd "${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders-gen.exe")
+        set (_ggml_vk_header     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
+        set (_ggml_vk_source     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp)
+        set (_ggml_vk_input_dir  ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
+        set (_ggml_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
 
-    file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")
+        file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")
 
-    add_custom_command(
-        OUTPUT ${_ggml_vk_header}
+        add_custom_command(
+                OUTPUT ${_ggml_vk_header}
                 ${_ggml_vk_source}
 
-        COMMAND ${_ggml_vk_genshaders_cmd}
-            --glslc      ${Vulkan_GLSLC_EXECUTABLE}
-            --input-dir  ${_ggml_vk_input_dir}
-            --output-dir ${_ggml_vk_output_dir}
-            --target-hpp ${_ggml_vk_header}
-            --target-cpp ${_ggml_vk_source}
-            --no-clean
-
-        DEPENDS ${_ggml_vk_shader_deps} ${_ggml_vk_genshaders_cmd}
-        COMMENT "Generate vulkan shaders"
-    )
-
-    target_sources(ggml-vulkan PRIVATE ${_ggml_vk_source} ${_ggml_vk_header})
-
+                COMMAND ${_ggml_vk_genshaders_cmd}
+                --glslc      ${Vulkan_GLSLC_EXECUTABLE}
+                --input-dir  ${_ggml_vk_input_dir}
+                --output-dir ${_ggml_vk_output_dir}
+                --target-hpp ${_ggml_vk_header}
+                --target-cpp ${_ggml_vk_source}
+                --no-clean
+
+                DEPENDS ${_ggml_vk_shader_deps} ${_ggml_vk_genshaders_cmd}
+                COMMENT "Generate vulkan shaders"
+        )
+
+        target_sources(ggml-vulkan PRIVATE ${_ggml_vk_source} ${_ggml_vk_header})
+    else ()
+        target_sources(ggml-vulkan PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ggml-vulkan-shaders.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ggml-vulkan-shaders.hpp)
+    endif ()
 else()
     message(WARNING "Vulkan not found")
 endif()