Skip to content

Commit ce251c4

Browse files
committed
Added ggml-org/llama.cpp#8959 and ggml-org/llama.cpp#8943 for testing and more
* fixed default sampling queue to include p_step * changed sampling queue display to better reflect the actual logic * added VK-specific settings `use_mmap_vk`, `flash_attn_vk`, `no_kv_offload_vk` * added new presets for testing
1 parent 83763e6 commit ce251c4

25 files changed

+154169
-153949
lines changed

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,10 @@ ifdef VK_VALID
351351
CXXFLAGS_VK += -DGGML_VULKAN_VALIDATE
352352
endif # VK_VALID
353353

354+
ifdef VK_PERF
355+
CXXFLAGS_VK += -DGGML_VULKAN_PERF
356+
endif
357+
354358
##---------------------------------------------------------------------
355359
## BUILD RULES
356360
##---------------------------------------------------------------------
@@ -806,6 +810,9 @@ chat_cl: $(EXE_CL)_mini
806810
chat_vk: $(EXE_VK)_mini
807811
@echo Build $(EXE_VK)_mini complete for $(ECHO_MESSAGE)
808812

813+
chats: $(EXE)_mini $(EXE_CL)_mini $(EXE_VK)_mini
814+
@echo Build complete for $(ECHO_MESSAGE)
815+
809816
demo: $(EXE)
810817
@echo Build $(EXE) complete for $(ECHO_MESSAGE)
811818

@@ -842,6 +849,9 @@ demos: $(EXE)_mini $(EXE_CL)_mini $(EXE_VK)_mini
842849
tests: chatTest chatTest_cl chatTest_vk
843850
@echo Build chatTest chatTest_cl complete for $(ECHO_MESSAGE)
844851

852+
chatTests: chatTest chatTest_cl chatTest_vk
853+
@echo Build chatTest chatTest_cl complete for $(ECHO_MESSAGE)
854+
845855
all: $(EXE)_mini $(EXE_CL)_mini chatTest chatTest_cl chatTest_vk
846856
@echo Build $(EXE)_mini $(EXE_CL)_mini chatTest chatTest_cl chatTest_vk complete for $(ECHO_MESSAGE)
847857

base/ggml/ggml-vulkan-shaders.cpp

Lines changed: 152862 additions & 152613 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)