From 3e09e127ebba12d175d180d65e6c1da165e8424f Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Wed, 13 Dec 2023 17:10:32 -0500 Subject: [PATCH] rename ggml-vulkan -> ggml-kompute --- CMakeLists.txt | 10 +++++----- examples/main/main.cpp | 2 +- ggml-vulkan.cpp => ggml-kompute.cpp | 2 +- ggml-vulkan.h => ggml-kompute.h | 0 llama.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename ggml-vulkan.cpp => ggml-kompute.cpp (99%) rename ggml-vulkan.h => ggml-kompute.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76f489691..0e9183625 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/examples/main/main.cpp b/examples/main/main.cpp index afcb566c4..31cc07434 100644 --- a/examples/main/main.cpp +++ b/examples/main/main.cpp @@ -32,7 +32,7 @@ #endif #if defined(GGML_USE_KOMPUTE) -#include "ggml-vulkan.h" +#include "ggml-kompute.h" #endif static llama_context ** g_ctx; diff --git a/ggml-vulkan.cpp b/ggml-kompute.cpp similarity index 99% rename from ggml-vulkan.cpp rename to ggml-kompute.cpp index 1abf1e699..df8bcca3d 100644 --- a/ggml-vulkan.cpp +++ b/ggml-kompute.cpp @@ -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 diff --git a/ggml-vulkan.h b/ggml-kompute.h similarity index 100% rename from ggml-vulkan.h rename to ggml-kompute.h diff --git a/llama.cpp b/llama.cpp index f7991b275..97a688f4b 100644 --- a/llama.cpp +++ b/llama.cpp @@ -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