* feat: add mlx public trainer api * test: cover mlx public trainer api * fix: preserve mlx epoch trainer configs * fix: pass mlx warmup ratio through config * fix: align mlx trainer dataset order * fix: keep mlx chat templates import-light * fix: infer mlx trainer context length * fix: mirror cuda mlx context defaults * fix: align mlx notebook trainer defaults * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: keep mlx public helpers import-light * refactor: reuse mlx optimizer normalization * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: address mlx review feedback * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: tighten mlx training argument parity * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: align mlx trainer eos default * Fix MLX trainer to accept DataCollatorForSeq2Seq and handle TokenizerWrapper in get_chat_template * Trim redundant docstrings on internal MLX helpers * MLX review fixes: Studio optimizer import-safe on non-MLX hosts, preserve explicit max_length, skip MLX tests before import * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * MLX review round 2: defer max_length to model context, optimizer alias fallback for older zoo, skip non-MLX test on missing GPU deps * MLX review round 3: keep chat_templates importable without torch on MLX * fix: preserve MLX trainer notebook shims * fix: ignore CUDA tokenizer moves on MLX * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: harden MLX trainer shims * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: unwrap MLX scheduler enum args * fix: coerce integral MLX epoch counts * fix: spoof CUDA compatibility APIs on MLX * fix: harden MLX notebook compatibility shims * MLX: add torch.cuda.mem_get_info to the compatibility shim Notebook memory cells call torch.cuda.mem_get_info()[0] directly (not gated by is_available), so on MLX it raises without a shim. Return (free, total) bytes from the MLX device stats, consistent with the other torch.cuda compat helpers, and add a matching assertion to the compat-API test. * MLX: use active memory for mem_get_info; fix BatchEncoding.to keyword device Address review on the MLX compatibility shim: - torch.cuda.mem_get_info() now derives free bytes from current active MLX memory instead of the peak high-water mark, so a capacity check stays accurate after a transient spike or a prior run. - BatchEncoding.to(device=...) passed by keyword no longer forwards a positional None alongside the keyword (which raised "multiple values for 'device'"), so non-CUDA keyword moves like .to(device="cpu") delegate correctly. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * MLX: accept preserve_dataset_order; stub RL trainers with a clear error Two fixes so unmigrated notebooks behave predictably on MLX (torch present): - preserve_dataset_order is a real MLXTrainingConfig field but was missing from the extra-argument allowlist, so passing it (as a config or trainer kwarg) could be rejected as unknown on a zoo without the field. Add it to _MLX_IMPLEMENTED_EXTRA_ARGUMENTS so the documented no-shuffle path is reachable. - GRPO/DPO/ORPO (and KTO/PPO/Reward) have no MLX trainer yet. Retarget the ones the installed trl exposes to a stub that raises a clear 'not supported on MLX' error instead of importing the real torch/CUDA trainer and crashing deep inside it. Only existing trainers are retargeted (no invented attributes), idempotent across re-imports. * MLX: make RL-trainer stubbing import-safe; back current-memory APIs with active memory Address review on the MLX shims: - The RL-trainer stub loop probed trl with getattr(_trl, name), which triggers trl's lazy trainer import and pulls torch -- that can crash import unsloth on a torch-free MLX install just to check existence. Decide what to stub from trl.__all__ + already-materialized attrs (vars) instead; never resolve the real trainer. All trl trainer names are in __all__, so they are still stubbed (even torch-free), and the probe no longer imports torch. - torch.cuda.memory_reserved / memory_allocated (the current, non-max APIs) were aliased to peak max_memory_reserved. Back them with current active MLX memory so cleanup / capacity checks see live usage; max_* keep the peak high-water mark. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * MLX: keep TRL's SFTConfig epoch default under the trl.SFTConfig alias Unmigrated notebooks import SFTConfig from trl, which the MLX build aliases to the public training-args class. TRL/HF SFTConfig defaults to num_train_epochs=3 (max_steps=-1); the native MLX config defaults to max_steps=60. So an SFTConfig built without an explicit length silently ran 60 MLX steps instead of TRL's 3 epochs under the alias. Alias trl.SFTConfig to a thin subclass that seeds the TRL epoch default only when neither max_steps nor num_train_epochs is given; explicit lengths pass through untouched, and the native public args class keeps its MLX default. Epoch mode is supported by the MLX trainer. * MLX CI: keep the GGUF reload smoke under the job timeout The RELOAD-GGUF-via-llama-cli step timed out at 300s. BF16 GGUF decode is CPU-bound on the macOS runner (~10s+/token), so generating 24 tokens landed right on the 300s cliff and killed the process. This step is a save/reload integrity smoke (it only needs a few chars of output), so the token count is incidental: generate 8 tokens with explicit threads and a small headroom on the subprocess timeout, all env-tunable (UNSLOTH_GGUF_RELOAD_N / _THREADS / _TIMEOUT). Cuts the reload well under the 25 minute job budget. * MLX: broaden trainer stubs, real peak-memory reset, fix shim tests Address review on the MLX public API: - The SFTConfig identity tests asserted trl.SFTConfig is UnslothTrainingArguments, but the alias now points at the _MLXSFTConfig subclass that preserves TRL's epoch default, so the MLX suite failed before testing the shim. Assert issubclass instead. - torch.cuda.reset_peak_memory_stats was a no-op, so max_memory_reserved kept earlier model-load peaks across a scoped run. Wire it to mx.reset_peak_memory with the same core/metal fallback used for the reads. - The unsupported-trainer stubs were a fixed list, so trainers outside it (a newer RLOOTrainer) still routed to the real torch trainer. Derive the set from trl.__all__ (every non-SFT *Trainer) so all non-SFT surfaces fail with a clear MLX message; names come from __all__ so trl is never resolved. - The non-MLX export smoke skipped only on missing bitsandbytes/triton; other absent GPU deps (numpy/torch/unsloth-zoo, or _gpu_init re-raising ImportError) made it fail on CPU hosts. Skip on any ImportError. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: keep MLX notebook compatibility minimal * MLX CI: force CPU + small context for the GGUF reload smoke The RELOAD-GGUF-via-llama-cli step timed out even at 8 tokens (>420s), so it is a fixed hang, not per-token cost: on the paravirtual macOS runner GPU llama.cpp's Metal backend stalls, and the gemma3 GGUF advertises a 32768 context that llama-cli would otherwise fully allocate. Run llama-cli CPU-only (-ngl 0) with a small context (-c 256); keep generation short. All env-tunable (UNSLOTH_GGUF_RELOAD_NGL / _CTX / _N / _THREADS / _TIMEOUT). Also print llama.cpp's partial stdout/stderr on timeout so a future hang is diagnosable instead of an opaque TimeoutExpired. * MLX CI: export the reload-smoke GGUF as q8_0, not bf16 The GGUF reload via llama-cli timed out on the runner even CPU-only with a tiny context and 8 tokens. Root cause is the format, not the flags: the smoke exported quantization_method='not_quantized', which maps to a bf16 GGUF, and llama.cpp's bf16 CPU decode is unusably slow on the paravirtual macOS runner. Export q8_0 (fast_quantized, the exporter default and what users deploy) instead -- llama.cpp has optimized q8_0 CPU kernels, so the fresh-process reload loads and generates in seconds. The reload stays CPU-only (-ngl 0) with a small context. * test: clear TRL shim before availability check --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Daniel Han <danielhanchen@gmail.com> Co-authored-by: Lee Jackson <130007945+Imagineer99@users.noreply.github.com> Co-authored-by: imagineer99 <samleejackson0@gmail.com>
277 lines
9.5 KiB
Python
277 lines
9.5 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
|
|
import importlib.util
|
|
import sys
|
|
import types
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
|
|
def _load_worker_module():
|
|
stub_names = (
|
|
"structlog",
|
|
"loggers",
|
|
"utils",
|
|
"utils.hardware",
|
|
"utils.wheel_utils",
|
|
)
|
|
previous_modules = {name: sys.modules.get(name) for name in stub_names}
|
|
|
|
try:
|
|
sys.modules["structlog"] = types.ModuleType("structlog")
|
|
|
|
loggers = types.ModuleType("loggers")
|
|
loggers.get_logger = lambda *_args, **_kwargs: None
|
|
sys.modules["loggers"] = loggers
|
|
|
|
utils = types.ModuleType("utils")
|
|
utils.__path__ = []
|
|
sys.modules["utils"] = utils
|
|
|
|
hardware = types.ModuleType("utils.hardware")
|
|
hardware.apply_gpu_ids = lambda *_args, **_kwargs: None
|
|
sys.modules["utils.hardware"] = hardware
|
|
|
|
wheel_utils = types.ModuleType("utils.wheel_utils")
|
|
for name in (
|
|
"direct_wheel_url",
|
|
"flash_attn_wheel_url",
|
|
"has_blackwell_gpu",
|
|
"install_wheel",
|
|
"probe_torch_wheel_env",
|
|
"url_exists",
|
|
):
|
|
setattr(wheel_utils, name, lambda *_args, **_kwargs: None)
|
|
sys.modules["utils.wheel_utils"] = wheel_utils
|
|
|
|
worker_path = Path(__file__).resolve().parents[1] / "core" / "training" / "worker.py"
|
|
spec = importlib.util.spec_from_file_location("mlx_training_worker_under_test", worker_path)
|
|
module = importlib.util.module_from_spec(spec)
|
|
assert spec.loader is not None
|
|
spec.loader.exec_module(module)
|
|
return module
|
|
finally:
|
|
for name, module in previous_modules.items():
|
|
if module is None:
|
|
sys.modules.pop(name, None)
|
|
else:
|
|
sys.modules[name] = module
|
|
|
|
|
|
_worker = _load_worker_module()
|
|
_normalize_mlx_studio_optimizer = _worker._normalize_mlx_studio_optimizer
|
|
_normalize_mlx_studio_scheduler = _worker._normalize_mlx_studio_scheduler
|
|
_mlx_vlm_max_resized_size = _worker._mlx_vlm_max_resized_size
|
|
_mlx_vlm_resized_image_layout = _worker._mlx_vlm_resized_image_layout
|
|
_copy_mlx_vlm_image_processor = _worker._copy_mlx_vlm_image_processor
|
|
_resize_mlx_vlm_image = _worker._resize_mlx_vlm_image
|
|
_adapt_for_mlx_vlm = _worker._adapt_for_mlx_vlm
|
|
|
|
|
|
def test_mlx_studio_optimizer_aliases_are_explicit():
|
|
assert _normalize_mlx_studio_optimizer("adamw_8bit") == "adamw"
|
|
assert _normalize_mlx_studio_optimizer("paged_adamw_8bit") == "adamw"
|
|
assert _normalize_mlx_studio_optimizer("adafactor") == "adafactor"
|
|
|
|
|
|
def test_mlx_studio_rejects_unknown_optimizer():
|
|
with pytest.raises(ValueError, match = "Supported"):
|
|
_normalize_mlx_studio_optimizer("adamw_typo")
|
|
|
|
|
|
def test_mlx_studio_rejects_unknown_scheduler():
|
|
with pytest.raises(ValueError, match = "Unsupported LR scheduler for MLX training"):
|
|
_normalize_mlx_studio_scheduler("linear_typo")
|
|
|
|
|
|
def test_mlx_studio_keeps_hf_style_tokenizer_dual_purpose():
|
|
source = (Path(__file__).resolve().parents[1] / "core" / "training" / "worker.py").read_text()
|
|
|
|
assert "tokenizer = tokenizer" in source
|
|
assert "processor = tokenizer if is_vlm else None" not in source
|
|
|
|
|
|
def test_mlx_wandb_run_config_excludes_subject_and_secrets():
|
|
# The MLX W&B run config uploads the whole config minus a sensitive set. The owner's
|
|
# subject (authenticated username / API-key id) must be filtered alongside the secrets,
|
|
# otherwise it lands in W&B run config even though DB history already strips it.
|
|
source = (Path(__file__).resolve().parents[1] / "core" / "training" / "worker.py").read_text()
|
|
|
|
assert (
|
|
'_wandb_sensitive = {"hf_token", "wandb_token", "s3_config", "subject"}' in source
|
|
), "MLX W&B run config must exclude subject and the token/s3 secrets"
|
|
|
|
|
|
def test_mlx_vlm_resize_uses_max_dimension_like_torch_trainer():
|
|
assert _mlx_vlm_max_resized_size(1000, 500, 512) == (512, 256)
|
|
assert _mlx_vlm_max_resized_size(500, 1000, 512) == (256, 512)
|
|
assert _mlx_vlm_max_resized_size(1000, 1000, 512) == (512, 512)
|
|
assert _mlx_vlm_max_resized_size(256, 128, 1536) == (256, 128)
|
|
assert _mlx_vlm_max_resized_size(512, 256, 512) == (512, 256)
|
|
# Half-pixel cases must match the Torch collator (not banker's round).
|
|
assert _mlx_vlm_max_resized_size(333, 1000, 500) == (167, 500)
|
|
assert _mlx_vlm_max_resized_size(1000, 333, 500) == (500, 167)
|
|
|
|
|
|
def test_mlx_vlm_resize_keeps_default_numpy_layout_hwc():
|
|
Image = pytest.importorskip("PIL.Image")
|
|
image = Image.new("RGB", (320, 200), color = (10, 20, 30))
|
|
|
|
resized = _resize_mlx_vlm_image(image, 128)
|
|
|
|
assert resized.shape == (80, 128, 3)
|
|
assert resized.flags.c_contiguous
|
|
|
|
|
|
def test_mlx_vlm_resize_uses_requested_chw_numpy_layout():
|
|
Image = pytest.importorskip("PIL.Image")
|
|
image = Image.new("RGB", (320, 200), color = (10, 20, 30))
|
|
|
|
resized = _resize_mlx_vlm_image(image, 128, image_layout = "chw")
|
|
|
|
assert resized.shape == (3, 80, 128)
|
|
assert resized.flags.c_contiguous
|
|
|
|
|
|
def test_mlx_vlm_resized_image_layout_probes_processor_contract():
|
|
class ChwOnlyImageProcessor:
|
|
def __call__(self, images = None):
|
|
image = images[0]
|
|
if image.shape[0] == 3:
|
|
return {"pixel_values": image}
|
|
raise ValueError("expected CHW")
|
|
|
|
class HwcImageProcessor:
|
|
def __call__(self, images = None):
|
|
image = images[0]
|
|
if image.shape[-1] == 3:
|
|
return {"pixel_values": image}
|
|
raise ValueError("expected HWC")
|
|
|
|
assert (
|
|
_mlx_vlm_resized_image_layout(
|
|
types.SimpleNamespace(image_processor = ChwOnlyImageProcessor())
|
|
)
|
|
== "chw"
|
|
)
|
|
assert (
|
|
_mlx_vlm_resized_image_layout(types.SimpleNamespace(image_processor = HwcImageProcessor()))
|
|
is None
|
|
)
|
|
|
|
|
|
def test_mlx_vlm_layout_probe_copies_image_processor():
|
|
class StatefulImageProcessor:
|
|
def __init__(self):
|
|
self.calls = 0
|
|
|
|
def __call__(self, images = None):
|
|
self.calls += 1
|
|
image = images[0]
|
|
if image.shape[0] == 3:
|
|
return {"pixel_values": image}
|
|
raise ValueError("expected CHW")
|
|
|
|
image_processor = StatefulImageProcessor()
|
|
|
|
layout = _mlx_vlm_resized_image_layout(types.SimpleNamespace(image_processor = image_processor))
|
|
|
|
assert layout == "chw"
|
|
assert image_processor.calls == 0
|
|
|
|
|
|
def test_mlx_vlm_image_processor_copy_refuses_uncopyable_processors():
|
|
class UncopyableImageProcessor:
|
|
def __copy__(self):
|
|
raise RuntimeError("no copy")
|
|
|
|
def __deepcopy__(self, _memo):
|
|
raise RuntimeError("no deepcopy")
|
|
|
|
image_processor = UncopyableImageProcessor()
|
|
|
|
assert _copy_mlx_vlm_image_processor(image_processor) is None
|
|
|
|
|
|
def test_mlx_vlm_layout_probe_skips_uncopyable_processors():
|
|
class UncopyableImageProcessor:
|
|
def __copy__(self):
|
|
raise RuntimeError("no copy")
|
|
|
|
def __deepcopy__(self, _memo):
|
|
raise RuntimeError("no deepcopy")
|
|
|
|
def __call__(self, images = None):
|
|
raise AssertionError("live processor should not be probed")
|
|
|
|
assert (
|
|
_mlx_vlm_resized_image_layout(
|
|
types.SimpleNamespace(image_processor = UncopyableImageProcessor())
|
|
)
|
|
is None
|
|
)
|
|
|
|
|
|
def test_mlx_vlm_adapter_applies_chw_layout_to_message_images():
|
|
Image = pytest.importorskip("PIL.Image")
|
|
image = Image.new("RGB", (320, 200), color = (10, 20, 30))
|
|
item = {
|
|
"messages": [
|
|
{
|
|
"role": "user",
|
|
"content": [
|
|
{"type": "image", "image": image},
|
|
{"type": "text", "text": "Describe it."},
|
|
],
|
|
}
|
|
]
|
|
}
|
|
|
|
adapted = _adapt_for_mlx_vlm([item], resize = 128, image_layout = "chw")
|
|
|
|
assert adapted[0]["image"].shape == (3, 80, 128)
|
|
assert adapted[0]["messages"][0]["content"][0] == {"type": "image"}
|
|
|
|
|
|
# ---- issue #6103: MLX transformers-version activation must not fail silently ----
|
|
|
|
|
|
def test_activate_transformers_version_or_warn_logs_on_failure(monkeypatch):
|
|
"""A failed activation in the MLX fast-path must be logged, not swallowed.
|
|
|
|
The non-MLX path already surfaces this failure; the MLX path used a bare
|
|
``except Exception: pass`` so a missing/broken transformers venv produced
|
|
no trace and a confusing downstream crash.
|
|
"""
|
|
warnings_logged = []
|
|
fake_logger = types.SimpleNamespace(
|
|
warning = lambda *a, **k: warnings_logged.append((a, k)),
|
|
)
|
|
monkeypatch.setattr(_worker, "logger", fake_logger)
|
|
|
|
def _boom(_name, _hf_token = None):
|
|
raise RuntimeError("venv .venv_t5_550 missing")
|
|
|
|
monkeypatch.setattr(_worker, "_activate_transformers_version", _boom)
|
|
|
|
# Non-fatal: the MLX path falls through, so this must not raise.
|
|
_worker._activate_transformers_version_or_warn("google/gemma-4-12b")
|
|
|
|
assert len(warnings_logged) == 1, "activation failure was not logged"
|
|
assert "gemma-4-12b" in str(warnings_logged[0]), "log does not name the model"
|
|
|
|
|
|
def test_activate_transformers_version_or_warn_silent_on_success(monkeypatch):
|
|
warnings_logged = []
|
|
fake_logger = types.SimpleNamespace(
|
|
warning = lambda *a, **k: warnings_logged.append((a, k)),
|
|
)
|
|
monkeypatch.setattr(_worker, "logger", fake_logger)
|
|
monkeypatch.setattr(
|
|
_worker, "_activate_transformers_version", lambda _name, _hf_token = None: None
|
|
)
|
|
|
|
_worker._activate_transformers_version_or_warn("meta-llama/Llama-3-8B")
|
|
|
|
assert warnings_logged == [], "should not warn when activation succeeds"
|