Commit 12dfb92

committed

Merge commit 'd62e4aaa02540c89be8b59426340b909d02bbc9e' into concedo_experimental

# Conflicts: # .github/workflows/docker.yml # .github/workflows/server.yml # CMakeLists.txt # Makefile # common/common.cpp # ggml.c # tests/test-backend-ops.cpp # tests/test-grammar-integration.cpp

2 parents 12abc41 + d62e4aa commit 12dfb92Copy full SHA for 12dfb92

33 files changed

+23457

-22885

lines changed

.editorconfig
common
- common.cpp
- common.h
convert-hf-to-gguf.py
examples
- cvector-generator
- embedding
  - README.md
  - embedding.cpp
- quantize
  - quantize.cpp
- server/public
  - index-new.html
ggml-cuda
ggml-vulkan-shaders.hpp
ggml-vulkan.cpp
ggml.c
ggml.h
gguf-py
- gguf
- scripts
  - gguf-dump.py
llama.cpp
llama.h
sgemm.cpp
sgemm.h
vulkan-shaders

33 files changed

+23457

-22885

lines changed

`‎.editorconfig`

-Original file line number
+Diff line change
 indent_style = tab
 [examples/cvector-generator/*.txt]
 +trim_trailing_whitespace = unset
 insert_final_newline = unset

Comments

(0)