Update inference code and model card
Browse files- checkpoint.py +90 -0
- csc_model.py +6 -5
- model.py +12 -13
checkpoint.py
ADDED
|
@@ -0,0 +1,90 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
"""加载骨干权重。只依赖 torch。
|
| 2 |
+
|
| 3 |
+
支持两种目录:
|
| 4 |
+
|
| 5 |
+
预训练产出 model.pt {"model": state_dict, "config": {...}, ...}
|
| 6 |
+
HF 发布包 model.safetensors + config.json
|
| 7 |
+
|
| 8 |
+
后者不走 safetensors 库 —— 那个格式简单到不值得为它加一个依赖:
|
| 9 |
+
|
| 10 |
+
8 字节小端 uint64:JSON 头的长度
|
| 11 |
+
JSON 头:{张量名: {dtype, shape, data_offsets:[起, 止]}, "__metadata__": ...}
|
| 12 |
+
其余:裸张量数据,offsets 相对于头之后的位置
|
| 13 |
+
|
| 14 |
+
这样 --ckpt_dir 可以直接指向从 HF 下下来的目录,不用先转格式。
|
| 15 |
+
"""
|
| 16 |
+
import json
|
| 17 |
+
import struct
|
| 18 |
+
from pathlib import Path
|
| 19 |
+
|
| 20 |
+
import torch
|
| 21 |
+
|
| 22 |
+
# safetensors 的 dtype 名 → torch dtype
|
| 23 |
+
_ST_DTYPE = {
|
| 24 |
+
"BOOL": torch.bool, "U8": torch.uint8, "I8": torch.int8,
|
| 25 |
+
"I16": torch.int16, "U16": torch.uint16,
|
| 26 |
+
"I32": torch.int32, "U32": torch.uint32, "I64": torch.int64,
|
| 27 |
+
"F16": torch.float16, "BF16": torch.bfloat16,
|
| 28 |
+
"F32": torch.float32, "F64": torch.float64,
|
| 29 |
+
}
|
| 30 |
+
|
| 31 |
+
|
| 32 |
+
def load_safetensors(path, device=None) -> dict:
|
| 33 |
+
"""读 .safetensors → state_dict。纯 torch 实现。
|
| 34 |
+
|
| 35 |
+
device 给了就把张量搬过去,省得调用方再遍历一遍(发布包里的推理代码
|
| 36 |
+
直接这么用)。
|
| 37 |
+
"""
|
| 38 |
+
path = Path(path)
|
| 39 |
+
with open(path, "rb") as f:
|
| 40 |
+
header_len = struct.unpack("<Q", f.read(8))[0]
|
| 41 |
+
header = json.loads(f.read(header_len))
|
| 42 |
+
blob = f.read()
|
| 43 |
+
|
| 44 |
+
out = {}
|
| 45 |
+
for name, spec in header.items():
|
| 46 |
+
if name == "__metadata__":
|
| 47 |
+
continue
|
| 48 |
+
dtype = _ST_DTYPE.get(spec["dtype"])
|
| 49 |
+
if dtype is None:
|
| 50 |
+
raise ValueError(f"{path} 里未知的 dtype {spec['dtype']}(张量 {name})")
|
| 51 |
+
lo, hi = spec["data_offsets"]
|
| 52 |
+
# 先 bytearray 拷一份再 frombuffer:直接映射 bytes 会得到只读缓冲区上的
|
| 53 |
+
# 张量,torch 会警告"可以写但不该写";而且零拷贝视图会把整个 blob
|
| 54 |
+
# 一直拖在内存里不释放。
|
| 55 |
+
buf = bytearray(blob[lo:hi])
|
| 56 |
+
t = torch.frombuffer(buf, dtype=dtype, count=(hi - lo) // dtype.itemsize)
|
| 57 |
+
t = t.view(*spec["shape"]) if spec["shape"] else t
|
| 58 |
+
out[name] = t.to(device) if device is not None else t
|
| 59 |
+
return out
|
| 60 |
+
|
| 61 |
+
|
| 62 |
+
def load_backbone(ckpt_dir) -> tuple[dict, dict]:
|
| 63 |
+
"""返回 (骨干 state_dict, config dict)。
|
| 64 |
+
|
| 65 |
+
骨干权重在两种格式里都以 bert.* 为前缀(HF 发布包是从 ModernBertForMLM
|
| 66 |
+
存的,预训练 ckpt 同理),这里统一剥掉前缀返回,调用方直接喂给
|
| 67 |
+
ModernBertModel.load_state_dict。
|
| 68 |
+
"""
|
| 69 |
+
ckpt_dir = Path(ckpt_dir)
|
| 70 |
+
cfg_path = ckpt_dir / "config.json"
|
| 71 |
+
if not cfg_path.exists():
|
| 72 |
+
raise SystemExit(f"{ckpt_dir} 下没有 config.json")
|
| 73 |
+
config = json.loads(cfg_path.read_text())
|
| 74 |
+
|
| 75 |
+
pt, st = ckpt_dir / "model.pt", ckpt_dir / "model.safetensors"
|
| 76 |
+
if pt.exists():
|
| 77 |
+
ckpt = torch.load(pt, map_location="cpu", weights_only=False)
|
| 78 |
+
# 有 EMA 就优先用 shadow 权重(更稳),否则用原始权重
|
| 79 |
+
state = ckpt.get("ema") or ckpt["model"]
|
| 80 |
+
elif st.exists():
|
| 81 |
+
state = load_safetensors(st)
|
| 82 |
+
else:
|
| 83 |
+
raise SystemExit(f"{ckpt_dir} 下既没有 model.pt 也没有 model.safetensors")
|
| 84 |
+
|
| 85 |
+
bert = {k[len("bert."):]: v for k, v in state.items() if k.startswith("bert.")}
|
| 86 |
+
if not bert:
|
| 87 |
+
raise SystemExit(
|
| 88 |
+
f"{ckpt_dir} 里没有 bert.* 前缀的张量 —— 这是骨干吗?"
|
| 89 |
+
f"(微调要从骨干开始,不能从另一个微调结果开始)")
|
| 90 |
+
return bert, config
|
csc_model.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
"""BERTc-CSC 推理:中文拼写纠错。
|
| 2 |
|
| 3 |
这份代码随模型一起发到 HF,只依赖同目录的 model.py / tokenizer.py
|
| 4 |
-
和 torch
|
| 5 |
|
| 6 |
from csc_model import BERTcForCSC
|
| 7 |
model = BERTcForCSC.from_pretrained(".")
|
|
@@ -12,7 +12,7 @@ from pathlib import Path
|
|
| 12 |
|
| 13 |
import torch
|
| 14 |
import torch.nn as nn
|
| 15 |
-
from
|
| 16 |
|
| 17 |
from model import ModernBertConfig, ModernBertModel
|
| 18 |
from tokenizer import PieceCharTokenizer
|
|
@@ -36,10 +36,11 @@ class BERTcForCSC(nn.Module):
|
|
| 36 |
@classmethod
|
| 37 |
def from_pretrained(cls, model_dir=".", map_location="cpu"):
|
| 38 |
model_dir = Path(model_dir)
|
| 39 |
-
cfg = ModernBertConfig
|
|
|
|
| 40 |
model = cls(cfg)
|
| 41 |
-
state =
|
| 42 |
-
|
| 43 |
missing, unexpected = model.load_state_dict(state, strict=False)
|
| 44 |
# cor_head.weight 跟 embed 共享,safetensors 不重复存,所以它一定"缺"
|
| 45 |
if set(missing) != {"cor_head.weight"} or unexpected:
|
|
|
|
| 1 |
"""BERTc-CSC 推理:中文拼写纠错。
|
| 2 |
|
| 3 |
这份代码随模型一起发到 HF,只依赖同目录的 model.py / tokenizer.py
|
| 4 |
+
和 torch。
|
| 5 |
|
| 6 |
from csc_model import BERTcForCSC
|
| 7 |
model = BERTcForCSC.from_pretrained(".")
|
|
|
|
| 12 |
|
| 13 |
import torch
|
| 14 |
import torch.nn as nn
|
| 15 |
+
from checkpoint import load_safetensors
|
| 16 |
|
| 17 |
from model import ModernBertConfig, ModernBertModel
|
| 18 |
from tokenizer import PieceCharTokenizer
|
|
|
|
| 36 |
@classmethod
|
| 37 |
def from_pretrained(cls, model_dir=".", map_location="cpu"):
|
| 38 |
model_dir = Path(model_dir)
|
| 39 |
+
cfg = ModernBertConfig.from_dict(
|
| 40 |
+
json.loads((model_dir / "config.json").read_text()))
|
| 41 |
model = cls(cfg)
|
| 42 |
+
state = load_safetensors(model_dir / "model.safetensors",
|
| 43 |
+
device=str(map_location))
|
| 44 |
missing, unexpected = model.load_state_dict(state, strict=False)
|
| 45 |
# cor_head.weight 跟 embed 共享,safetensors 不重复存,所以它一定"缺"
|
| 46 |
if set(missing) != {"cor_head.weight"} or unexpected:
|
model.py
CHANGED
|
@@ -76,11 +76,9 @@ class ModernBertConfig:
|
|
| 76 |
layer_norm_eps: float = 1e-5
|
| 77 |
initializer_range: float = 0.02
|
| 78 |
tie_word_embeddings: bool = True
|
| 79 |
-
#
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
attn_out_dropout: float = 0.1
|
| 83 |
-
attn_probs_dropout: float = 0.0
|
| 84 |
# 架构开关(对齐 release)
|
| 85 |
embed_norm: bool = True # embedding 后立刻 LayerNorm
|
| 86 |
skip_first_prenorm: bool = True # 第 1 层不做 pre-norm
|
|
@@ -88,6 +86,13 @@ class ModernBertConfig:
|
|
| 88 |
# init
|
| 89 |
init_method: str = "megatron" # "megatron"(残差层 ×1/sqrt(2L))或 "normal"
|
| 90 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 91 |
@property
|
| 92 |
def head_dim(self) -> int:
|
| 93 |
assert self.hidden_size % self.num_attention_heads == 0
|
|
@@ -143,11 +148,9 @@ class ModernBertAttention(nn.Module):
|
|
| 143 |
self.num_heads = config.num_attention_heads
|
| 144 |
self.head_dim = config.head_dim
|
| 145 |
self.scale = self.head_dim ** -0.5
|
| 146 |
-
self.attn_probs_dropout = config.attn_probs_dropout
|
| 147 |
# 无 bias
|
| 148 |
self.qkv = nn.Linear(config.hidden_size, 3 * config.hidden_size, bias=False)
|
| 149 |
self.o = nn.Linear(config.hidden_size, config.hidden_size, bias=False)
|
| 150 |
-
self.out_dropout = nn.Dropout(config.attn_out_dropout)
|
| 151 |
|
| 152 |
def forward(self, x: torch.Tensor,
|
| 153 |
block_mask=None,
|
|
@@ -175,11 +178,10 @@ class ModernBertAttention(nn.Module):
|
|
| 175 |
out = F.scaled_dot_product_attention(
|
| 176 |
q, k, v,
|
| 177 |
attn_mask=sdpa_mask,
|
| 178 |
-
dropout_p=self.attn_probs_dropout if self.training else 0.0,
|
| 179 |
is_causal=False,
|
| 180 |
) # [B, h, L, d]
|
| 181 |
out = out.transpose(1, 2).reshape(B, L, H)
|
| 182 |
-
return self.
|
| 183 |
|
| 184 |
|
| 185 |
# ============ GeGLU MLP ============
|
|
@@ -193,11 +195,10 @@ class GeGLU(nn.Module):
|
|
| 193 |
I = config.intermediate_size
|
| 194 |
self.w_in = nn.Linear(config.hidden_size, 2 * I, bias=False)
|
| 195 |
self.w_out = nn.Linear(I, config.hidden_size, bias=False)
|
| 196 |
-
self.dropout = nn.Dropout(config.mlp_dropout)
|
| 197 |
|
| 198 |
def forward(self, x: torch.Tensor) -> torch.Tensor:
|
| 199 |
gate, up = self.w_in(x).chunk(2, dim=-1)
|
| 200 |
-
return self.
|
| 201 |
|
| 202 |
|
| 203 |
# ============ Layer(pre-norm,支持 skip_first_prenorm)============
|
|
@@ -235,7 +236,6 @@ class ModernBertModel(nn.Module):
|
|
| 235 |
)
|
| 236 |
self.embed_norm = (LayerNormNoBias(config.hidden_size, eps=config.layer_norm_eps)
|
| 237 |
if config.embed_norm else nn.Identity())
|
| 238 |
-
self.embed_dropout = nn.Dropout(config.embed_dropout)
|
| 239 |
self.layers = nn.ModuleList(
|
| 240 |
[ModernBertLayer(config, is_first=(i == 0))
|
| 241 |
for i in range(config.num_hidden_layers)]
|
|
@@ -284,7 +284,6 @@ class ModernBertModel(nn.Module):
|
|
| 284 |
x = self.embed(input_ids)
|
| 285 |
x = x + self.pos_emb(L).to(x.dtype) # 加 scaled sinusoidal PE
|
| 286 |
x = self.embed_norm(x)
|
| 287 |
-
x = self.embed_dropout(x)
|
| 288 |
|
| 289 |
block_mask = self._build_block_mask(seg_ids, B, L) if seg_ids is not None else None
|
| 290 |
|
|
|
|
| 76 |
layer_norm_eps: float = 1e-5
|
| 77 |
initializer_range: float = 0.02
|
| 78 |
tie_word_embeddings: bool = True
|
| 79 |
+
# 全程无 dropout:预训练数据量远大于参数量,不存在过拟合,dropout 只拖慢
|
| 80 |
+
# 收敛。所以没有 dropout 配置项 —— 已发布的 config.json 里那几个 dropout
|
| 81 |
+
# 字段都是 0,load_backbone 按字段名过滤,多出来的会被忽略。
|
|
|
|
|
|
|
| 82 |
# 架构开关(对齐 release)
|
| 83 |
embed_norm: bool = True # embedding 后立刻 LayerNorm
|
| 84 |
skip_first_prenorm: bool = True # 第 1 层不做 pre-norm
|
|
|
|
| 86 |
# init
|
| 87 |
init_method: str = "megatron" # "megatron"(残差层 ×1/sqrt(2L))或 "normal"
|
| 88 |
|
| 89 |
+
@classmethod
|
| 90 |
+
def from_dict(cls, d: dict) -> "ModernBertConfig":
|
| 91 |
+
"""按字段名过滤后构造。config.json 可能带这个版本不认识的键 ——
|
| 92 |
+
已发布的六个模型就带着四个 dropout 字段(现在全程无 dropout,字段去掉了),
|
| 93 |
+
直接 `ModernBertConfig(**d)` 会 TypeError。"""
|
| 94 |
+
return cls(**{k: v for k, v in d.items() if k in cls.__dataclass_fields__})
|
| 95 |
+
|
| 96 |
@property
|
| 97 |
def head_dim(self) -> int:
|
| 98 |
assert self.hidden_size % self.num_attention_heads == 0
|
|
|
|
| 148 |
self.num_heads = config.num_attention_heads
|
| 149 |
self.head_dim = config.head_dim
|
| 150 |
self.scale = self.head_dim ** -0.5
|
|
|
|
| 151 |
# 无 bias
|
| 152 |
self.qkv = nn.Linear(config.hidden_size, 3 * config.hidden_size, bias=False)
|
| 153 |
self.o = nn.Linear(config.hidden_size, config.hidden_size, bias=False)
|
|
|
|
| 154 |
|
| 155 |
def forward(self, x: torch.Tensor,
|
| 156 |
block_mask=None,
|
|
|
|
| 178 |
out = F.scaled_dot_product_attention(
|
| 179 |
q, k, v,
|
| 180 |
attn_mask=sdpa_mask,
|
|
|
|
| 181 |
is_causal=False,
|
| 182 |
) # [B, h, L, d]
|
| 183 |
out = out.transpose(1, 2).reshape(B, L, H)
|
| 184 |
+
return self.o(out)
|
| 185 |
|
| 186 |
|
| 187 |
# ============ GeGLU MLP ============
|
|
|
|
| 195 |
I = config.intermediate_size
|
| 196 |
self.w_in = nn.Linear(config.hidden_size, 2 * I, bias=False)
|
| 197 |
self.w_out = nn.Linear(I, config.hidden_size, bias=False)
|
|
|
|
| 198 |
|
| 199 |
def forward(self, x: torch.Tensor) -> torch.Tensor:
|
| 200 |
gate, up = self.w_in(x).chunk(2, dim=-1)
|
| 201 |
+
return self.w_out(F.gelu(gate) * up)
|
| 202 |
|
| 203 |
|
| 204 |
# ============ Layer(pre-norm,支持 skip_first_prenorm)============
|
|
|
|
| 236 |
)
|
| 237 |
self.embed_norm = (LayerNormNoBias(config.hidden_size, eps=config.layer_norm_eps)
|
| 238 |
if config.embed_norm else nn.Identity())
|
|
|
|
| 239 |
self.layers = nn.ModuleList(
|
| 240 |
[ModernBertLayer(config, is_first=(i == 0))
|
| 241 |
for i in range(config.num_hidden_layers)]
|
|
|
|
| 284 |
x = self.embed(input_ids)
|
| 285 |
x = x + self.pos_emb(L).to(x.dtype) # 加 scaled sinusoidal PE
|
| 286 |
x = self.embed_norm(x)
|
|
|
|
| 287 |
|
| 288 |
block_mask = self._build_block_mask(seg_ids, B, L) if seg_ids is not None else None
|
| 289 |
|