Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	examples/embedding/embedding.cpp
#	examples/infill/infill.cpp
#	examples/perplexity/perplexity.cpp
#	flake.lock
#	src/llama-sampling.cpp

...

This commit is contained in:

Concedo 2024-09-11 20:27:53 +08:00

parent 7bdac9bc44 d2b496bff4

commit 13394368b6

13 changed files with 100102 additions and 100106 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

199066

ggml/src/ggml-vulkan-shaders.cpp

View file

File diff suppressed because it is too large Load diff