cortiq-cli 0.8.45

Command-line tools for the CMF model format: inspect, convert, run and serve .cmf models.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
//! CMF → CMF rewrites for `compress`: copy a container tensor by tensor,
//! replacing some tensors with new f32 values (a narrowed FFN), and either
//! keep every other payload byte for byte or re-encode the float 2-D
//! weights into a converter profile (the q8_2f calibration sibling, or a
//! final codec that needs no GPTQ).

use crate::convert::{Quant, effective_quant, keeps_float, quantize_2d};
use anyhow::{Result, anyhow};
use cortiq_core::format::{CmfHeader, CmfModel, CmfStreamWriter, TensorEntry};
use cortiq_core::types::TensorDtype;
use std::path::Path;

/// A replacement tensor: its new shape and f32 values.
pub type Replacement = (Vec<usize>, Vec<f32>);

/// How the payloads of the new file are encoded.
#[derive(Clone, Copy, Debug)]
pub enum Encoding {
    /// Copy every tensor that is not replaced; replacements are stored as
    /// f16 (the working precision of the compress stages).
    KeepF16,
    /// Re-encode every float 2-D weight (replaced or copied) by the
    /// converter's per-tensor policy for this profile; norms and the
    /// names the converter keeps in float are copied.
    Profile(Quant),
    /// Copy every tensor that is not replaced; a replacement is encoded in
    /// its source tensor's codec (a one-tensor edit of a finished file).
    Keep,
}

pub fn tensor_f32(model: &CmfModel, e: &TensorEntry) -> Result<Vec<f32>> {
    let mut v = vec![0f32; e.n_elems()];
    cortiq_core::quant::dequant_tensor_par(e, model.entry_bytes(e), &mut v, super::stages::cpu_budget())
        .map_err(|err| anyhow!("dequantizing {}: {err}", e.name))?;
    Ok(v)
}

fn is_float(d: TensorDtype) -> bool {
    matches!(d, TensorDtype::F16 | TensorDtype::F32 | TensorDtype::Bf16)
}

/// One output tensor before it is pushed.
enum Out {
    Copy,
    Encoded(TensorDtype, Vec<usize>, Vec<u8>),
}

/// Write `out` from `src`. `replace(name)` returns the new tensor for names
/// it rewrites; `edit` adjusts the cloned header (arch, provenance).
/// Section hashes are recomputed by the writer; task masks are dropped (a
/// mask over a narrowed FFN would gate the wrong neurons). Returns the
/// written file's size.
pub fn rewrite(
    src: &CmfModel,
    out: &Path,
    enc: Encoding,
    replace: &(dyn Fn(&str) -> Result<Option<Replacement>> + Sync),
    edit: &dyn Fn(&mut CmfHeader),
    threads: usize,
) -> Result<u64> {
    let arch = src.arch().clone();
    let avg = src.tensors.iter().map(|e| e.name.len()).sum::<usize>() / src.tensors.len().max(1);
    if let Some(dir) = out.parent() {
        std::fs::create_dir_all(dir)?;
    }
    let tmp = out.with_extension("cmf.partial");
    let _ = std::fs::remove_file(&tmp);
    let mut w = CmfStreamWriter::new(&tmp, CmfStreamWriter::head_reserve_for(src.tensors.len(), avg))?;
    let encode_one = |e: &TensorEntry| -> Result<Out> {
        let rep = replace(&e.name)?;
        let reencode = match enc {
            Encoding::KeepF16 | Encoding::Keep => false,
            Encoding::Profile(_) => {
                e.shape.len() == 2 && !keeps_float(&e.name) && (is_float(e.dtype) || rep.is_some())
            }
        };
        match (rep, enc) {
            (None, _) if !reencode => Ok(Out::Copy),
            (Some((shape, vals)), Encoding::KeepF16) => {
                let (dt, bytes) = if shape.len() == 2 {
                    quantize_2d(Quant::F16, &vals, shape[0], shape[1])
                } else {
                    // 1-D replacements (biases, norms) keep the source dtype
                    // when it is float, else f32.
                    match e.dtype {
                        TensorDtype::F16 => quantize_2d(Quant::F16, &vals, 1, vals.len()),
                        _ => (TensorDtype::F32, vals.iter().flat_map(|v| v.to_le_bytes()).collect()),
                    }
                };
                Ok(Out::Encoded(dt, shape, bytes))
            }
            (rep, Encoding::Profile(q)) => {
                let (shape, vals) = match rep {
                    Some(r) => r,
                    None => (e.shape.clone(), tensor_f32(src, e)?),
                };
                if shape.len() != 2 {
                    let bytes = vals.iter().flat_map(|v| v.to_le_bytes()).collect();
                    return Ok(Out::Encoded(TensorDtype::F32, shape, bytes));
                }
                let codec = effective_quant(&arch, q, &e.name);
                let (dt, bytes) = quantize_2d(codec, &vals, shape[0], shape[1]);
                Ok(Out::Encoded(dt, shape, bytes))
            }
            (Some((shape, vals)), Encoding::Keep) => {
                let codec = crate::tube::quant_of(e.dtype);
                let (dt, bytes) = match (shape.len(), codec) {
                    (2, Some(q)) => quantize_2d(q, &vals, shape[0], shape[1]),
                    (2, None) => anyhow::bail!("{}: no encoder for its codec {:?}", e.name, e.dtype),
                    _ if e.dtype == TensorDtype::F16 => quantize_2d(Quant::F16, &vals, 1, vals.len()),
                    _ => (TensorDtype::F32, vals.iter().flat_map(|v| v.to_le_bytes()).collect()),
                };
                Ok(Out::Encoded(dt, shape, bytes))
            }
            (None, Encoding::KeepF16 | Encoding::Keep) => Ok(Out::Copy),
        }
    };
    // Encode a batch of tensors in parallel, push them in directory order.
    let threads = threads.max(1);
    for batch in src.tensors.chunks(threads) {
        let outs: Vec<Result<Out>> = std::thread::scope(|s| {
            let hs: Vec<_> = batch.iter().map(|e| s.spawn(|| encode_one(e))).collect();
            hs.into_iter().map(|h| h.join().unwrap_or_else(|_| Err(anyhow!("encoder panicked")))).collect()
        });
        for (e, o) in batch.iter().zip(outs) {
            match o? {
                Out::Copy => w.push_bounded(&e.name, e.dtype, &e.shape, src.entry_bytes(e), 1 << 28)?,
                Out::Encoded(dt, shape, bytes) => w.push(&e.name, dt, &shape, &bytes)?,
            }
        }
    }
    let mut header = src.header.clone();
    header.section_hashes = None;
    header.segments.clear();
    edit(&mut header);
    w.finish(&header, None, src.vocab.as_deref())?;
    std::fs::rename(&tmp, out)?;
    Ok(std::fs::metadata(out)?.len())
}

/// Copy `src` to `out` with an edited header only (provenance stamp).
pub fn restamp(src: &CmfModel, out: &Path, edit: &dyn Fn(&mut CmfHeader)) -> Result<u64> {
    rewrite(src, out, Encoding::KeepF16, &|_| Ok(None), edit, 1)
}

/// Merge `entry` into `header.provenance[key]`.
pub fn provenance_set(header: &mut CmfHeader, key: &str, entry: serde_json::Value) {
    let mut prov = header.provenance.clone().unwrap_or_else(|| serde_json::json!({}));
    if !prov.is_object() {
        prov = serde_json::json!({ "previous": prov });
    }
    prov[key] = entry;
    header.provenance = Some(prov);
}

/// The rows `keep` of a binary low-rank tensor (dtype 19): each path's
/// output scales `h` and the rows of its `U` bits; `g`, `ℓ`, `V` stay.
/// Layout: 16-byte head (`np` at byte 2, `r`, `m`, `n` as u32 at 4, 8, 12),
/// then per path `h[m]`, `g[n]`, `ℓ[r]` (f16), `U` (m rows of r bits),
/// `V` (r rows of n bits).
pub fn blr_rows(bytes: &[u8], keep: &[usize]) -> Result<Vec<u8>> {
    blr_subset(bytes, Some(keep), None)
}

/// The columns `keep` of a binary low-rank tensor: each path's input scales
/// `g` and the matching bit of every `V` row.
pub fn blr_cols(bytes: &[u8], keep: &[usize]) -> Result<Vec<u8>> {
    blr_subset(bytes, None, Some(keep))
}

fn blr_subset(bytes: &[u8], rows: Option<&[usize]>, cols: Option<&[usize]>) -> Result<Vec<u8>> {
    anyhow::ensure!(bytes.len() >= 16, "blr: {} bytes", bytes.len());
    let u = |o: usize| u32::from_le_bytes(bytes[o..o + 4].try_into().unwrap()) as usize;
    let (np, r, m, n) = (bytes[2] as usize, u(4), u(8), u(12));
    anyhow::ensure!(r % 8 == 0 && n % 8 == 0, "blr: rank {r} / columns {n} not byte-aligned");
    let per = 2 * m + 2 * n + 2 * r + m * r / 8 + r * n / 8;
    anyhow::ensure!(bytes.len() == 16 + np * per, "blr: {} bytes, expected {} ({np} paths, r {r}, {m}×{n})", bytes.len(), 16 + np * per);
    let rk: Vec<usize> = rows.map_or_else(|| (0..m).collect(), <[usize]>::to_vec);
    let ck: Vec<usize> = cols.map_or_else(|| (0..n).collect(), <[usize]>::to_vec);
    anyhow::ensure!(rk.iter().all(|&i| i < m) && ck.iter().all(|&j| j < n), "blr: kept index out of range");
    let (m2, n2) = (rk.len(), ck.len());
    anyhow::ensure!(n2 % 8 == 0, "blr: {n2} kept columns are not byte-aligned");
    let mut out = bytes[..16].to_vec();
    out[8..12].copy_from_slice(&(m2 as u32).to_le_bytes());
    out[12..16].copy_from_slice(&(n2 as u32).to_le_bytes());
    let mut off = 16;
    for _ in 0..np {
        let (h, g, l) = (&bytes[off..off + 2 * m], &bytes[off + 2 * m..off + 2 * m + 2 * n], &bytes[off + 2 * m + 2 * n..off + 2 * m + 2 * n + 2 * r]);
        let ub = &bytes[off + 2 * (m + n + r)..off + 2 * (m + n + r) + m * r / 8];
        let vb = &bytes[off + 2 * (m + n + r) + m * r / 8..off + per];
        for &i in &rk {
            out.extend_from_slice(&h[2 * i..2 * i + 2]);
        }
        for &j in &ck {
            out.extend_from_slice(&g[2 * j..2 * j + 2]);
        }
        out.extend_from_slice(l);
        for &i in &rk {
            out.extend_from_slice(&ub[i * r / 8..(i + 1) * r / 8]);
        }
        for k in 0..r {
            let row = &vb[k * n / 8..(k + 1) * n / 8];
            let mut packed = vec![0u8; n2 / 8];
            for (q, &j) in ck.iter().enumerate() {
                if (row[j / 8] >> (j % 8)) & 1 == 1 {
                    packed[q / 8] |= 1 << (q % 8);
                }
            }
            out.extend_from_slice(&packed);
        }
        off += per;
    }
    Ok(out)
}

/// Drop FFN neurons from every layer: `keep[l]` (ascending) are the
/// intermediate neurons layer `l` keeps — rows of gate/up (and their
/// biases), columns of down. Binary low-rank tensors are cut in place (no
/// re-encoding); others are decoded, cut and re-encoded in their own
/// codec. The header's `intermediate_size` becomes the widest layer.
pub fn subset_ffn(src: &CmfModel, out: &Path, keep: &[Vec<usize>], edit: &dyn Fn(&mut CmfHeader)) -> Result<u64> {
    use crate::convert::encode_for;
    if let Some(dir) = out.parent() {
        std::fs::create_dir_all(dir)?;
    }
    let tmp = out.with_extension("cmf.partial");
    let _ = std::fs::remove_file(&tmp);
    let avg = src.tensors.iter().map(|e| e.name.len()).sum::<usize>() / src.tensors.len().max(1);
    let mut w = CmfStreamWriter::new(&tmp, CmfStreamWriter::head_reserve_for(src.tensors.len(), avg))?;
    fn layer_of(name: &str) -> Option<(usize, &str)> {
        let t = name.strip_prefix("model.layers.")?;
        let (l, rest) = t.split_once('.')?;
        Some((l.parse().ok()?, rest))
    }
    let reencode = |e: &TensorEntry, vals: &[f32], shape: &[usize]| -> (TensorDtype, Vec<u8>) {
        match e.dtype {
            TensorDtype::F32 => (TensorDtype::F32, vals.iter().flat_map(|v| v.to_le_bytes()).collect()),
            TensorDtype::Q4Tiled | TensorDtype::Q4TiledP | TensorDtype::Q4Block | TensorDtype::Q8Row | TensorDtype::Q8_2f | TensorDtype::F16 => {
                (e.dtype, encode_for(e.dtype, vals, shape[0], shape.get(1).copied().unwrap_or(1)))
            }
            _ => (TensorDtype::F16, encode_for(TensorDtype::F16, vals, shape[0], shape.get(1).copied().unwrap_or(1))),
        }
    };
    for e in &src.tensors {
        let cut = layer_of(&e.name).and_then(|(l, rest)| {
            let k = keep.get(l)?;
            match rest {
                "mlp.gate_proj.weight" | "mlp.up_proj.weight" | "mlp.gate_proj.bias" | "mlp.up_proj.bias" => Some((k, true)),
                "mlp.down_proj.weight" => Some((k, false)),
                _ => None,
            }
        });
        let Some((k, rows)) = cut else {
            w.push_bounded(&e.name, e.dtype, &e.shape, src.entry_bytes(e), 1 << 28)?;
            continue;
        };
        if e.dtype == TensorDtype::BinaryLowRank {
            let b = if rows { blr_rows(src.entry_bytes(e), k)? } else { blr_cols(src.entry_bytes(e), k)? };
            let shape = if rows { vec![k.len(), e.shape[1]] } else { vec![e.shape[0], k.len()] };
            w.push(&e.name, e.dtype, &shape, &b)?;
            continue;
        }
        let v = tensor_f32(src, e)?;
        let (shape, vals): (Vec<usize>, Vec<f32>) = if e.shape.len() == 1 {
            (vec![k.len()], k.iter().map(|&i| v[i]).collect())
        } else if rows {
            let cols = e.shape[1];
            (vec![k.len(), cols], k.iter().flat_map(|&i| v[i * cols..(i + 1) * cols].iter().copied()).collect())
        } else {
            let (m, n) = (e.shape[0], e.shape[1]);
            (vec![m, k.len()], (0..m).flat_map(|i| k.iter().map(move |&j| (i, j))).map(|(i, j)| v[i * n + j]).collect())
        };
        let (dt, bytes) = reencode(e, &vals, &shape);
        w.push(&e.name, dt, &shape, &bytes)?;
    }
    let mut header = src.header.clone();
    header.section_hashes = None;
    header.segments.clear();
    header.arch.intermediate_size = keep.iter().map(Vec::len).max().unwrap_or(header.arch.intermediate_size);
    edit(&mut header);
    w.finish(&header, None, src.vocab.as_deref())?;
    std::fs::rename(&tmp, out)?;
    Ok(std::fs::metadata(out)?.len())
}

#[cfg(test)]
mod tests {
    use super::*;

    /// A random binary low-rank blob with `np` paths.
    fn blob(np: usize, r: usize, m: usize, n: usize, seed: u64) -> Vec<u8> {
        let mut s = seed | 1;
        let mut next = || {
            s ^= s << 13;
            s ^= s >> 7;
            s ^= s << 17;
            s
        };
        let mut b = vec![1u8, 0, np as u8, 0];
        for v in [r, m, n] {
            b.extend_from_slice(&(v as u32).to_le_bytes());
        }
        for _ in 0..np {
            for _ in 0..(m + n + r) {
                let x = cortiq_core::quant::f32_to_f16(0.5 + (next() % 1000) as f32 / 1000.0);
                b.extend_from_slice(&x.to_le_bytes());
            }
            for _ in 0..(m * r / 8 + r * n / 8) {
                b.push(next() as u8);
            }
        }
        b
    }

    /// The dense matrix of a blob: Σ_p diag(h)·U·diag(ℓ)·V·diag(g), bits ±1.
    fn dense(b: &[u8]) -> (usize, usize, Vec<f64>) {
        let u = |o: usize| u32::from_le_bytes(b[o..o + 4].try_into().unwrap()) as usize;
        let (np, r, m, n) = (b[2] as usize, u(4), u(8), u(12));
        let f = |o: usize| cortiq_core::quant::f16_to_f32(u16::from_le_bytes([b[o], b[o + 1]])) as f64;
        let mut w = vec![0f64; m * n];
        let mut off = 16;
        for _ in 0..np {
            let (ho, go, lo) = (off, off + 2 * m, off + 2 * m + 2 * n);
            let uo = lo + 2 * r;
            let vo = uo + m * r / 8;
            let bit = |base: usize, row: usize, width: usize, k: usize| if (b[base + row * width / 8 + k / 8] >> (k % 8)) & 1 == 1 { 1.0 } else { -1.0 };
            for i in 0..m {
                for j in 0..n {
                    let mut acc = 0.0;
                    for k in 0..r {
                        acc += bit(uo, i, r, k) * f(lo + 2 * k) * bit(vo, k, n, j);
                    }
                    w[i * n + j] += f(ho + 2 * i) * acc * f(go + 2 * j);
                }
            }
            off = vo + r * n / 8;
        }
        (m, n, w)
    }

    /// `Encoding::Keep`: a replaced 2-D tensor is written in its source's
    /// codec (q8_2f stays q8_2f), a replaced 1-D one in f16 when it was f16,
    /// and every other tensor is copied byte for byte.
    #[test]
    fn keep_encoding_rewrites_only_the_replacements() {
        let dir = std::env::temp_dir().join(format!("cmfio-keep-{}", std::process::id()));
        std::fs::create_dir_all(&dir).unwrap();
        let (src, out) = (dir.join("src.cmf"), dir.join("out.cmf"));
        let header: CmfHeader = serde_json::from_value(serde_json::json!({
            "format": "cmf", "version": 2, "quant_type": "F32",
            "arch": {
                "arch_name": "tiny-test", "hidden_size": 32, "intermediate_size": 64, "num_layers": 1,
                "num_attention_heads": 2, "num_kv_heads": 1, "head_dim": 16, "vocab_size": 10,
                "layer_types": ["FullAttention"], "rms_norm_eps": 1e-6, "max_position_embeddings": 64
            }
        }))
        .unwrap();
        let w: Vec<f32> = (0..64 * 32).map(|i| ((i * 37 % 101) as f32 - 50.0) / 64.0).collect();
        let (dt, wq) = quantize_2d(Quant::Q8_2f, &w, 64, 32);
        let norm: Vec<u8> = (0..32).flat_map(|i| cortiq_core::quant::f32_to_f16(1.0 + i as f32 / 64.0).to_le_bytes()).collect();
        let other: Vec<u8> = (0..32u16).flat_map(|i| cortiq_core::quant::f32_to_f16(i as f32).to_le_bytes()).collect();
        let mut wr = CmfStreamWriter::new(&src, CmfStreamWriter::head_reserve_for(3, 32)).unwrap();
        wr.push("model.layers.0.mlp.down_proj.weight", dt, &[64, 32], &wq).unwrap();
        wr.push("model.mtp.hnorm.weight", TensorDtype::F16, &[32], &norm).unwrap();
        wr.push("model.norm.weight", TensorDtype::F16, &[32], &other).unwrap();
        wr.finish(&header, None, None).unwrap();
        let m = CmfModel::open_sharded(&src).unwrap();
        let w2: Vec<f32> = w.iter().map(|x| -x).collect();
        rewrite(
            &m,
            &out,
            Encoding::Keep,
            &|name| {
                Ok(match name {
                    "model.layers.0.mlp.down_proj.weight" => Some((vec![64, 32], w2.clone())),
                    "model.mtp.hnorm.weight" => Some((vec![32], vec![1.0; 32])),
                    _ => None,
                })
            },
            &|_| {},
            1,
        )
        .unwrap();
        let o = CmfModel::open_sharded(&out).unwrap();
        let e = o.tensor("model.layers.0.mlp.down_proj.weight").unwrap();
        assert_eq!(e.dtype, TensorDtype::Q8_2f, "the replacement keeps its source's codec");
        let back = tensor_f32(&o, e).unwrap();
        assert!(back.iter().zip(&w2).all(|(a, b)| (a - b).abs() < 0.02), "the replaced values were written");
        let h = o.tensor("model.mtp.hnorm.weight").unwrap();
        assert_eq!(h.dtype, TensorDtype::F16);
        assert!(tensor_f32(&o, h).unwrap().iter().all(|&x| x == 1.0));
        let n = o.tensor("model.norm.weight").unwrap();
        assert_eq!(o.entry_bytes(n), m.entry_bytes(m.tensor("model.norm.weight").unwrap()), "untouched tensors are copied");
        let _ = std::fs::remove_dir_all(&dir);
    }

    #[test]
    fn blr_cuts_match_the_dense_cuts() {
        let b = blob(2, 16, 24, 32, 7);
        let (m, n, w) = dense(&b);
        let rows = [1usize, 4, 5, 9, 23];
        let (m2, n2, wr) = dense(&blr_rows(&b, &rows).unwrap());
        assert_eq!((m2, n2), (rows.len(), n));
        for (q, &i) in rows.iter().enumerate() {
            for j in 0..n {
                assert_eq!(wr[q * n + j], w[i * n + j]);
            }
        }
        let cols: Vec<usize> = (0..n).filter(|j| j % 4 != 1).collect();
        let (m3, n3, wc) = dense(&blr_cols(&b, &cols).unwrap());
        assert_eq!((m3, n3), (m, cols.len()));
        for i in 0..m {
            for (q, &j) in cols.iter().enumerate() {
                assert_eq!(wc[i * n3 + q], w[i * n + j]);
            }
        }
        assert!(blr_cols(&b, &[0, 1, 2]).is_err(), "unaligned column count");
    }
}