Replace shaderc dependency with precompiled shaders

Fix python script to generate shaders
0cc4m · Oct 14, 2023 · de4b813 · de4b813
1 parent 73d01d1
commit de4b813
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 1,049 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -375,14 +375,12 @@ if (LLAMA_CLBLAST)
 endif()
 
 if (LLAMA_VULKAN)
-    find_package(Vulkan COMPONENTS shaderc_combined)
-    find_package(glslang)
-    find_package(SPIRV-Tools-opt)
+    find_package(Vulkan)
     if (Vulkan_FOUND)
         message(STATUS "Vulkan found")
 
         add_library(ggml-vulkan STATIC ggml-vulkan.cpp ggml-vulkan.h)
-        target_link_libraries(ggml-vulkan PUBLIC Vulkan::Vulkan Vulkan::shaderc_combined)
+        target_link_libraries(ggml-vulkan PUBLIC Vulkan::Vulkan)
 
         add_compile_definitions(GGML_USE_VULKAN)
 

diff --git a/Makefile b/Makefile
@@ -430,7 +430,7 @@ endif # LLAMA_CLBLAST
 ifdef LLAMA_VULKAN
 	CFLAGS  += -DGGML_USE_VULKAN
 	CXXFLAGS  += -DGGML_USE_VULKAN
-	LDFLAGS += -lvulkan -lopenblas -lglslang -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lshaderc_combined
+	LDFLAGS += -lvulkan
 	OBJS    += ggml-vulkan.o
 ggml-vulkan.o: ggml-vulkan.cpp ggml-vulkan.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@