Skip to content

Promote dev to master: spec-decoding CLI restoration (#34, #37)#45

Merged
worthant merged 6 commits into
masterfrom
dev
Jul 23, 2026
Merged

Promote dev to master: spec-decoding CLI restoration (#34, #37)#45
worthant merged 6 commits into
masterfrom
dev

Conversation

@worthant

Copy link
Copy Markdown
Member

Promotes the merged #44 to master for the b10018-1.1.1 patch release.

  • Closes Misc. bug: #34: --spec-type nextn (and mtp) accepted again as aliases of draft-mtp; --mtp-head restored as -md alias.
  • Eval bug: #37 (CLI half): the reported command now parses and loads; the remaining half — regenerating the published Gemma assistant GGUFs — is tracked separately, unblocked by the gguf-py import fix in this batch.
  • All doc examples and the six run-*.sh helpers now pass live flag names.
  • Loading a pre-sync assistant GGUF fails with an actionable message instead of 'unknown model architecture'.

worthant added 6 commits July 23, 2026 19:18
The b10018 upstream sync replaced the fork's speculative CLI with the
upstream framework: the Gemma MTP and Qwen NextN paths both became
draft-mtp, and --mtp-head disappeared. The docs and helper scripts kept
the old names, so every command from README/MTP.md/NEXTN.md failed with
'invalid argument' (#37) or 'unknown speculative type' (#34).

- map 'mtp' and 'nextn' to COMMON_SPECULATIVE_TYPE_DRAFT_MTP (duplicates
  are safe: type selection collapses into a bitmask)
- add --mtp-head as an alias of --spec-draft-model/-md
--draft-max/--draft-min are removed-arg stubs and --draft-block-size no
longer exists; all examples now use --spec-draft-n-max/--spec-draft-n-min
(per-round chain length N = old block size B - 1).
DRAFT_BLOCK_SIZE keeps working (translated to --spec-draft-n-max B-1);
the legacy DRAFT_MAX cap is no longer forwarded for Gemma helpers, and
the Qwen NextN helper defaults to the documented n-max 2 / n-min 1.
The b10018 sync renamed the assistant tensors to NEXTN_*/MASKED_EMBD_*
(which have their own mapping entries) but left the old MTP_* references
behind; since MODEL_TENSOR.MTP_PRE_PROJECTION no longer exists, importing
gguf crashed with AttributeError — taking every conversion script down
with it.
The published assistant GGUFs predate the sync: different arch name
('gemma4_assistant'), kv namespace, and a different head architecture at
the tensor level (single mtp.* projections vs per-block nextn.*), so
they cannot be loaded by the upstream gemma4-assistant support. Replace
'unknown model architecture' with an actionable message pointing at
re-download/reconversion.
fix: restore mtp/nextn spec-type names, --mtp-head, and live draft flags in docs/scripts
@github-actions github-actions Bot added documentation Improvements or additions to documentation conversion labels Jul 23, 2026
@worthant
worthant merged commit d7b42ab into master Jul 23, 2026
21 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conversion documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Misc. bug:

1 participant