Merge branch 'upstream' into concedo_experimental

Browse Source

# Conflicts:
#	.github/workflows/build.yml
#	CMakeLists.txt
#	cmake/common.cmake
#	docs/backend/SYCL.md
#	examples/main/README.md
#	examples/speculative/speculative.cpp
#	ggml/CMakeLists.txt
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-cpu/CMakeLists.txt
#	ggml/src/ggml-musa/CMakeLists.txt
#	ggml/src/ggml-sycl/CMakeLists.txt
#	ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt
#	tests/test-backend-ops.cpp

...

This commit is contained in:

Concedo

2025-03-19 19:27:11 +08:00

parent ddaa8d5a38 0fd8487b14

commit 0c90d2ebcf

58 changed files with 4222 additions and 1537 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

src/llama-model.cpp

+1011 -285

File diff suppressed because it is too large Load Diff