mirror of
https://github.com/ollama/ollama.git
synced 2026-07-07 00:08:13 +00:00
This is a rewrite of the create functionality for the MLX engine. The core idea behind the create functionality is to break the import/convert into a pipeline of distinct phases: * Read (scan the safetensors directory for the various bits of metadata) * Classify (determine what the import type) * Plan (determine any transforms that need to be done) * Write (transform any data as necessary and write out the blobs) * Create the manifest Each architecture has a "policy" which determines how to convert the model correctly. A number of different formats for safetensors are supported including: * nvfp4 (two formats: model optimized, torch) * fp8 datatypes (convert to mxfp8) * standard bf16 based weights A number of cleanups/simplifications have been done including: * using the baked in names for the tensors instead of munging them into something else * unified 3d expert tensors (instead of separate per expert tensors) * fewer unnecessary transforms to the various tensors in a model (keep a model as close to the source as possible) * unified capability checking * draft model handling (for MTP) is done on the same path Image generation has been intentionally removed.
183 lines
5.7 KiB
Go
183 lines
5.7 KiB
Go
package create
|
|
|
|
import (
|
|
"slices"
|
|
"testing"
|
|
)
|
|
|
|
func specByName(specs []BlobSpec, name string) (BlobSpec, bool) {
|
|
for _, s := range specs {
|
|
if s.Name == name {
|
|
return s, true
|
|
}
|
|
}
|
|
return BlobSpec{}, false
|
|
}
|
|
|
|
func inputByOutput(spec BlobSpec, outputName string) (TensorSpec, bool) {
|
|
for _, ts := range spec.Tensors {
|
|
if ts.Name == outputName {
|
|
return ts, true
|
|
}
|
|
}
|
|
return TensorSpec{}, false
|
|
}
|
|
|
|
// sourceName returns the (single) source tensor name for a TensorSpec.
|
|
func sourceName(ts TensorSpec) string {
|
|
if len(ts.Sources) == 0 {
|
|
return ""
|
|
}
|
|
return ts.Sources[0].Name
|
|
}
|
|
|
|
func specNames(specs []BlobSpec) []string {
|
|
names := make([]string, len(specs))
|
|
for i, s := range specs {
|
|
names[i] = s.Name
|
|
}
|
|
return names
|
|
}
|
|
|
|
func TestPlanPrequantizedMLX(t *testing.T) {
|
|
cfg := sourceModelConfig{Quantization: sourceQuantization{Bits: 4, Mode: "affine", GroupSize: 32}}
|
|
inv := newInventory(cfg, map[string]string{
|
|
"l.weight": "U32",
|
|
"l.scales": "BF16",
|
|
"l.biases": "BF16",
|
|
"norm.weight": "BF16",
|
|
})
|
|
|
|
specs, err := Plan(inv, Classification{Kind: SourcePrequantized}, defaultQuantPolicy{})
|
|
if err != nil {
|
|
t.Fatalf("Plan() error = %v", err)
|
|
}
|
|
// l.weight (fused with scales+biases) and norm.weight (pass-through).
|
|
if len(specs) != 2 {
|
|
t.Fatalf("got %d specs %v, want 2", len(specs), specNames(specs))
|
|
}
|
|
|
|
w, ok := specByName(specs, "l.weight")
|
|
if !ok {
|
|
t.Fatal("missing l.weight blob")
|
|
}
|
|
for _, want := range []string{"l.weight", "l.weight.scale", "l.weight.bias"} {
|
|
in, ok := inputByOutput(w, want)
|
|
if !ok {
|
|
t.Fatalf("l.weight blob missing input %q", want)
|
|
}
|
|
if in.Transform != TransformNone {
|
|
t.Errorf("%s transform = %q, want none", want, in.Transform)
|
|
}
|
|
}
|
|
if w.Metadata["quant_type"] != "int4" || w.Metadata["group_size"] != "32" {
|
|
t.Errorf("metadata = %v, want quant_type=int4 group_size=32 from config", w.Metadata)
|
|
}
|
|
if _, ok := specByName(specs, "norm.weight"); !ok {
|
|
t.Error("norm.weight should pass through as its own blob")
|
|
}
|
|
}
|
|
|
|
func TestPlanPrequantizedModelOptNVFP4(t *testing.T) {
|
|
inv := newInventory(sourceModelConfig{}, map[string]string{
|
|
"l.weight": "U8",
|
|
"l.weight_scale": "F8_E4M3",
|
|
"l.weight_scale_2": "F32",
|
|
})
|
|
|
|
specs, err := Plan(inv, Classification{Kind: SourcePrequantized}, defaultQuantPolicy{})
|
|
if err != nil {
|
|
t.Fatalf("Plan() error = %v", err)
|
|
}
|
|
if len(specs) != 1 {
|
|
t.Fatalf("got %d specs %v, want 1", len(specs), specNames(specs))
|
|
}
|
|
w := specs[0]
|
|
if w.Name != "l.weight" {
|
|
t.Fatalf("blob name = %q, want l.weight", w.Name)
|
|
}
|
|
|
|
weightIn, _ := inputByOutput(w, "l.weight")
|
|
if weightIn.Transform != TransformRepackFP4 || weightIn.OutDtype != "U32" || !slices.Equal(weightIn.OutShape, []int32{128, 32}) {
|
|
t.Errorf("weight input = %+v, want repack to U32 [128 32]", weightIn)
|
|
}
|
|
scaleIn, _ := inputByOutput(w, "l.weight.scale")
|
|
if scaleIn.Transform != TransformRelabelU8 || scaleIn.OutDtype != "U8" {
|
|
t.Errorf("scale input = %+v, want relabel to U8", scaleIn)
|
|
}
|
|
globalIn, ok := inputByOutput(w, "l.weight.global_scale")
|
|
if !ok || globalIn.Transform != TransformScalarF32 {
|
|
t.Errorf("global_scale input = %+v ok=%v, want scalar_f32 (stored as-is)", globalIn, ok)
|
|
}
|
|
if w.Metadata["quant_type"] != "nvfp4" {
|
|
t.Errorf("quant_type = %q, want nvfp4", w.Metadata["quant_type"])
|
|
}
|
|
if _, ok := w.Metadata["group_size"]; ok {
|
|
t.Errorf("ModelOpt should not default group_size: %v", w.Metadata)
|
|
}
|
|
}
|
|
|
|
func TestPlanPrequantizedModelOptDropsActivationScale(t *testing.T) {
|
|
// ModelOpt ships per-weight activation scales (.input_scale and, in some
|
|
// variants, .input_global_scale) that are unused for weight-only
|
|
// inference. They must be consumed, not emitted as their own blobs.
|
|
inv := newInventory(sourceModelConfig{}, map[string]string{
|
|
"l.weight": "U8",
|
|
"l.weight_scale": "F8_E4M3",
|
|
"l.weight_scale_2": "F32",
|
|
"l.input_scale": "F32",
|
|
"l.input_global_scale": "F32",
|
|
})
|
|
|
|
specs, err := Plan(inv, Classification{Kind: SourcePrequantized}, defaultQuantPolicy{})
|
|
if err != nil {
|
|
t.Fatalf("Plan() error = %v", err)
|
|
}
|
|
if len(specs) != 1 {
|
|
t.Fatalf("got %d specs %v, want 1 (activation scales must not become blobs)", len(specs), specNames(specs))
|
|
}
|
|
w := specs[0]
|
|
for _, act := range []string{"l.input_scale", "l.input_global_scale"} {
|
|
if _, leaked := inputByOutput(w, act); leaked {
|
|
t.Errorf("activation scale %s leaked into the fused blob", act)
|
|
}
|
|
for _, s := range specs {
|
|
if s.Name == act {
|
|
t.Errorf("activation scale %s emitted as its own blob", act)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPlanPrequantizedCompressedNVFP4(t *testing.T) {
|
|
inv := newInventory(sourceModelConfig{}, map[string]string{
|
|
"l.weight_packed": "U8",
|
|
"l.weight_scale": "F8_E4M3",
|
|
"l.weight_global_scale": "F32",
|
|
"l.input_global_scale": "F32",
|
|
})
|
|
|
|
specs, err := Plan(inv, Classification{Kind: SourcePrequantized}, defaultQuantPolicy{})
|
|
if err != nil {
|
|
t.Fatalf("Plan() error = %v", err)
|
|
}
|
|
if len(specs) != 1 {
|
|
t.Fatalf("got %d specs %v, want 1 (input_global_scale must be consumed)", len(specs), specNames(specs))
|
|
}
|
|
w := specs[0]
|
|
if w.Name != "l.weight" {
|
|
t.Fatalf("blob name = %q, want l.weight", w.Name)
|
|
}
|
|
|
|
weightIn, _ := inputByOutput(w, "l.weight")
|
|
if sourceName(weightIn) != "l.weight_packed" || weightIn.Transform != TransformRepackFP4 {
|
|
t.Errorf("weight input = %+v, want source l.weight_packed repacked", weightIn)
|
|
}
|
|
globalIn, ok := inputByOutput(w, "l.weight.global_scale")
|
|
if !ok || globalIn.Transform != TransformReciprocalF32 {
|
|
t.Errorf("global_scale input = %+v ok=%v, want reciprocal_f32", globalIn, ok)
|
|
}
|
|
if w.Metadata["quant_type"] != "nvfp4" || w.Metadata["group_size"] != "16" {
|
|
t.Errorf("metadata = %v, want quant_type=nvfp4 group_size=16", w.Metadata)
|
|
}
|
|
}
|