Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions aspec/commands/convert_to_hf.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,15 @@ def _checkpoint_training_contract(model_dir: Path, raw_config: dict) -> dict:
effective = AutoDraftModelConfig.from_dict(raw_config)
if draft_model_semantics(effective) != draft_model_semantics(saved_semantics):
raise ValueError("Export model semantics conflict with the checkpoint; use its saved draft_config.json")
saved_block_attention = (topology.get("draft_attention_policy") or {}).get("draft_block_attention")
if algorithm in {"dspark", "dflash"} and saved_block_attention is not None:
from aspec.config.draft_attention import (
draft_block_attention_matches,
resolve_draft_attention,
)

if not draft_block_attention_matches(saved_block_attention, resolve_draft_attention(raw_config)):
raise ValueError("Export Draft block attention conflicts with the checkpoint; use its saved draft_config.json")
from aspec.config.draft_structure import checkpoint_ffn_policy, resolve_draft_structure

saved_ffn = checkpoint_ffn_policy(model_dir.parent, topology if metadata_path.is_file() else {})
Expand Down
11 changes: 11 additions & 0 deletions aspec/config/draft_algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@
"""Algorithm identity for the currently registered Draft architectures."""

from collections.abc import Mapping
from enum import StrEnum


class DSparkLossRecipe(StrEnum):
DEEPSPEC = "deepspec"
SPECULATORS_REDHAT_V1 = "speculators_redhat_v1"

@property
def distribution_metric(self) -> str:
return "tv_loss" if self is self.SPECULATORS_REDHAT_V1 else "l1_loss"


DRAFT_ALGORITHMS = {
"NativeMTPDraftModel": "mtp",
Expand Down
15 changes: 14 additions & 1 deletion aspec/config/draft_attention.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ def resolve_draft_attention(raw: Mapping) -> dict:
):
raise ValueError("Draft sliding_window must be a positive integer or null")
schedule = raw.get("layer_types")
sliding_non_causal = raw.get("sliding_window_non_causal", True)
if not isinstance(sliding_non_causal, bool):
raise ValueError("sliding_window_non_causal must be boolean")
ratios = raw.get("compress_ratios")
if ratios is not None:
if not isinstance(ratios, (list, tuple)) or len(ratios) != layers:
Expand Down Expand Up @@ -421,11 +424,21 @@ def dsa_positive_integer(name: str, default: int) -> int:
else kind == "sliding_attention") else "bidirectional"
for kind in schedule
] if raw.get("architectures") == ["DFlash2DraftModel"]
else "bidirectional"
else ["causal" if kind == "sliding_attention" else "bidirectional" for kind in schedule]
if not sliding_non_causal else "bidirectional"
Comment thread
Longxmas marked this conversation as resolved.
Resolved
),
}


def draft_block_attention_matches(saved: str | list[str], current: Mapping) -> bool:
"""Compare scalar and per-layer serializations over the same layer schedule."""
policy = current["draft_block_attention"]
layers = len(current["layer_types"])
return ([saved] * layers if isinstance(saved, str) else saved) == (
[policy] * layers if isinstance(policy, str) else policy
)


def draft_context_shard_alignment(attention: Mapping) -> int:
"""Derive the minimum context-shard alignment from active sparse structures."""

Expand Down
36 changes: 36 additions & 0 deletions aspec/config/dspark_glm5_3_flash_draft_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"architectures": [
"DSparkDraftModel"
],
"model_type": "qwen3_dspark",
"hidden_size": 4096,
"intermediate_size": 12288,
"head_dim": 64,
"num_hidden_layers": 5,
"num_attention_heads": 64,
"num_key_value_heads": 64,
"vocab_size": 154880,
"rms_norm_eps": 1e-05,
"max_position_embeddings": 1048576,
"rope_theta": 10000,
"num_target_layers": 6,
"target_hidden_size": 4096,
"target_num_hidden_layers": 45,
"target_layer_ids": [
19,
27,
31,
35,
39,
43
],
"mask_token_id": 154856,
"block_size": 8,
"markov_rank": 256,
"markov_head_type": "vanilla",
"enable_confidence_head": true,
"confidence_head_with_markov": true,
"tie_word_embeddings": false,
"sliding_window": 2048,
"sliding_window_non_causal": false
}
1 change: 1 addition & 0 deletions aspec/config/train_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ class TrainingConfig:
# DSpark-specific parameters (used by DSpark trainer only)
# Precision of the frozen Draft LM head during training (SM90 FP8, CP1).
dspark_lm_head_precision: str = "bf16"
dspark_loss_recipe: str = "deepspec"
dspark_num_anchors: int = 512
dspark_num_target_layers: int = 5
dspark_loss_decay_gamma: float = 4.0
Expand Down
15 changes: 13 additions & 2 deletions aspec/config/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,22 @@
from typing import Optional

import torch
from transformers import AutoConfig, AutoTokenizer
from transformers import AutoConfig, AutoTokenizer, PretrainedConfig

logger = logging.getLogger(__name__)


def load_target_config(model_path, **kwargs):
"""Read GLM text geometry even in Draft environments without SGLang's registry."""
try:
return AutoConfig.from_pretrained(model_path, **kwargs)
except ValueError:
raw, _ = PretrainedConfig.get_config_dict(model_path, **kwargs)
if raw.get("model_type") != "glm5_next":
raise
return PretrainedConfig.from_dict(raw["text_config"])


def _copy_config_value(value):
if hasattr(value, "to_dict"):
return value.to_dict()
Expand Down Expand Up @@ -114,7 +125,7 @@ def generate_draft_model_config(
Returns:
dict: Generated draft model config dictionary
"""
target_config = AutoConfig.from_pretrained(
target_config = load_target_config(
target_model_path,
cache_dir=cache_dir,
trust_remote_code=trust_remote_code,
Expand Down
3 changes: 3 additions & 0 deletions aspec/data/renderers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@
# SOFTWARE.

from aspec.data.renderers.base import DEFAULT_CACHE_VERSION, ConversationRenderer
from aspec.data.renderers.glm5 import Glm5FlashRenderer
from aspec.data.renderers.kimi_k3 import K3Renderer
from aspec.data.renderers.registry import RENDERER_REGISTRY, RendererRegistry

RENDERER_REGISTRY.register("glm5_3_flash", Glm5FlashRenderer)
RENDERER_REGISTRY.register("kimi-k3", K3Renderer)

__all__ = [
"DEFAULT_CACHE_VERSION",
"ConversationRenderer",
"Glm5FlashRenderer",
"K3Renderer",
"RENDERER_REGISTRY",
"RendererRegistry",
Expand Down
72 changes: 72 additions & 0 deletions aspec/data/renderers/glm5.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Copyright 2026 Ant Group Co., Ltd.
# SPDX-License-Identifier: Apache-2.0

"""Text-only conversations using the GLM-5.3-Flash checkpoint template."""


class Glm5FlashRenderer:
CACHE_VERSION = "v2"
roles = ("system", "user", "assistant")

def __init__(self, tokenizer):
self.tokenizer = tokenizer
self.role_ids = {}
for role in self.roles:
marker = f"<|{role}|>"
ids = tokenizer.encode(marker, add_special_tokens=False)
if len(ids) != 1 or tokenizer.convert_ids_to_tokens(ids[0]) != marker:
raise ValueError(f"GLM tokenizer lacks its {marker} role token")
self.role_ids[ids[0]] = role

def get_assistant_token_ids(self):
ids = {role: token for token, role in self.role_ids.items()}
return [ids["assistant"]], [ids["user"]], 0

def render(
self, messages, tools=None, *, max_seq_length, last_turn_only=False, generation_config=None
):
if tools:
raise ValueError("GLM text training requires conversations without tools")
for msg in messages:
if (
msg.get("role") not in self.roles
or not isinstance(msg.get("content"), str)
or msg.get("tool_calls")
):
raise ValueError("Expected GLM system/user/assistant text messages")
for alias in ("thinking", "thinking_content", "reasoning"):
if alias in msg:
raise ValueError(
f"GLM messages must store reasoning in reasoning_content, not {alias!r}"
)
for field in ("content", "reasoning_content"):
value = msg.get(field)
if value is None:
continue
if not isinstance(value, str):
raise ValueError(f"GLM {field} must be text")
if any(f"<|{role}|>" in value for role in self.roles):
raise ValueError("A GLM message contains a reserved role token")

kwargs = {
k: v
for k, v in (generation_config or {}).items()
if k in ("reasoning_effort", "clear_thinking")
}
ids = self.tokenizer.apply_chat_template(
messages, tokenize=True, add_generation_prompt=False, return_dict=False, **kwargs
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
)
mask = [0] * len(ids)
last_assistant = 0
supervise = False
for i, token in enumerate(ids):
role = self.role_ids.get(token)
if role is not None:
supervise = role == "assistant"
if supervise:
last_assistant = i
else:
mask[i] = int(supervise)
if last_turn_only:
mask[:last_assistant] = [0] * last_assistant
return ids[:max_seq_length], mask[:max_seq_length]
5 changes: 4 additions & 1 deletion aspec/draft_artifact.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def validate_native_asset(path, *, expected_config=None, weights_only=False):
raise ValueError("Native artifact MTP conditioning semantics mismatch")
if expected_config is not None and draft_model_semantics(config) != draft_model_semantics(expected_config):
raise ValueError("Native artifact semantics disagree with the requested Draft")
from aspec.config.draft_attention import resolve_draft_attention
from aspec.config.draft_attention import draft_block_attention_matches, resolve_draft_attention

attention = resolve_draft_attention(config.to_dict())
recorded_dsa = ((manifest.get("draft_structure") or {}).get("attention") or {}).get("dsa")
Expand All @@ -84,6 +84,9 @@ def validate_native_asset(path, *, expected_config=None, weights_only=False):
expected_attention = resolve_draft_attention(
expected_config if isinstance(expected_config, dict) else expected_config.to_dict()
)
if (manifest["algorithm"] in {"dspark", "dflash"}
and not draft_block_attention_matches(attention["draft_block_attention"], expected_attention)):
raise ValueError("Native artifact Draft block attention disagrees with the requested Draft")
if attention.get("dsa") is not None or expected_attention.get("dsa") is not None:
def dsa_semantics(policy, *, phase_transition):
dsa = policy.get("dsa")
Expand Down
4 changes: 2 additions & 2 deletions aspec/inference/engine/sgl_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,9 @@ def _get_hidden_size_from_engine(self) -> int:
Returns:
Hidden size dimension.
"""
from transformers import AutoConfig
from aspec.config.utils import load_target_config

config = AutoConfig.from_pretrained(
config = load_target_config(
self.args.target_model_path,
trust_remote_code=getattr(self.args, "trust_remote_code", False),
)
Expand Down
Loading