Merge llama into beellama 2#2

Open

gboddaer wants to merge 439 commits into

mainfrom

merge_llama_into_beellama_2

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 17, 2026

mtmd: llava_uhd should no longer use batch dim (#24732)
ngxson
authored

Commits on Jun 18, 2026

Commits on Jun 19, 2026

Commits on Jun 20, 2026

Commits on Jun 21, 2026

Commits on Jun 22, 2026

docs/android.md: Add dependency `libandroid-spawn` for building in termux (#21812)
aafsmarak
authored
server: fix edit_file crash on append at end of file (line_start -1) (#24893)
ServeurpersoCom
authored
sampling : remove unconditional softmax+sort in top-n-sigma sampler (#22645)
TimNN
authored
[SYCL] support bf16 on bin_bcast OP and unary OPs (#24838)
arthw
authored
ui: model status and load progress via /models/sse feed (#24878)
ServeurpersoCom
authored
server: refactor/generalize input file schema (#24299)
ngxson
authored
server: (router) move model downloading to dedicated process (#24834)
ngxson
authored
ui: Prioritize favorite models in model selection (#24766)
mahdiou
authored
server : Add id to tool call responses api (#24882)
boondocklabs
authored

Commits on Jun 23, 2026

Commits on Jun 24, 2026

Commits on Jun 25, 2026

Commits on Jun 26, 2026

Commits on Jun 28, 2026

Commits on Jun 30, 2026

Commits on Jul 1, 2026

Fix test-cpu-out-prod: skip entire F16 test (CPU out_prod F16 not implemented)
Gert Boddaert
committed
Fix CI compilation errors:
Gert Boddaert
committed
WIP: Apply divergent-branch-merge skill methodology
Gert Boddaert
committed
WIP: Fix constructor signatures and remove invalid build_graph override
Gert Boddaert
committed
WIP: Task tracker installed, 151 errors after reverting constructor fix
Gert Boddaert
committed
WIP: Fixed compilation errors - 0 compile errors, linker errors remain
Gert Boddaert
committed
WIP: Added DFlash implementations - 0 compile errors, linker errors from duplicates
Gert Boddaert
committed

Commits on Jul 2, 2026

Fix build: 0 errors after resolving n_layer(), ggml_gated_delta_net K, struct initializers, and kv_cache constructor
Gert Boddaert
committed
WIP: Fixed test-ggml-op-coverage (missing OP_SYMBOL entries), test-dflash-plumbing (test fix pending)
Gert Boddaert
committed
Fix Gated Delta Net snapshot slot mapping (35B-A3B fix)
Gert Boddaert
committed
Phase 1-2: Copy DFlash dependency headers and add missing types
Gert Boddaert
committed
Phase 3: Create dflash-server-utils module
Gert Boddaert
committed
Phase 4a: Add DFlash lifecycle hooks (init/shutdown)
Gert Boddaert
committed
Phase 4b: Add slot and post-decode DFlash hooks
Gert Boddaert
committed
Phase 5b: Add DFlash model loading and slot state management
Gert Boddaert
committed
Phase 5b fix: Correct cleanup_slot_dflash to check token pointer
Gert Boddaert
committed
Phase 5c: Integrate DFlash slot state with server_slot
Gert Boddaert
committed
Phase 5d: Add DFlash draft generation and rollback stubs
Gert Boddaert
committed
Phase 5d: Add draft_tokens member and improve stubs
Gert Boddaert
committed
Phase 5d: Implement DFlash decode integration
Gert Boddaert
committed
Phase 5e: Activate DFlash decode integration hooks
Gert Boddaert
committed
Phase 5e fix: Fix draft token position increment
Gert Boddaert
committed
Phase 5f: Fix critical DFlash decode bugs + add unit tests
Gert Boddaert
committed
Phase 5f: Use real DFlash cross-attention (remove redundant parallel path)
Gert Boddaert
committed
Update TASK_PROGRESS.md: Phase 5f HIGH/MEDIUM issues resolved
Gert Boddaert
committed
Restructure TASK_PROGRESS.md per persistent-task-tracker schema
Gert Boddaert
committed
tests: fix test-quantize-fns segfault + port test-dflash-plumbing, fix need_n_rs_seq regression
Gert Boddaert
committed
tests: split DFlash/mtmd plumbing per GLM Option C — clean CI
Gert Boddaert
committed
Update TASK_PROGRESS: Phase 5g unit-test verification (98% CI pass)
Gert Boddaert
committed
tests: delete test-mtmd-plumbing text-grep guards (GLM Option C: delete, don't quarantine)
Gert Boddaert
committed
mtmd: port fork decoder_n_ubatch feature for non-causal image decode
Gert Boddaert
committed
Update TASK_PROGRESS: Phase 5h mtmd decoder_n_ubatch ported
Gert Boddaert
committed
docs: record push policy (track gboddaer/merge_llama_into_beellama_2, main is release-only)
Gert Boddaert
committed
docs: record gboddaer/main reset to pre-exercise state (adb92b36a)
Gert Boddaert
committed

Commits on Jul 3, 2026

fix(msvc): make dflash_rollback noinline portable; fix %ld for int64_t
Gert Boddaert
committed
fix(ci): gate test-dflash-plumbing off WIN32+BUILD_SHARED_LIBS (LNK2019)
Gert Boddaert
committed
fix(ci): fix 2 remaining test failures (both pre-existing upstream backend issues)
Gert Boddaert
committed

Commits on Jul 4, 2026

fix(dflash): restore DFlash speculative decoding initialization (4 fixes)
Gert Boddaert
committed
fix(dflash): dispatch common_speculative_init by speculative type (GLM review #3)
Gert Boddaert
committed
fix(dflash): size dparams to n_parallel in 3-arg common_speculative_init
Gert Boddaert
committed
docs: update TASK_PROGRESS — DFlash decode works with --parallel 1 (commit 805e1560e)
Gert Boddaert
committed
docs: TASK_PROGRESS — DFlash impl identical fork-vs-merge; quality/multi-slot gap is server-side
Gert Boddaert
committed
docs: TASK_PROGRESS — GLM port strategy (HF-026/027); Step 1 span-scheduling plan defined
Gert Boddaert
committed
fix(dflash): add prefill span scheduling + update_logits ring append (Step 1)
Gert Boddaert
committed
fix(dflash): use deferred_dflash_kv update_logits variant (matches fork)
Gert Boddaert
committed
docs: TASK_PROGRESS — Step 1 progress (ring grows); remaining quality candidates
Gert Boddaert
committed
fix(dflash): port fork drafter ctx sizing (n_ctx=256, n_ubatch, kv_unified=false)
Gert Boddaert
committed
docs: TASK_PROGRESS — exhaustive Step 1 investigation; remaining suspect = draft_batch path
Gert Boddaert
committed
fix(dflash): add n_min=0 to draft_params (no impact - 1-arg draft doesn't enforce n_min)
Gert Boddaert
committed
docs: update TASK_PROGRESS — Step 2: switch to 6-arg common_speculative_draft()
Gert Boddaert
committed
feat(dflash): add ring data dump for merge-vs-fork comparison (GGML_DFLASH_RING_DUMP=1)
Gert Boddaert
committed

Commits on Jul 5, 2026

docs: update TASK_PROGRESS — HF-028 ring data comparison merge vs fork
Gert Boddaert
committed
docs: update TASK_PROGRESS — HF-029 GDB flow comparison merge vs fork
Gert Boddaert
committed
docs: update TASK_PROGRESS — HF-030 GLM review of GDB findings
Gert Boddaert
committed
feat(dflash): add KV cache trace (GGML_DFLASH_KV_TRACE=1) — found root cause
Gert Boddaert
committed
feat(dflash): add KV trace after decode (GGML_DFLASH_KV_TRACE=1)
Gert Boddaert
committed
feat(dflash): ROOT CAUSE FOUND — drafter produces ALL ZEROS
Gert Boddaert
committed
fix(dflash): add llama_model_share_tensors — ROOT CAUSE of quality gap FIXED
Gert Boddaert
committed
docs: update TASK_PROGRESS — HF-031 ROOT CAUSE FOUND AND FIXED
Gert Boddaert
committed
docs: HF-032 profit controller is NOT the remaining gap
Gert Boddaert
committed
docs: HF-033 prefill capture investigation — chat template is the remaining gap
Gert Boddaert
committed
feat(dflash): multi-slot per-slot spec architecture + seq_id fix
Gert Boddaert
committed
docs: HF-034 multi-slot DFlash — single-slot works, multi-slot 0 drafts (capture issue)
Gert Boddaert
committed
fix(dflash): add llama_dflash_allocate_slots + set_active_slot for multi-slot
Gert Boddaert
committed
fix(dflash): guard allocate_slots for multi-slot only, restore active slot calls
Gert Boddaert
committed
docs: HF-035 multi-slot DFlash — proven facts vs hypotheses
Gert Boddaert
committed
docs: HF-036 lesson — longer tests needed for certainty + single-slot quality regression
Gert Boddaert
committed
fix(dflash): use ring_state_save/load instead of TODO stubs for checkpoints
Gert Boddaert
committed
docs: HF-037 DFlash quality regression — n_outputs_max is the root cause
Gert Boddaert
committed
fix(dflash): drafter n_outputs_max + ring_state_save/load + workaround doc
Gert Boddaert
committed
docs: HF-038 quality regression root cause — n_outputs_max corrupts graph
Gert Boddaert
committed

Commits on Jul 6, 2026

docs: HF-039 ROOT CAUSE — GPU-embedded hidden capture broken in merge
Gert Boddaert
committed
feat(dflash): port GPU-embedded hidden capture to qwen35.cpp + graph invalidation
Gert Boddaert
committed

Commits on Jul 8, 2026

Merge commit '130ea2480bee8268907a102bd814e276f4e88bdf' into merge_llama_into_beellama_2
Gert Boddaert
committed

Commits on Jul 9, 2026

docs: plan DFlash merge regression investigation
Gert Boddaert
committed
dflash: record merge regression diagnostics
Gert Boddaert
committed
dflash(vulkan): fix gated_delta_net snapshot slot ordering (primary DFlash correctness regression)
Gert Boddaert
committed
dflash(server): add verify_pre/verify_post QA trace for n_past/seq_backup (Phase 2 diagnostic)
Gert Boddaert
committed

Commits on Jul 10, 2026

Commits on Jul 11, 2026

dflash(vulkan): fix rollback corruption — skip tape_replay (double-advances conv state r_l)
Gert Boddaert
committed

Commits on Jul 12, 2026

dflash(vulkan): fix multi-slot capture routing + reduce drafter n_outputs_max
Gert Boddaert
committed

Commits on Jul 14, 2026

dflash(server): wire batch draft path for multi-slot speed (+30%)
Gert Boddaert
committed
dflash(server): wire profit controller (adaptive draft-max)
Gert Boddaert
committed