1c3cbac085
Merge commit 'ae9afff8d2c012ca760eb9c2adf41961cf6f6232' into concedo_experimental
...
# Conflicts:
# .github/workflows/build-openvino.yml
# .github/workflows/build-self-hosted.yml
# .github/workflows/build-vulkan.yml
# .github/workflows/build-wasm.yml
# .github/workflows/build-webgpu.yml
# .github/workflows/server-sanitize.yml
# CMakeLists.txt
# ci/run.sh
# common/CMakeLists.txt
# docs/backend/snapdragon/README.md
# docs/backend/snapdragon/developer.md
# docs/build.md
# examples/speculative-simple/speculative-simple.cpp
# ggml/src/ggml-cpu/CMakeLists.txt
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp-opnode.h
# ggml/src/ggml-hexagon/htp/act-ops.c
# ggml/src/ggml-hexagon/htp/allreduce-ops.c
# ggml/src/ggml-hexagon/htp/allreduce-ops.h
# ggml/src/ggml-hexagon/htp/argsort-ops.c
# ggml/src/ggml-hexagon/htp/binary-ops.c
# ggml/src/ggml-hexagon/htp/concat-ops.c
# ggml/src/ggml-hexagon/htp/cpy-ops.c
# ggml/src/ggml-hexagon/htp/cumsum-ops.c
# ggml/src/ggml-hexagon/htp/diag-ops.c
# ggml/src/ggml-hexagon/htp/fill-ops.c
# ggml/src/ggml-hexagon/htp/flash-attn-ops.c
# ggml/src/ggml-hexagon/htp/flash-attn-ops.h
# ggml/src/ggml-hexagon/htp/gated-delta-net-ops.c
# ggml/src/ggml-hexagon/htp/get-rows-ops.c
# ggml/src/ggml-hexagon/htp/hex-common.h
# ggml/src/ggml-hexagon/htp/hex-utils.h
# ggml/src/ggml-hexagon/htp/hmx-utils.h
# ggml/src/ggml-hexagon/htp/htp-ctx.h
# ggml/src/ggml-hexagon/htp/htp-ops.h
# ggml/src/ggml-hexagon/htp/htp-tensor.c
# ggml/src/ggml-hexagon/htp/htp-tensor.h
# ggml/src/ggml-hexagon/htp/hvx-arith.h
# ggml/src/ggml-hexagon/htp/hvx-div.h
# ggml/src/ggml-hexagon/htp/hvx-inverse.h
# ggml/src/ggml-hexagon/htp/hvx-scale.h
# ggml/src/ggml-hexagon/htp/hvx-sigmoid.h
# ggml/src/ggml-hexagon/htp/im2col-ops.c
# ggml/src/ggml-hexagon/htp/main.c
# ggml/src/ggml-hexagon/htp/matmul-ops.c
# ggml/src/ggml-hexagon/htp/pad-ops.c
# ggml/src/ggml-hexagon/htp/repeat-ops.c
# ggml/src/ggml-hexagon/htp/rope-ops.c
# ggml/src/ggml-hexagon/htp/set-rows-ops.c
# ggml/src/ggml-hexagon/htp/softmax-ops.c
# ggml/src/ggml-hexagon/htp/solve-tri-ops.c
# ggml/src/ggml-hexagon/htp/ssm-conv.c
# ggml/src/ggml-hexagon/htp/sum-rows-ops.c
# ggml/src/ggml-hexagon/htp/unary-ops.c
# ggml/src/ggml-metal/CMakeLists.txt
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-rpc/CMakeLists.txt
# ggml/src/ggml-sycl/ggml-sycl.cpp
# ggml/src/ggml-webgpu/CMakeLists.txt
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# scripts/snapdragon/run.py
# scripts/sync_vendor.py
# scripts/ui-assets.cmake
# src/CMakeLists.txt
# src/models/gemma4.cpp
# tests/.gitignore
# tests/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-jinja.cpp
# tests/test-llama-archs.cpp
# tests/test-quantize-fns.cpp
# tests/test-save-load-state.cpp
# tools/mtmd/CMakeLists.txt
# tools/server/CMakeLists.txt
2026-09-13 23:53:41 +08:00
718f7b4175
vendor : update cpp-httplib to 0.56.0 ( #28787 )
2026-09-12 10:15:08 +03:00
ccaed41be0
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .github/workflows/build-openvino.yml
# .github/workflows/server-sanitize.yml
# AUTHORS
# README.md
# app/llama.cpp
# ci/run.sh
# common/build-info.h
# docs/backend/SYCL.md
# docs/build.md
# docs/ops.md
# ggml/CMakeLists.txt
# ggml/src/ggml-cuda/CMakeLists.txt
# ggml/src/ggml-musa/CMakeLists.txt
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/cvt.cl
# ggml/src/ggml-opencl/kernels/gemm_noshuffle_q4_k_f32.cl
# ggml/src/ggml-opencl/kernels/gemm_noshuffle_q6_k_f32.cl
# ggml/src/ggml-opencl/kernels/gemv_noshuffle_q4_0_f32.cl
# ggml/src/ggml-opencl/kernels/gemv_noshuffle_q4_1_f32.cl
# ggml/src/ggml-opencl/kernels/gemv_noshuffle_q4_k_f32.cl
# ggml/src/ggml-opencl/kernels/gemv_noshuffle_q5_k_f32.cl
# ggml/src/ggml-opencl/kernels/gemv_noshuffle_q6_k_f32.cl
# ggml/src/ggml-opencl/kernels/gemv_noshuffle_q8_0_f32.cl
# ggml/src/ggml-opencl/kernels/mul_mm_f32_f32_l4_lm.cl
# ggml/src/ggml-opencl/kernels/rms_norm.cl
# ggml/src/ggml-sycl/binbcast.cpp
# ggml/src/ggml-sycl/binbcast.hpp
# ggml/src/ggml-sycl/common.hpp
# ggml/src/ggml-sycl/fattn.cpp
# ggml/src/ggml-sycl/fusion.cpp
# ggml/src/ggml-sycl/ggml-sycl.cpp
# ggml/src/ggml-sycl/norm.cpp
# ggml/src/ggml-sycl/norm.hpp
# scripts/snapdragon/build.py
# scripts/snapdragon/qdc/run_qdc_jobs.py
# scripts/snapdragon/qdc/tests/linux/run_linux.sh
# scripts/snapdragon/qdc/tests/run_backend_ops_posix.py
# scripts/snapdragon/qdc/tests/run_bench_tests_posix.py
# scripts/snapdragon/qdc/tests/utils.py
# scripts/snapdragon/run.py
# src/CMakeLists.txt
# src/llama.cpp
# tests/test-backend-ops.cpp
# tests/test-json-schema-to-grammar.cpp
2026-09-04 16:59:17 +08:00
38521ec33f
vendor: update BoringSSL to 0.20260903.0 ( #28354 )
2026-09-04 10:10:26 +03:00
c22d6e5c35
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# ggml/src/ggml-cann/aclnn_ops.cpp
# ggml/src/ggml-cann/aclnn_ops.h
# ggml/src/ggml-cann/ggml-cann.cpp
# ggml/src/ggml-et/et-kernels/src/glu_f32.c
# ggml/src/ggml-et/ggml-et-cpu-compare.cpp
# ggml/src/ggml-et/ggml-et-ops.cpp
# ggml/src/ggml-et/ggml-et.cpp
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp/act-ops.c
# ggml/src/ggml-hexagon/htp/cpy-ops.c
# ggml/src/ggml-hexagon/htp/htp-ops.h
# ggml/src/ggml-hexagon/htp/main.c
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/glu.cl
# ggml/src/ggml-openvino/openvino/op/glu_swiglu.cpp
# ggml/src/ggml-openvino/openvino/op_table.cpp
# ggml/src/ggml-openvino/openvino/op_table.h
# ggml/src/ggml-rpc/CMakeLists.txt
# ggml/src/ggml-sycl/element_wise.cpp
# ggml/src/ggml-sycl/element_wise.hpp
# ggml/src/ggml-sycl/ggml-sycl.cpp
# ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# ggml/src/ggml-webgpu/wgsl-shaders/glu.wgsl
# scripts/sync_vendor.py
# tests/test-backend-ops.cpp
# tools/cli/README.md
# tools/completion/README.md
# tools/llama-bench/README.md
# tools/llama-bench/llama-bench.cpp
# tools/rpc/CMakeLists.txt
# tools/server/README.md
2026-08-31 18:39:16 +08:00
dc7aecf70d
vendor : update cpp-httplib to 0.54.0 ( #27919 )
...
* vendor : update cpp-httplib to 0.54.0
* vendor : update cpp-httplib to 0.54.0 and 0.54.1
2026-08-30 09:01:51 +03:00
4447017602
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .github/actions/ccache-clear/action.yml
# .github/workflows/build-apple.yml
# .github/workflows/build-cpu.yml
# .github/workflows/build-cuda-ubuntu.yml
# .github/workflows/build-opencl.yml
# .github/workflows/build-openvino.yml
# .github/workflows/build-sycl.yml
# .github/workflows/build-vulkan.yml
# .github/workflows/build-wasm.yml
# .github/workflows/build-webgpu.yml
# .github/workflows/hip-quality-check.yml
# .github/workflows/server.yml
# CONTRIBUTING.md
# README.md
# ci/run.sh
# common/CMakeLists.txt
# common/chat.cpp
# docs/autoparser.md
# ggml/src/ggml-webgpu/wgsl-shaders/flash_attn.wgsl
# ggml/src/ggml-webgpu/wgsl-shaders/flash_attn_tile.wgsl
# ggml/src/ggml-webgpu/wgsl-shaders/flash_attn_vec_split.wgsl
# scripts/sync_vendor.py
# tests/CMakeLists.txt
# tests/peg-parser/test-json-serialization.cpp
# tests/peg-parser/tests.h
# tests/test-chat-auto-parser.cpp
# tests/test-chat-peg-parser.cpp
# tests/test-chat-template.cpp
# tests/test-chat.cpp
# tests/test-grammar-integration.cpp
# tests/test-jinja.cpp
# tests/test-json-schema-to-grammar.cpp
# tests/test-llama-archs.cpp
# tests/test-model-resolution.cpp
# tests/test-recurrent-state-rollback.cpp
# tools/CMakeLists.txt
2026-08-25 20:44:34 +08:00
6657ded4fa
vendor : update subprocess.h ( #27409 )
2026-08-23 10:38:29 +03:00
8c732ca2cc
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .devops/openvino.Dockerfile
# .github/actions/windows-setup-cuda/action.yml
# .github/workflows/build-cache.yml
# .github/workflows/build-cpu.yml
# .github/workflows/build-cuda-windows.yml
# .github/workflows/build-openvino.yml
# .github/workflows/build-self-hosted.yml
# .github/workflows/build-vulkan.yml
# .github/workflows/docker.yml
# .github/workflows/make-release.yml
# .github/workflows/release.yml
# AUTHORS
# CMakeLists.txt
# README.md
# build-xcframework.sh
# ci/run.sh
# common/CMakeLists.txt
# docs/backend/OPENVINO.md
# examples/gguf-hash/CMakeLists.txt
# examples/gguf-hash/gguf-hash.cpp
# ggml/CMakeLists.txt
# ggml/src/ggml-cann/ggml-cann.cpp
# ggml/src/ggml-et/ggml-et.cpp
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp/flash-attn-ops.c
# ggml/src/ggml-hexagon/htp/flash-attn-ops.h
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/flash_attn_f16.cl
# ggml/src/ggml-opencl/kernels/flash_attn_f32.cl
# ggml/src/ggml-opencl/kernels/moe_sort_by_expert.cl
# ggml/src/ggml-openvino/ggml-openvino.cpp
# ggml/src/ggml-sycl/ggml-sycl.cpp
# ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# ggml/src/ggml-webgpu/wgsl-shaders/common_decls.tmpl
# ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_decls.tmpl
# ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_reg_tile.wgsl
# ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_subgroup_matrix.wgsl
# ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_vec.wgsl
# ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_vec_acc.tmpl
# scripts/sync-ggml.last
# tests/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-llama-archs.cpp
# tools/mtmd/CMakeLists.txt
# tools/mtmd/mtmd-helper.cpp
# tools/perplexity/perplexity.cpp
# tools/server/README.md
# tools/ui/src/lib/hooks/use-tools-panel.svelte.ts
# vendor/hash/CMakeLists.txt
2026-08-21 23:27:27 +08:00
d42dc9b943
try fix cmake
2026-08-21 12:57:22 +08:00
fc84597f96
Merge commit '533b18257b7da879a5de39f5d6437041e0e42c39' into concedo_experimental
...
# Conflicts:
# CMakeLists.txt
# examples/gguf-hash/CMakeLists.txt
# examples/gguf-hash/gguf-hash.cpp
# scripts/sync_vendor.py
# tools/mtmd/CMakeLists.txt
# vendor/hash/rotate-bits/rotate-bits.h
# vendor/hash/sha1/sha1.c
# vendor/hash/sha1/sha1.h
# vendor/hash/sha256/sha256.c
# vendor/hash/sha256/sha256.h
# vendor/hash/xxhash/xxhash.c
# vendor/hash/xxhash/xxhash.h
2026-08-20 18:42:18 +08:00
27e345b574
build : fix xcframework + cmake clean-up ( #27304 )
...
* xcframework : fix build
* mtmd : remove unused include path
* vendor : use vendor::hash alias target in cmake
CMake reserves "::" in target names for imported/alias targets, so the real
target keeps the name vendor-hash and a vendor::hash ALIAS target is added.
Consumers (mtmd, llama-gguf-hash) now link against the namespaced alias.
Assisted-by: pi:llama.cpp/Qwen3.8-27B
* vendor : add cmake targets for all vendored libs with vendor:: aliases
Add INTERFACE targets for the header-only vendor libs (miniaudio, nlohmann,
sheredom, stb) and ALIAS targets named vendor::<lib> for all of them,
including cpp-httplib and hash. Each exposes the vendor/ root so includes
are namespaced, e.g. <nlohmann/json.hpp>.
Consolidate the per-lib add_subdirectory calls into a single
add_subdirectory(vendor), keeping the cpp-httplib gate on LLAMA_BUILD_COMMON.
Consumers (llama-common, mtmd) now link the aliases instead of relying on
raw vendor/ include paths.
hash: consumers now include via "hash/hash.h"; the vendor/hash dir is kept
as a PRIVATE include so the synced upstream sources compile unmodified.
Assisted-by: pi:llama.cpp/Qwen3.8-27B
* readme : use foo/bar names in acknowledgements
Assisted-by: pi:llama.cpp/Qwen3.8-27B
* ocd : fix valign
2026-08-18 11:16:51 +03:00
ed1c3a20f5
mtmd: use sha256 for input hashing ( #27274 )
...
* mtmd: use sha256 for input hashing
* void conflict with boringssl
2026-08-17 21:20:12 +02:00
39be55c97e
vendor: move hash to vendor ( #27262 )
...
* vendor: move hash to vendor
* group hashes into one single static lib
2026-08-17 18:21:02 +02:00
82e15c08bf
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# docs/backend/SYCL.md
# docs/backend/snapdragon/developer.md
# examples/convert-llama2c-to-ggml/convert-llama2c-to-ggml.cpp
# examples/sycl/run-llama2.sh
# examples/sycl/start-svr.sh
# examples/sycl/test.sh
# examples/sycl/win-run-llama2.bat
# examples/sycl/win-start-svr.bat
# examples/sycl/win-test.bat
# ggml/CMakeLists.txt
# ggml/src/ggml-et/et-kernels/src/ssm_scan_f32.c
# ggml/src/ggml-et/ggml-et-ops.cpp
# ggml/src/ggml-et/ggml-et-ops.h
# ggml/src/ggml-sycl/ssm_scan.cpp
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# ggml/src/ggml-webgpu/wgsl-shaders/ssm_scan.wgsl
# scripts/bench-models.sh
# scripts/snapdragon/adb/run-bench.sh
# scripts/snapdragon/adb/run-cli.sh
# scripts/snapdragon/adb/run-completion.sh
# scripts/snapdragon/adb/run-mtmd.sh
# scripts/snapdragon/windows/run-bench.ps1
# scripts/snapdragon/windows/run-cli.ps1
# scripts/snapdragon/windows/run-completion.ps1
# scripts/snapdragon/windows/run-mtmd.ps1
# scripts/sync-ggml.last
# scripts/sync_vendor.py
# tests/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-chat.cpp
# tests/test-jinja.cpp
# tests/test-llama-archs.cpp
# tools/cli/README.md
# tools/completion/README.md
# tools/llama-bench/README.md
# tools/server/README.md
2026-08-15 22:50:04 +08:00
adb55e5148
vendor: update BoringSSL to 0.20260813.0 ( #27099 )
2026-08-15 13:41:18 +02:00
77140d247c
vendor : update cpp-httplib to 0.53.1 ( #27103 )
2026-08-15 13:40:44 +02:00
f5a6fdf419
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .github/actions/windows-setup-cuda/action.yml
# .github/workflows/release.yml
# .github/workflows/server-sanitize.yml
# models/templates/poolside-Laguna-S-2.1.jinja
# scripts/sync_vendor.py
# tests/test-backend-ops.cpp
# tests/test-chat-auto-parser.cpp
# tests/test-llama-archs.cpp
# tools/cli/README.md
# tools/completion/README.md
# tools/mtmd/CMakeLists.txt
# tools/server/README.md
2026-08-10 21:13:06 +08:00
4c6766fd7e
vendor: sync subprocess.h and drop local patches ( #26808 )
...
Upstream merged the Windows argument quoting fix, the NetBSD build
fix and the chdir fallback for glibc older than 2.29, so pin the
vendored copy to a commit that carries all three and remove the
patch files along with the apply step in the sync script.
The new pin also brings the exec error report on glibc older than
2.24 and the ENOSYS mapping to a dedicated error code. Both are
additive and no caller inspects those values.
2026-08-10 11:59:08 +02:00
e23e9440eb
vendor : update cpp-httplib to 0.53.0 ( #26821 )
2026-08-10 09:57:45 +02:00
8a16f96307
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .github/workflows/build-apple.yml
# .github/workflows/build-self-hosted.yml
# .github/workflows/release.yml
# SECURITY.md
# build-xcframework.sh
# ci/run.sh
# docs/development/HOWTO-add-model.md
# examples/model-conversion/scripts/causal/convert-model.sh
# examples/model-conversion/scripts/embedding/convert-model.sh
# scripts/sync_vendor.py
# scripts/ui-assets.cmake
# tests/test-arg-parser.cpp
# tests/test-backend-sampler.cpp
# tests/test-grammar-parser.cpp
# tests/test-llama-archs.cpp
# tests/test-sampling.cpp
# tools/cli/README.md
# tools/completion/README.md
# tools/mtmd/CMakeLists.txt
# tools/mtmd/mtmd.h
# tools/mtmd/tests/test-deepseek-ocr.py
# tools/server/README.md
# tools/tts/CMakeLists.txt
# tools/tts/convert_pt_to_hf.py
2026-08-07 20:46:56 +08:00
2580b4591d
Merge commit '1c3c9674de4d455f1e571bed808252af54932767' into concedo_experimental
...
# Conflicts:
# .github/workflows/build-apple.yml
# .github/workflows/build-vulkan.yml
# .github/workflows/release.yml
# docs/ops.md
# docs/ops/Vulkan.csv
# examples/gen-docs/gen-docs.cpp
# ggml/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-sycl/concat.cpp
# ggml/src/ggml-sycl/fattn-onednn.cpp
# ggml/src/ggml-sycl/fattn.cpp
# models/templates/deepseek-ai-DeepSeek-V4.jinja
# scripts/sync-ggml.last
# scripts/sync_vendor.py
# src/CMakeLists.txt
# src/llama-model-loader.cpp
# tests/CMakeLists.txt
# tests/test-arg-parser.cpp
# tests/test-backend-sampler.cpp
# tests/test-chat.cpp
# tests/test-sampling.cpp
# tools/server/README.md
2026-08-07 18:16:11 +08:00
7098c9c53f
Merge commit '0b14b87d7c20cb753b94b96854dd7b45306fc696' into concedo_experimental
...
# Conflicts:
# .github/workflows/build-cpu.yml
# .github/workflows/release.yml
# AGENTS.md
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-sycl/common.hpp
# ggml/src/ggml-sycl/ggml-sycl.cpp
# ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# ggml/src/ggml-webgpu/wgsl-shaders/repeat.wgsl
# src/models/qwen3next.cpp
# tests/test-backend-ops.cpp
# tests/test-chat-peg-parser.cpp
# tests/test-chat.cpp
# tests/test-llama-archs.cpp
# tests/test-recurrent-state-rollback.cpp
2026-08-07 18:04:33 +08:00
61881b1f7f
vendor : apply patches for subprocess.h ( #26606 )
2026-08-05 11:26:20 +02:00
94bc47f280
vendor : update cpp-httplib to 0.52.0 ( #26485 )
2026-08-04 00:30:42 +02:00
fe2adf0e72
vendor : update BoringSSL to 0.20260803.0 ( #26523 )
2026-08-03 20:31:15 +02:00
815a2a5915
vendor : update BoringSSL to 0.20260730.0 ( #26353 )
2026-08-01 20:53:00 +02:00
98926f27c1
Merge commit '11b068d06605288ce7917534b46d52b47823dc13' into concedo_experimental
...
# Conflicts:
# CONTRIBUTING.md
# docs/backend/SYCL.md
# docs/install.md
# docs/speculative.md
# ggml/src/ggml-hip/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-sycl/common.hpp
# ggml/src/ggml-sycl/element_wise.cpp
# ggml/src/ggml-sycl/fattn-onednn.cpp
# ggml/src/ggml-sycl/ggml-sycl.cpp
# ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# ggml/src/ggml-webgpu/wgsl-shaders/glu.wgsl
# ggml/src/ggml-webgpu/wgsl-shaders/ssm_scan.wgsl
# tests/test-backend-ops.cpp
# tests/test-chat.cpp
# tests/test-llama-archs.cpp
# tools/cli/README.md
# tools/llama-bench/llama-bench.cpp
# tools/mtmd/CMakeLists.txt
# tools/server/README.md
2026-07-31 17:06:19 +08:00
e2f59ed71d
vendor: update BoringSSL to 0.20260728.0 ( #26241 )
2026-07-29 15:16:02 +03:00
90510f2b27
Merge commit '20455a4ad336e958cfe8f82efce2c46cd44c4fa3' into concedo_experimental
...
# Conflicts:
# common/CMakeLists.txt
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp/CMakeLists.txt
# ggml/src/ggml-hexagon/htp/htp-ctx.h
# ggml/src/ggml-hexagon/htp/htp-ops.h
# ggml/src/ggml-hexagon/htp/main.c
# scripts/sync_vendor.py
# tests/test-chat.cpp
# tests/test-reasoning-budget.cpp
# tests/test-save-load-state.cpp
# tools/server/CMakeLists.txt
# tools/server/README.md
2026-07-27 22:12:11 +08:00
720d7fa409
vendor : update cpp-httplib to 0.51.0 ( #26067 )
...
Signed-off-by: Adrien Gallouët <angt@huggingface.co >
2026-07-25 18:16:29 +02:00
49dbdaaab5
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# AGENTS.md
# CODEOWNERS
# CONTRIBUTING.md
# docs/backend/OPENCL.md
# docs/development/HOWTO-add-model.md
# examples/training/finetune.cpp
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp-drv.cpp
# ggml/src/ggml-hexagon/htp/act-ops.c
# ggml/src/ggml-hexagon/htp/dma-queue.c
# ggml/src/ggml-hexagon/htp/dma-queue.h
# ggml/src/ggml-hexagon/htp/flash-attn-ops.c
# ggml/src/ggml-hexagon/htp/flash-attn-ops.h
# ggml/src/ggml-hexagon/htp/hmx-mm-kernels-tiled.h
# ggml/src/ggml-hexagon/htp/htp-ctx.h
# ggml/src/ggml-hexagon/htp/htp-ops.h
# ggml/src/ggml-hexagon/htp/htp-tensor.c
# ggml/src/ggml-hexagon/htp/htp-tensor.h
# ggml/src/ggml-hexagon/htp/hvx-fa-kernels.h
# ggml/src/ggml-hexagon/htp/hvx-reduce.h
# ggml/src/ggml-hexagon/htp/main.c
# ggml/src/ggml-hexagon/htp/matmul-ops.c
# ggml/src/ggml-hexagon/htp/matmul-ops.h
# ggml/src/ggml-hexagon/htp/unary-ops.c
# ggml/src/ggml-hexagon/htp/unary-ops.h
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# scripts/compare-llama-bench.py
# scripts/snapdragon/ggml-hexagon-profile.py
# scripts/snapdragon/ggml-hexagon-trace.py
# scripts/sync_vendor.py
# tests/test-arg-parser.cpp
# tests/test-chat.cpp
# tests/test-model-load-cancel.cpp
# tests/test-quantize-stats.cpp
# tools/cli/README.md
# tools/completion/README.md
# tools/llama-bench/llama-bench.cpp
# tools/server/README.md
# tools/ui/src/lib/constants/settings-registry.ts
2026-07-25 12:20:51 +08:00
0cea36222f
vendor: update subprocess.h ( #26061 )
2026-07-24 08:02:23 +02:00
0a0b88a5c0
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# docs/backend/OPENCL.md
# ggml/CMakeLists.txt
# ggml/src/ggml-cpu/CMakeLists.txt
# ggml/src/ggml-cpu/kleidiai/kernels.cpp
# ggml/src/ggml-cpu/kleidiai/kernels.h
# ggml/src/ggml-cpu/kleidiai/kleidiai.cpp
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp-drv.cpp
# ggml/src/ggml-hexagon/htp-drv.h
# ggml/src/ggml-hexagon/htp/CMakeLists.txt
# ggml/src/ggml-hexagon/htp/act-ops.c
# ggml/src/ggml-hexagon/htp/argsort-ops.c
# ggml/src/ggml-hexagon/htp/binary-ops.c
# ggml/src/ggml-hexagon/htp/cumsum-ops.c
# ggml/src/ggml-hexagon/htp/flash-attn-ops.c
# ggml/src/ggml-hexagon/htp/hex-dma.h
# ggml/src/ggml-hexagon/htp/hex-profile.h
# ggml/src/ggml-hexagon/htp/hex-utils.h
# ggml/src/ggml-hexagon/htp/hmx-mm-kernels-tiled.h
# ggml/src/ggml-hexagon/htp/hmx-queue.c
# ggml/src/ggml-hexagon/htp/hmx-queue.h
# ggml/src/ggml-hexagon/htp/htp-ctx.h
# ggml/src/ggml-hexagon/htp/htp-ops.h
# ggml/src/ggml-hexagon/htp/main.c
# ggml/src/ggml-hexagon/htp/matmul-ops.c
# ggml/src/ggml-hexagon/htp/matmul-ops.h
# ggml/src/ggml-hexagon/htp/rope-ops.c
# ggml/src/ggml-hexagon/htp/unary-ops.c
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/gemm_moe_mxfp4_q8_1_dp4a.cl
# ggml/src/ggml-opencl/kernels/gemm_moe_q4_0_q8_1_dp4a.cl
# ggml/src/ggml-opencl/kernels/gemm_moe_q4_k_q8_1_dp4a.cl
# ggml/src/ggml-opencl/kernels/gemm_moe_q6_k_q8_1_dp4a.cl
# ggml/src/ggml-opencl/kernels/gemm_moe_q8_1_dp4a.cl
# ggml/src/ggml-opencl/kernels/gemm_noshuffle_q4_k_f32.cl
# ggml/src/ggml-opencl/kernels/gemm_noshuffle_q4_k_q8_1_dp4a.cl
# ggml/src/ggml-opencl/kernels/gemv_noshuffle_q4_k_f32.cl
# ggml/src/ggml-opencl/kernels/mul_mv_q4_k_f32_flat.cl
# ggml/src/ggml-opencl/kernels/mul_mv_q5_k_f32_flat.cl
# ggml/src/ggml-sycl/dmmv.cpp
# scripts/snapdragon/ggml-hexagon-profile.py
# scripts/sync-ggml.last
# tests/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-llama-archs.cpp
# tests/test-recurrent-state-rollback.cpp
# tools/cli/README.md
# tools/completion/README.md
# tools/server/README.md
2026-07-18 12:26:15 +08:00
86b719bf21
vendor: update BoringSSL to 0.20260713.0 ( #25624 )
2026-07-16 21:17:38 +08:00
fa21872f97
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# docs/backend/SYCL.md
# ggml/src/ggml-cpu/ggml-cpu.c
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/cvt.cl
# ggml/src/ggml-opencl/kernels/gemv_moe_mxfp4_f32_ns.cl
# ggml/src/ggml-opencl/kernels/gemv_moe_q4_k_f32_ns.cl
# ggml/src/ggml-sycl/backend.hpp
# ggml/src/ggml-sycl/common.hpp
# ggml/src/ggml-sycl/dmmv.cpp
# ggml/src/ggml-sycl/ggml-sycl.cpp
# scripts/sync_vendor.py
# tests/CMakeLists.txt
# tests/test-alloc.cpp
# tests/test-backend-ops.cpp
# tests/test-chat.cpp
# tests/test-gguf.cpp
# tests/test-save-load-state.cpp
2026-07-13 20:53:37 +08:00
34558825a2
vendor : update cpp-httplib to 0.50.1 ( #25576 )
2026-07-13 01:10:03 +02:00
e944cca86f
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# scripts/sync_vendor.py
# src/llama-model-loader.cpp
# tests/test-backend-ops.cpp
# tests/test-chat-auto-parser.cpp
# tests/test-chat.cpp
# tools/cli/cli.cpp
# tools/server/README.md
2026-07-05 11:30:12 +08:00
c8ae9a750c
vendor : update cpp-httplib to 0.49.0 ( #25218 )
2026-07-03 10:26:54 +02:00
73cc7d9287
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .devops/cann.Dockerfile
# .devops/cpu.Dockerfile
# .devops/cuda.Dockerfile
# .devops/intel.Dockerfile
# .devops/musa.Dockerfile
# .devops/openvino.Dockerfile
# .devops/rocm.Dockerfile
# .devops/s390x.Dockerfile
# .devops/vulkan.Dockerfile
# .devops/zendnn.Dockerfile
# .dockerignore
# .pi/gg/SYSTEM.md
# ggml/CMakeLists.txt
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# scripts/sync-ggml.last
# scripts/sync_vendor.py
# tools/cli/README.md
# tools/cli/cli.cpp
# tools/mtmd/clip.cpp
# tools/server/README.md
2026-06-20 17:16:19 +08:00
0d2d9ccbf6
vendor : update cpp-httplib to 0.48.0 ( #24787 )
2026-06-19 22:16:35 +08:00
b8b7763c76
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .devops/openvino.Dockerfile
# .github/workflows/build-cache.yml
# .github/workflows/build-openvino.yml
# .github/workflows/build-self-hosted.yml
# .github/workflows/release.yml
# docs/backend/OPENVINO.md
# docs/backend/SYCL.md
# docs/ops.md
# docs/ops/SYCL.csv
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/mul_mv_f16_f32_l4.cl
# ggml/src/ggml-openvino/.clang-format
# ggml/src/ggml-openvino/CMakeLists.txt
# ggml/src/ggml-openvino/ggml-decoder.cpp
# ggml/src/ggml-openvino/ggml-decoder.h
# ggml/src/ggml-openvino/ggml-openvino-extra.cpp
# ggml/src/ggml-openvino/ggml-openvino-extra.h
# ggml/src/ggml-openvino/ggml-openvino.cpp
# ggml/src/ggml-openvino/ggml-quants.cpp
# ggml/src/ggml-openvino/ggml-quants.h
# ggml/src/ggml-openvino/openvino/decoder.h
# ggml/src/ggml-openvino/openvino/frontend.h
# ggml/src/ggml-openvino/openvino/input_model.h
# ggml/src/ggml-openvino/openvino/node_context.h
# ggml/src/ggml-openvino/openvino/op/cont.cpp
# ggml/src/ggml-openvino/openvino/op/cpy.cpp
# ggml/src/ggml-openvino/openvino/op/flash_attn_ext.cpp
# ggml/src/ggml-openvino/openvino/op/get_rows.cpp
# ggml/src/ggml-openvino/openvino/op/glu_geglu.cpp
# ggml/src/ggml-openvino/openvino/op/glu_swiglu.cpp
# ggml/src/ggml-openvino/openvino/op/mulmat.cpp
# ggml/src/ggml-openvino/openvino/op/permute.cpp
# ggml/src/ggml-openvino/openvino/op/reshape.cpp
# ggml/src/ggml-openvino/openvino/op/rms_norm.cpp
# ggml/src/ggml-openvino/openvino/op/rope.cpp
# ggml/src/ggml-openvino/openvino/op/set_rows.cpp
# ggml/src/ggml-openvino/openvino/op/softmax.cpp
# ggml/src/ggml-openvino/openvino/op/transpose.cpp
# ggml/src/ggml-openvino/openvino/op/unary_silu.cpp
# ggml/src/ggml-openvino/openvino/op/view.cpp
# ggml/src/ggml-openvino/openvino/op_table.cpp
# ggml/src/ggml-openvino/openvino/op_table.h
# ggml/src/ggml-openvino/openvino/pass/mark_decompression_convert_constant_folding.h
# ggml/src/ggml-openvino/openvino/translate_session.cpp
# ggml/src/ggml-openvino/openvino/translate_session.h
# ggml/src/ggml-openvino/openvino/utils.cpp
# ggml/src/ggml-openvino/openvino/utils.h
# ggml/src/ggml-openvino/utils.cpp
# ggml/src/ggml-openvino/utils.h
# ggml/src/ggml-sycl/common.hpp
# ggml/src/ggml-sycl/ggml-sycl.cpp
2026-06-17 16:06:00 +08:00
74ade52741
vendor : update BoringSSL to 0.20260616.0 ( #24693 )
2026-06-16 20:24:28 +02:00
ea0351c71a
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .github/workflows/release.yml
# .github/workflows/ui-build-self-hosted.yml
# .github/workflows/ui-build.yml
# .github/workflows/ui-publish.yml
# .github/workflows/ui-self-hosted.yml
# .github/workflows/ui.yml
# .gitignore
# README.md
# docs/ops.md
# docs/ops/Vulkan.csv
# ggml/CMakeLists.txt
# scripts/sync-ggml.last
# scripts/sync_vendor.py
# scripts/ui-assets.cmake
# tests/test-jinja.cpp
# tests/test-llama-archs.cpp
2026-06-14 11:26:16 +08:00
70b54e140c
vendor : update cpp-httplib to 0.47.0 ( #24395 )
...
Signed-off-by: Adrien Gallouët <angt@huggingface.co >
2026-06-12 11:34:44 +02:00
be1750a3b8
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .devops/cuda.Dockerfile
# .github/workflows/build-sycl.yml
# .github/workflows/release.yml
# ggml/CMakeLists.txt
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp/gated-delta-net-ops.c
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/cvt.cl
# ggml/src/ggml-opencl/kernels/gated_delta_net.cl
# ggml/src/ggml-sycl/gated_delta_net.cpp
# ggml/src/ggml-webgpu/ggml-webgpu.cpp
# ggml/src/ggml-webgpu/wgsl-shaders/gated_delta_net.wgsl
# scripts/sync-ggml.last
# tests/test-backend-ops.cpp
# tests/test-llama-archs.cpp
2026-06-12 15:39:57 +08:00
ac4cddeb0d
vendor : update LibreSSL to 4.3.2 ( #24397 )
...
Signed-off-by: Adrien Gallouët <angt@huggingface.co >
2026-06-10 22:28:03 +02:00
7fb55b1e32
does not work for e4b
2026-06-04 10:44:40 +08:00
d545a2a993
update BoringSSL to 0.20260526.0 ( #23794 )
2026-06-03 07:42:58 +02:00
13eaa04269
Merge branch 'upstream' into concedo_experimental
...
# Conflicts:
# .devops/nix/package.nix
# .github/workflows/server.yml
# docs/development/HOWTO-add-model.md
# ggml/src/ggml-hexagon/ggml-hexagon.cpp
# ggml/src/ggml-hexagon/htp/CMakeLists.txt
# ggml/src/ggml-hexagon/htp/argsort-ops.c
# ggml/src/ggml-hexagon/htp/concat-ops.c
# ggml/src/ggml-hexagon/htp/flash-attn-ops.c
# ggml/src/ggml-hexagon/htp/gated-delta-net-ops.c
# ggml/src/ggml-hexagon/htp/hmx-flash-attn-ops.c
# ggml/src/ggml-hexagon/htp/hmx-matmul-ops.c
# ggml/src/ggml-hexagon/htp/hmx-ops.h
# ggml/src/ggml-hexagon/htp/htp-ctx.h
# ggml/src/ggml-hexagon/htp/hvx-utils.h
# ggml/src/ggml-hexagon/htp/main.c
# ggml/src/ggml-hexagon/htp/matmul-ops.c
# ggml/src/ggml-hexagon/htp/pad-ops.c
# ggml/src/ggml-hexagon/htp/unary-ops.c
# ggml/src/ggml-opencl/CMakeLists.txt
# ggml/src/ggml-opencl/ggml-opencl.cpp
# ggml/src/ggml-opencl/kernels/cvt.cl
# ggml/src/ggml-webgpu/wgsl-shaders/cpy.wgsl
# scripts/sync_vendor.py
# src/llama-context.cpp
# tests/test-backend-sampler.cpp
# tools/server/README.md
# tools/ui/tests/stories/ChatScreenForm.a11y.stories.svelte
2026-06-02 19:28:39 +08:00
Concedo
Alessandro de Oliveira Faria (A.K.A.CABELO)
Georgi Gerganov
Xuan-Son Nguyen
Pascal
Adrien Gallouët