Files
ollama/mlxrunner/status_memory_test.go
Jesse Gross 2e036e7cdf mlx, mlxrunner: move the MLX engine out of x/
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.
2026-09-16 14:06:08 -07:00

247 lines
5.7 KiB
Go

package mlxrunner
import (
"context"
"errors"
"sync"
"sync/atomic"
"testing"
"time"
)
func TestStatusMemoryCacheWaitsForFastRefresh(t *testing.T) {
var calls atomic.Int32
cache := newStatusMemoryCache(context.Background(), 7, time.Now().Add(-time.Minute), time.Second, func() (uint64, error) {
calls.Add(1)
return 42, nil
})
if got := cache.Memory(); got != 42 {
t.Fatalf("got memory %d, want 42", got)
}
if got := calls.Load(); got != 1 {
t.Fatalf("refresh calls = %d, want 1", got)
}
}
func TestStatusMemoryCacheSupportsBlockingWait(t *testing.T) {
cache := newStatusMemoryCache(context.Background(), 7, time.Now().Add(-time.Minute), 0, func() (uint64, error) {
return 42, nil
})
if got := cache.Memory(); got != 42 {
t.Fatalf("got memory %d, want 42", got)
}
}
func TestStatusMemoryCacheReturnsCachedValueAndRefreshesLater(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
started := make(chan struct{})
release := make(chan struct{})
var calls atomic.Int32
cache := newStatusMemoryCache(ctx, 7, time.Now().Add(-time.Minute), time.Millisecond, func() (uint64, error) {
if calls.Add(1) == 1 {
close(started)
}
select {
case <-release:
return 42, nil
case <-ctx.Done():
return 0, ctx.Err()
}
})
start := time.Now()
if got := cache.Memory(); got != 7 {
t.Fatalf("got memory %d, want cached value 7", got)
}
if elapsed := time.Since(start); elapsed > time.Second {
t.Fatalf("cached memory lookup took too long: %s", elapsed)
}
waitForRefreshStart(t, started)
close(release)
waitForCachedMemory(t, cache, 42)
if got := calls.Load(); got != 1 {
t.Fatalf("refresh calls = %d, want 1", got)
}
}
func TestStatusMemoryCacheReturnsCachedValueBeforeFirstRefresh(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
started := make(chan struct{})
release := make(chan struct{})
cache := newStatusMemoryCache(ctx, 7, time.Time{}, time.Millisecond, func() (uint64, error) {
close(started)
select {
case <-release:
return 42, nil
case <-ctx.Done():
return 0, ctx.Err()
}
})
if got := cache.Memory(); got != 7 {
t.Fatalf("got memory %d, want cached value 7", got)
}
waitForRefreshStart(t, started)
close(release)
waitForCachedMemory(t, cache, 42)
}
func TestStatusMemoryCacheKeepsCachedValueWhenRefreshFails(t *testing.T) {
var calls atomic.Int32
cache := newStatusMemoryCache(context.Background(), 7, time.Now().Add(-time.Minute), time.Second, func() (uint64, error) {
calls.Add(1)
return 0, errors.New("refresh failed")
})
if got := cache.Memory(); got != 7 {
t.Fatalf("got memory %d, want cached value 7", got)
}
if got := calls.Load(); got != 1 {
t.Fatalf("refresh calls = %d, want 1", got)
}
}
func TestStatusMemoryCacheReturnsCachedValueWhenContextDone(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
started := make(chan struct{})
release := make(chan struct{})
cache := newStatusMemoryCache(ctx, 7, time.Now().Add(-time.Minute), time.Second, func() (uint64, error) {
close(started)
<-release
return 0, ctx.Err()
})
cancel()
if got := cache.Memory(); got != 7 {
t.Fatalf("got memory %d, want cached value 7", got)
}
waitForRefreshStart(t, started)
close(release)
waitForInflightRefresh(t, cache)
}
func TestStatusMemoryCacheAllowsRefreshAfterFailure(t *testing.T) {
var calls atomic.Int32
cache := newStatusMemoryCache(context.Background(), 7, time.Now().Add(-time.Minute), time.Second, func() (uint64, error) {
if calls.Add(1) == 1 {
return 0, errors.New("refresh failed")
}
return 42, nil
})
if got := cache.Memory(); got != 7 {
t.Fatalf("got memory %d, want cached value 7", got)
}
if got := cache.Memory(); got != 42 {
t.Fatalf("got memory %d after retry, want 42", got)
}
if got := calls.Load(); got != 2 {
t.Fatalf("refresh calls = %d, want 2", got)
}
}
func TestStatusMemoryCacheAllowsOneInflightRefresh(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
started := make(chan struct{})
release := make(chan struct{})
var calls atomic.Int32
cache := newStatusMemoryCache(ctx, 11, time.Now().Add(-time.Minute), time.Millisecond, func() (uint64, error) {
if calls.Add(1) == 1 {
close(started)
}
select {
case <-release:
return 99, nil
case <-ctx.Done():
return 0, ctx.Err()
}
})
const goroutines = 8
var wg sync.WaitGroup
errCh := make(chan string, goroutines)
for range goroutines {
wg.Add(1)
go func() {
defer wg.Done()
if got := cache.Memory(); got != 11 {
errCh <- "got non-cached memory value"
}
}()
}
wg.Wait()
close(errCh)
for err := range errCh {
t.Fatal(err)
}
waitForRefreshStart(t, started)
if got := calls.Load(); got != 1 {
t.Fatalf("refresh calls = %d, want 1", got)
}
close(release)
waitForCachedMemory(t, cache, 99)
}
func waitForRefreshStart(t *testing.T, started <-chan struct{}) {
t.Helper()
select {
case <-started:
case <-time.After(time.Second):
t.Fatal("timeout waiting for refresh to start")
}
}
func waitForCachedMemory(t *testing.T, cache *statusMemoryCache, want uint64) {
t.Helper()
deadline := time.After(time.Second)
for {
got, _ := cache.snapshot()
if got == want {
return
}
select {
case <-deadline:
t.Fatalf("cached memory = %d, want %d", got, want)
case <-time.After(time.Millisecond):
}
}
}
func waitForInflightRefresh(t *testing.T, cache *statusMemoryCache) {
t.Helper()
deadline := time.After(time.Second)
for {
cache.mu.Lock()
inFlight := cache.inFlight
cache.mu.Unlock()
if inFlight == nil {
return
}
select {
case <-deadline:
t.Fatal("timeout waiting for refresh to finish")
case <-time.After(time.Millisecond):
}
}
}