Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…ng 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
  • Loading branch information
MaggotHATE committed Aug 10, 2024
1 parent 83763e6 commit ce251c4
Show file tree
Hide file tree
Showing 25 changed files with 154,169 additions and 153,949 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ ifdef VK_VALID
CXXFLAGS_VK += -DGGML_VULKAN_VALIDATE
endif # VK_VALID

ifdef VK_PERF
CXXFLAGS_VK += -DGGML_VULKAN_PERF
endif

##---------------------------------------------------------------------
## BUILD RULES
##---------------------------------------------------------------------
Expand Down Expand Up @@ -806,6 +810,9 @@ chat_cl: $(EXE_CL)_mini
chat_vk: $(EXE_VK)_mini
@echo Build $(EXE_VK)_mini complete for $(ECHO_MESSAGE)

chats: $(EXE)_mini $(EXE_CL)_mini $(EXE_VK)_mini
@echo Build complete for $(ECHO_MESSAGE)

demo: $(EXE)
@echo Build $(EXE) complete for $(ECHO_MESSAGE)

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

chatTests: chatTest chatTest_cl chatTest_vk
@echo Build chatTest chatTest_cl complete for $(ECHO_MESSAGE)

all: $(EXE)_mini $(EXE_CL)_mini chatTest chatTest_cl chatTest_vk
@echo Build $(EXE)_mini $(EXE_CL)_mini chatTest chatTest_cl chatTest_vk complete for $(ECHO_MESSAGE)

Expand Down
305,475 changes: 152,862 additions & 152,613 deletions base/ggml/ggml-vulkan-shaders.cpp

Large diffs are not rendered by default.

Loading

0 comments on commit ce251c4

Please sign in to comment.