Merge branch 'upstream' into concedo_experimental

Browse Source

# Conflicts:
#	CMakePresets.json
#	ggml/src/ggml-cuda/CMakeLists.txt
#	tests/test-sampling.cpp
#	tools/mtmd/clip.cpp

...

This commit is contained in:

Concedo

2025-05-07 19:47:44 +08:00

parent 4e97b69657 141a908a59

commit 38b3bffcef

3 changed files with 1369 additions and 1316 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

tools/mtmd/clip.cpp

+1341 -1309

File diff suppressed because it is too large Load Diff