mirror of
https://github.com/ollama/ollama.git
synced 2026-09-21 13:38:14 -05:00
The MLX runner is the only Go inference runner left and is no longer experimental, so its packages leave x/. The bindings become a top-level mlx package beside the carried patches in mlx/compat, mirroring how llama/ holds the llama.cpp integration, and the runner becomes mlxrunner with the architectures nested under the package they implement. Subpackages move with their parent unless listed. x/mlxrunner/mlx mlx x/internal/mlxthread mlx/mlxthread x/internal/mlxthreadtest mlx/mlxthread/mlxthreadtest x/internal/mlxtest mlx/mlxtest x/quant mlx/quant mlx/compat/*.patch mlx/compat/mlx-c (MLX patches go in mlx/compat/mlx) x/mlxrunner mlxrunner x/models/nn mlxrunner/nn x/models/<arch> mlxrunner/model/<arch> x/mlxrunner/imports.go mlxrunner/model/architectures (new package) x/create create x/safetensors fs/safetensors x/tokenizer mlxrunner/tokenizer Every package keeps its name, so the Go changes are the import path rewrites the moves force, and the CMake, Dockerfile, CI cache keys, drift check and Darwin payload script follow the new paths. Four edits are not paths: the runner's blank architecture imports become the package mlxrunner/model/architectures, so the list to extend for a new model sits beside the architecture directories; a depguard rule keeps the two test harnesses out of non-test code, as the x/internal placement used to; the CI change filter's two entries for the long-deleted x/imagegen/mlx now name the bindings' CMake project and the carried patches, so a change to either builds the payload; and the tokenizer parity test reads its fixtures from its own testdata instead of walking out of x/. x/server and x/imagegen/manifest stay for the next two commits.
185 lines
5.9 KiB
Go
185 lines
5.9 KiB
Go
package mlx
|
|
|
|
import (
|
|
"math"
|
|
"testing"
|
|
|
|
"github.com/ollama/ollama/mlx/mlxthread/mlxthreadtest"
|
|
)
|
|
|
|
// mlxForm converts checkpoint multipliers to MLX's global-scale
|
|
// representation, which is what the wrappers take.
|
|
func mlxForm(checkpoint []float32) []float32 {
|
|
out := make([]float32, len(checkpoint))
|
|
for i, v := range checkpoint {
|
|
out[i] = v * Nvfp4MaxProduct
|
|
}
|
|
return out
|
|
}
|
|
|
|
// fp4Values decodes an fp4 (E2M1) code to its value.
|
|
var fp4Values = [16]float32{0, 0.5, 1, 1.5, 2, 3, 4, 6, 0, -0.5, -1, -1.5, -2, -3, -4, -6}
|
|
|
|
func TestDequantizeGlobalScale(t *testing.T) {
|
|
withMLXThread(t, func(t *mlxthreadtest.T) {
|
|
testDequantizeGlobalScale(t)
|
|
})
|
|
}
|
|
|
|
// TestMulGatherQMMGlobalScale checks the wrapper-side scaling that
|
|
// non-Metal backends use in place of the gather kernel's global scale: the
|
|
// gathered output rows are multiplied by the per-expert scale, converted from
|
|
// amax units, and cast back. The reference gathers the dequantized weights.
|
|
func TestMulGatherQMMGlobalScale(t *testing.T) {
|
|
withMLXThread(t, func(t *mlxthreadtest.T) {
|
|
if !MetalIsAvailable() {
|
|
t.Skip("building the unscaled gather requires a GPU backend")
|
|
}
|
|
|
|
const experts, rows, cols, group = 2, 4, 64, 16
|
|
packed := make([]uint32, experts*rows*cols/8)
|
|
for i := range packed {
|
|
for j := range 8 {
|
|
packed[i] |= uint32((i*8+j)%16) << (4 * j)
|
|
}
|
|
}
|
|
scaleBits := make([]uint8, experts*rows*(cols/group))
|
|
for i := range scaleBits {
|
|
exp := (i/(cols/group)+i%(cols/group))%4 - 1
|
|
scaleBits[i] = uint8((exp + 7) << 3)
|
|
}
|
|
weights := FromValues(packed, experts, rows, cols/8)
|
|
blockScales := FromValues(scaleBits, experts, rows, cols/group)
|
|
checkpointScales := []float32{0.5, 2}
|
|
|
|
xValues := make([]float32, cols)
|
|
for i := range xValues {
|
|
xValues[i] = float32(i%7-3) / 8
|
|
}
|
|
x := FromValues(xValues, 1, cols).AsType(DTypeBFloat16)
|
|
indices := FromValues([]int32{0, 1}, 1, experts)
|
|
|
|
kernelScales := make([]float32, experts)
|
|
for e := range kernelScales {
|
|
kernelScales[e] = checkpointScales[e] * Nvfp4MaxProduct
|
|
}
|
|
base := GatherQMM(x, weights, blockScales, nil, nil, indices,
|
|
true, group, 4, "nvfp4", nil, false)
|
|
got := mulGatherQMMGlobalScale(base, FromValues(kernelScales, experts), indices).AsType(DTypeFloat32)
|
|
|
|
dense := Dequantize(weights, blockScales, nil, group, 4, "nvfp4",
|
|
FromValues(kernelScales, experts)).AsType(DTypeFloat32)
|
|
want := GatherMM(x.AsType(DTypeFloat32), Transpose(dense, 0, 2, 1), nil, indices, false)
|
|
Eval(got, want)
|
|
|
|
gotValues, wantValues := got.Floats(), want.Floats()
|
|
if len(gotValues) != len(wantValues) {
|
|
t.Fatalf("result length = %d, want %d", len(gotValues), len(wantValues))
|
|
}
|
|
for i := range gotValues {
|
|
if math.IsNaN(float64(gotValues[i])) || math.IsInf(float64(gotValues[i]), 0) {
|
|
t.Fatalf("result[%d] = %v, want finite", i, gotValues[i])
|
|
}
|
|
delta := math.Abs(float64(gotValues[i] - wantValues[i]))
|
|
tolerance := 0.02 * math.Max(math.Abs(float64(wantValues[i])), 1)
|
|
if delta > tolerance {
|
|
t.Fatalf("result[%d] = %v, want %v (delta %v > %v)", i, gotValues[i], wantValues[i], delta, tolerance)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
// The quantized payload is built directly, the way an nvfp4 checkpoint ships
|
|
// it: packed fp4 codes, e4m3 group-scale bytes, and a separate global scale.
|
|
// Only the dequantize consumer path runs, so expectations are exact.
|
|
func testDequantizeGlobalScale(t *mlxthreadtest.T) {
|
|
const rows, cols, group = 4, 64, 16
|
|
// Every group cycles through all 16 codes; group g of row r has scale
|
|
// 2^((r+g)%4-1), a power of two so every expected product is exact.
|
|
scaleOf := func(r, g int) float32 {
|
|
return float32(math.Ldexp(1, (r+g)%4-1))
|
|
}
|
|
|
|
packed := make([]uint32, rows*cols/8)
|
|
for i := range packed {
|
|
for j := range 8 {
|
|
packed[i] |= uint32((i*8+j)%16) << (4 * j)
|
|
}
|
|
}
|
|
scaleBits := make([]uint8, rows*(cols/group))
|
|
for i := range scaleBits {
|
|
exp := (i/(cols/group)+i%(cols/group))%4 - 1
|
|
scaleBits[i] = uint8((exp + 7) << 3)
|
|
}
|
|
wq := FromValues(packed, rows, cols/8)
|
|
scales := FromValues(scaleBits, rows, cols/group)
|
|
|
|
check := func(name string, got *Array, gs func(r int) float32) {
|
|
t.Helper()
|
|
g32 := got.AsType(DTypeFloat32)
|
|
Eval(g32)
|
|
values := g32.Floats()
|
|
if len(values) != rows*cols {
|
|
t.Errorf("%s: length = %d, want %d", name, len(values), rows*cols)
|
|
return
|
|
}
|
|
for i, v := range values {
|
|
r, c := i/cols, i%cols
|
|
if want := fp4Values[c%16] * scaleOf(r, c/group) * gs(r); v != want {
|
|
t.Errorf("%s[%d] = %v, want %v", name, i, v, want)
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
base := Dequantize(wq, scales, nil, group, 4, "nvfp4", nil)
|
|
check("no scale", base, func(int) float32 { return 1 })
|
|
|
|
perRow := []float32{0.5, 1, 2, 4}
|
|
cases := []struct {
|
|
name string
|
|
scale *Array
|
|
gs func(r int) float32
|
|
}{
|
|
{"scalar", FromValues([]float32{2 * Nvfp4MaxProduct}, 1), func(int) float32 { return 2 }},
|
|
{"perRow", FromValues(mlxForm(perRow), rows), func(r int) float32 { return perRow[r] }},
|
|
}
|
|
for _, tc := range cases {
|
|
got := Dequantize(wq, scales, nil, group, 4, "nvfp4", tc.scale)
|
|
if got.DType() != base.DType() {
|
|
t.Errorf("%s: dtype = %v, want %v", tc.name, got.DType(), base.DType())
|
|
}
|
|
check(tc.name, got, tc.gs)
|
|
}
|
|
|
|
const experts = 2
|
|
expertPacked := make([]uint32, experts*len(packed))
|
|
expertScales := make([]uint8, experts*len(scaleBits))
|
|
for e := range experts {
|
|
copy(expertPacked[e*len(packed):], packed)
|
|
copy(expertScales[e*len(scaleBits):], scaleBits)
|
|
}
|
|
expertWeights := FromValues(expertPacked, experts, rows, cols/8)
|
|
expertBlockScales := FromValues(expertScales, experts, rows, cols/group)
|
|
expertGlobalScales := []float32{0.5, 2}
|
|
expertOut := Dequantize(
|
|
expertWeights,
|
|
expertBlockScales,
|
|
nil,
|
|
group,
|
|
4,
|
|
"nvfp4",
|
|
FromValues(mlxForm(expertGlobalScales), experts),
|
|
).AsType(DTypeFloat32)
|
|
Eval(expertOut)
|
|
for i, got := range expertOut.Floats() {
|
|
e := i / (rows * cols)
|
|
r := (i / cols) % rows
|
|
c := i % cols
|
|
want := fp4Values[c%16] * scaleOf(r, c/group) * expertGlobalScales[e]
|
|
if got != want {
|
|
t.Fatalf("expert bank[%d] = %v, want %v", i, got, want)
|
|
}
|
|
}
|
|
}
|