Merge branch 'upstream' into concedo_experimental

Browse source

Renable qwen2vl GPU for vulkan https://github.com/ggml-org/llama.cpp/pull/11902

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/docker.yml
#	.gitignore
#	CONTRIBUTING.md
#	Makefile
#	common/CMakeLists.txt
#	common/arg.cpp
#	common/common.cpp
#	examples/main/main.cpp
#	examples/run/run.cpp
#	examples/server/tests/README.md
#	ggml/src/ggml-cuda/mma.cuh
#	scripts/get_chat_template.py
#	tests/test-backend-ops.cpp
#	tests/test-chat-template.cpp
#	tests/test-chat.cpp

...

This commit is contained in:

Concedo 2025-02-20 23:17:20 +08:00

parent 41350df81f d04e7163c8

commit 6d7ef10671

42 changed files with 8897 additions and 3215 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

639

ggml/src/ggml-vulkan/ggml-vulkan.cpp

View file

File diff suppressed because it is too large Load diff