Skip to content

Carry GLM llama MTP patches - #840

Merged
i386 merged 2 commits into
mainfrom
feat/jianyang-glm-llama-patches-on-canary
Jun 13, 2026
Merged

Carry GLM llama MTP patches#840
i386 merged 2 commits into
mainfrom
feat/jianyang-glm-llama-patches-on-canary

Conversation

@i386

@i386 i386 commented Jun 13, 2026

Copy link
Copy Markdown
Collaborator

Summary

Adds the GLM llama.cpp patch series on top of the llama upstream canary refresh in #839.

This appends patch-queue entries 0083 through 0089 for:

  • DeepSeek2 / GLM NextN tensor mapping and appended MTP-layer quantization
  • remote safetensor range-read retry behavior
  • GLM tokenizer regex handling during GGUF conversion
  • native GLM MTP support for GLM-lite / GLM-DSA conversion and runtime graph routing
  • a GLM-5.1 MTP metadata mapping checker in the carried llama patch

Stacking

This PR is intentionally stacked on #839:

  • base: codex/fix-llama-upstream-canary
  • head: feat/jianyang-glm-llama-patches-on-canary

Merge #839 first, then retarget or merge this PR.

Validation

  • LLAMA_WORKDIR=$(mktemp...) scripts/prepare-llama.sh pinned
  • scripts/build-llama.sh against the patched llama checkout
  • just build

@coderabbitai

coderabbitai Bot commented Jun 13, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 72d4bc21-4530-4069-b017-1c5f66f277a0

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/jianyang-glm-llama-patches-on-canary

Comment @coderabbitai help to get the list of available commands and usage tips.

@i386
i386 marked this pull request as ready for review June 13, 2026 02:36
Base automatically changed from codex/fix-llama-upstream-canary to main June 13, 2026 03:52
@i386
i386 merged commit de42ca3 into main Jun 13, 2026
42 of 59 checks passed
@i386
i386 deleted the feat/jianyang-glm-llama-patches-on-canary branch June 13, 2026 03:53
michaelneale added a commit that referenced this pull request Jun 14, 2026
* origin/main: (29 commits)
  MoA: don't let small-model consensus pre-empt a still-running large model (#837)
  fix(console): render thinking traces as markdown
  Add bounded direct path repair (#846)
  Fix skippy smoke PR gate (#850)
  Stabilize skippy smoke chain startup (#849)
  fix(ci): switch back to auto-assign workflow
  fix(website): polish longform visual explainer (#843)
  fix: gemma thinking
  Carry GLM llama MTP patches (#840)
  Refresh llama.cpp canary patch queue (#839)
  Add transport-aware Skippy stage ordering (#814)
  Share Skippy stage wire byte accounting (#818)
  Report Skippy artifact cold-start costs (#815)
  fix: debug output capturing for TUI / panics (#827)
  fix(hero): visual corrections for iPhone SE size devices (#838)
  Add Skippy stage role metadata (#816)
  Add Skippy request cache epoch telemetry (#817)
  Consolidate agent skills and fix stale docs (Windows deploy, repo map, design docs) (#836)
  feature(version): normalize version markers for different build types (#831)
  fix(website): fix visual regressions (#835)
  ...

# Conflicts:
#	AGENTS.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant