Concedo
|
b08dca65ed
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# common/CMakeLists.txt
# common/arg.cpp
# common/chat.cpp
# examples/parallel/README.md
# examples/parallel/parallel.cpp
# ggml/cmake/common.cmake
# ggml/src/CMakeLists.txt
# ggml/src/ggml-cpu/CMakeLists.txt
# ggml/src/ggml-sycl/ggml-sycl.cpp
# ggml/src/ggml-sycl/rope.cpp
# models/ggml-vocab-bert-bge.gguf.inp
# models/ggml-vocab-bert-bge.gguf.out
# models/ggml-vocab-command-r.gguf.inp
# models/ggml-vocab-command-r.gguf.out
# models/ggml-vocab-deepseek-coder.gguf.inp
# models/ggml-vocab-deepseek-coder.gguf.out
# models/ggml-vocab-deepseek-llm.gguf.inp
# models/ggml-vocab-deepseek-llm.gguf.out
# models/ggml-vocab-falcon.gguf.inp
# models/ggml-vocab-falcon.gguf.out
# models/ggml-vocab-gpt-2.gguf.inp
# models/ggml-vocab-gpt-2.gguf.out
# models/ggml-vocab-llama-bpe.gguf.inp
# models/ggml-vocab-llama-bpe.gguf.out
# models/ggml-vocab-llama-spm.gguf.inp
# models/ggml-vocab-llama-spm.gguf.out
# models/ggml-vocab-mpt.gguf.inp
# models/ggml-vocab-mpt.gguf.out
# models/ggml-vocab-phi-3.gguf.inp
# models/ggml-vocab-phi-3.gguf.out
# models/ggml-vocab-qwen2.gguf.inp
# models/ggml-vocab-qwen2.gguf.out
# models/ggml-vocab-refact.gguf.inp
# models/ggml-vocab-refact.gguf.out
# models/ggml-vocab-starcoder.gguf.inp
# models/ggml-vocab-starcoder.gguf.out
# requirements/requirements-gguf_editor_gui.txt
# tests/CMakeLists.txt
# tests/test-chat.cpp
# tests/test-grammar-integration.cpp
# tests/test-json-schema-to-grammar.cpp
# tools/mtmd/CMakeLists.txt
# tools/run/run.cpp
# tools/server/CMakeLists.txt
|
2025-05-31 13:04:21 +08:00 |
|
Concedo
|
8acec907bb
|
revert sbti image write
|
2025-04-10 10:43:24 +08:00 |
|
Concedo
|
fea3b2bd4a
|
updated sdcpp prepare for inpaint
fixed img2img (+1 squashed commits)
Squashed commits:
[42c48f14] try update sdcpp, feels kind of buggy
|
2025-04-09 20:26:10 +08:00 |
|
Concedo
|
f32a874966
|
resync and updated sdcpp for flux and sd3 support
|
2024-11-03 22:03:16 +08:00 |
|
Concedo
|
12fd16bfd4
|
Merge commit 'df270ef745' into concedo_experimental
# Conflicts:
# Makefile
# common/CMakeLists.txt
# common/common.h
# common/sampling.cpp
# common/sampling.h
# examples/infill/infill.cpp
# examples/llama-bench/llama-bench.cpp
# examples/quantize-stats/quantize-stats.cpp
# examples/server/server.cpp
# include/llama.h
# src/llama-sampling.cpp
# src/llama-sampling.h
# src/llama.cpp
# tests/test-grammar-integration.cpp
# tests/test-grammar-parser.cpp
# tests/test-json-schema-to-grammar.cpp
# tests/test-llama-grammar.cpp
# tests/test-sampling.cpp
|
2024-09-09 17:10:08 +08:00 |
|
Concedo
|
9c7340bfac
|
downgrade stb image resize
|
2024-06-02 18:02:22 +08:00 |
|
Concedo
|
5c323a0661
|
fixed img2img for different sizes
|
2024-04-08 23:29:46 +08:00 |
|
Concedo
|
c08d7e5042
|
wip integration of llava
|
2024-03-10 11:18:47 +08:00 |
|
Concedo
|
26696970ce
|
initial files from sdcpp (not working)
|
2024-02-28 15:45:13 +08:00 |
|