rename ggml-vulkan -> ggml-kompute

This commit is contained in:
Jared Van Bortel 2023-12-13 17:10:32 -05:00
parent 56430c3209
commit 3e09e127eb
5 changed files with 8 additions and 8 deletions

View File

@ -510,15 +510,15 @@ if (LLAMA_KOMPUTE)
# Create a custom command that depends on the generated_shaders
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan.stamp
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan.stamp
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp
DEPENDS generated_shaders
COMMENT "Ensuring shaders are generated before compiling ggml-vulkan.cpp"
COMMENT "Ensuring shaders are generated before compiling ggml-kompute.cpp"
)
# Add the stamp to the main sources to ensure dependency tracking
set(GGML_SOURCES_KOMPUTE ggml-vulkan.cpp ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan.stamp)
set(GGML_HEADERS_KOMPUTE ggml-vulkan.h ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan.stamp)
set(GGML_SOURCES_KOMPUTE ggml-kompute.cpp ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp)
set(GGML_HEADERS_KOMPUTE ggml-kompute.h ${CMAKE_CURRENT_BINARY_DIR}/ggml-kompute.stamp)
add_compile_definitions(GGML_USE_KOMPUTE)
set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} kompute)
set(LLAMA_EXTRA_INCLUDES ${LLAMA_EXTRA_INCLUDES} ${CMAKE_BINARY_DIR})

View File

@ -32,7 +32,7 @@
#endif
#if defined(GGML_USE_KOMPUTE)
#include "ggml-vulkan.h"
#include "ggml-kompute.h"
#endif
static llama_context ** g_ctx;

View File

@ -1,4 +1,4 @@
#include "ggml-vulkan.h"
#include "ggml-kompute.h"
#include "ggml.h"
// These are generated at build time by cmake custom command

View File

@ -12,7 +12,7 @@
#elif defined(GGML_USE_CLBLAST)
# include "ggml-opencl.h"
#elif defined(GGML_USE_KOMPUTE)
# include "ggml-vulkan.h"
# include "ggml-kompute.h"
#endif
#ifdef GGML_USE_METAL