* tests: read checked-in files as UTF-8 instead of the platform default Path.read_text() with no encoding uses locale.getpreferredencoding(), which is UTF-8 on the Linux runners and cp1252 on a stock Windows install. Nine module-level reads of checked-in source files were relying on that default. studio/backend/routes/inference.py carries the DeepSeek tool-call token regexes, so it holds U+FF5C and U+2581. Under cp1252 that read raised UnicodeDecodeError on byte 0x81 at position 97806, and because the reads run at import time it took test_cancel_atomicity.py and test_cancel_id_wiring.py out at collection, not as failures. Green on CI, permanently broken for a Windows contributor running the suite locally. Adds a guard: at module scope there is no tmp_path fixture, so a bare read_text()/write_text()/open() there is always touching a checked-in file. That makes the rule mechanical enough to enforce with no allowlist, while staying quiet about temp-dir I/O inside test bodies where the platform default is harmless. The repo already spells this correctly in 464 other places; this only stops the stragglers coming back. * tests: cover import-time helper reads and keep the guard py3.9-safe Follows up on the Codex review: - add `from __future__ import annotations`, since `str | None` in `_offender` is evaluated at import on Python 3.9 and pyproject declares requires-python ">=3.9,<3.15". - widen the guard from module scope to import time. Class bodies and the bodies of module-level helpers called from an executing statement run during collection too, so `CODE = _extract_mixed_precision_code()` was the same hazard as an inline read. `if __name__ == "__main__":` blocks are skipped: pytest never executes them. - scan studio/backend/tests/ as well as tests/. Both trees are collected on Windows by separate CI jobs, and the offender that started this, test_tool_xml_strip.py reading routes/inference.py, lives there. Widening it surfaced seven more import-time reads of checked-in sources; all now name utf-8. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Harden the import-time encoding guard for PR #7438 Close the detector gaps raised in review, all of which I reproduced against the actual AST before changing anything. False negatives (the guard let a real hazard through): - _is_main_guard ignored the comparison operator, so if __name__ != "__main__" counted as script-only even though its body runs at import. - The else arm of a main guard was discarded with the rest of the If node. - Decorators and argument defaults on a module-level def were skipped with the body, though both are evaluated when the def executes. - Path.open() in text mode was invisible; only builtin open() was matched. - encoding = None and encoding = "locale" both re-select the platform default, but the keyword merely being present counted as pinned. False positives (the guard would have blocked a compliant contributor): - A non-literal mode fell through to the "r" default, so open(p, mode) was flagged even when mode is "rb", where adding encoding= is a ValueError and there is no edit that satisfies the rule. - Same for open(*args) and a **kwargs splat, which hide the mode and can hide an encoding. - Lambda bodies and comprehension elements were walked even though neither runs at definition. Verified: still reports the same 22 offenders on unpatched main, green on this branch and on the tree merged with latest main (557 files), and an adversarial corpus of 33 cases now scores zero false positives and zero false negatives. Also corrected two docstring claims: neither collecting job runs on Windows, and the read is governed by locale.getencoding(). * Walk eager comprehensions and treat io.open as the builtin Two regressions from the previous commit, both reproduced against the AST before changing anything. Lumping list, set and dict comprehensions in with generator expressions was wrong. Only a genexp is lazy; the other three run their element expression, their filters and their nested iterators immediately, so CONTENTS = [p.read_text() for p in PATHS] at module scope is an import-time read the guard was silently missing. Comprehensions are now walked in full and only the genexp keeps the outermost-iterable-only treatment. io was also in the not-a-path-opener list, but io.open is the builtin, with the same mode position and the same platform default. io.open(CHECKED_IN_FILE) is exactly the hazard this guard exists for, so it is matched now, with binary modes and a pinned encoding still exempt. tarfile.open and fitz.open stay exempt since neither has an encoding to name. Verified: 13 targeted cases covering all five eager comprehension forms and io.open in text, binary and pinned shapes all classify correctly; still 22 offenders on unpatched main; green on this branch and on the tree merged with latest main. * Close three more walker gaps in the import-time guard All three reproduced against the AST first. A generator expression handed straight to a call is consumed there, so DATA = "".join(p.read_text() for p in paths) runs its element at import. Only an unconsumed genexp bound to a name stays lazy, so the walker now follows the consumed ones in full and keeps the outermost-iterable-only treatment for the rest. if "__main__" == __name__ is an equivalent and accepted spelling of the main guard, but requiring __name__ on the left meant its body was treated as import-time code. That is a false positive on a block pytest never runs, so both operand orders are recognised now. The helper table was built from module-level defs only, so a def in a class body invoked while the class is constructed was never followed, contradicting the walker's stated coverage of class bodies. Helpers are now collected from the module body and from class bodies at any nesting. Verified: 15 targeted cases including all three fixes and the earlier ones still classify correctly; still 22 offenders on unpatched main; green on this branch and on the tree merged with latest main. * Handle positional read_text encodings, lazy generators and nested helpers * Guard reads reached from test bodies, unbound Path calls and __file__ paths * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Follow derived paths, skip lazy generator helpers, cover compressed openers * Guard the CLI tests, helper parameters and unbound Path arguments * Discover test roots and follow literal, in-place and tuple-derived paths * Identify module openers by import, unwrap starred paths, pin subprocess snippets * Resolve import origins, seed helper locals, follow named generators and parametrize * Scope imports lexically, list tracked test files, bind unpacked names * Resolve aliased openers, keyword-only params, destructured targets, next() * Pin the encoding on subprocess snippets, workflow lint and CLI output for PR #7438 * Harden the CLI encoding guard against detached streams for PR #7438 * Tighten the encoding guard's path and scope analysis for PR #7438 * Resolve path provenance more precisely and keep POSIX stream encodings for PR #7438 * Resolve qualified path classes and scope conditional imports for PR #7438 * Scope CLI stream setup to the entry point and align two encoding pairs for PR #7438 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: danielhanchen <danielhanchen@gmail.com>
201 lines
7.3 KiB
Python
201 lines
7.3 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
|
|
"""Regression tests for the CUDA-vs-MLX dispatch gates Unsloth relies on.
|
|
|
|
Two gates: (1) ``unsloth._IS_MLX`` (import-time, delegates to the zoo MLX
|
|
runtime gate behind a local precheck barrier); (2)
|
|
``utils.hardware.detect_hardware()`` (runtime, CUDA->XPU->MLX->CPU). These
|
|
are the canaries against "MLX support accidentally hijacks CUDA/AMD/Intel
|
|
users": we check the _IS_MLX helper structure, flip both gates True under a
|
|
spoofed Darwin+arm64 with a fake mlx module, and confirm both stay CUDA-side
|
|
on the real host. No real MLX install needed.
|
|
"""
|
|
|
|
import ast
|
|
import importlib
|
|
import sys
|
|
import types
|
|
from pathlib import Path
|
|
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
UNSLOTH_INIT = REPO_ROOT / "unsloth" / "__init__.py"
|
|
|
|
|
|
# 1. Source-level structure check on _IS_MLX (no platform dependencies).
|
|
|
|
|
|
def test_is_mlx_gate_uses_three_required_predicates():
|
|
"""_IS_MLX must AND Darwin+arm64+importable-mlx; dropping any breaks dispatch."""
|
|
tree = ast.parse(UNSLOTH_INIT.read_text(encoding = "utf-8"))
|
|
|
|
target = None
|
|
for node in ast.walk(tree):
|
|
if (
|
|
isinstance(node, ast.Assign)
|
|
and len(node.targets) == 1
|
|
and isinstance(node.targets[0], ast.Name)
|
|
and node.targets[0].id == "_IS_MLX"
|
|
):
|
|
target = node.value
|
|
break
|
|
assert target is not None, "_IS_MLX assignment not found in unsloth/__init__.py"
|
|
assert isinstance(target, ast.Call), "_IS_MLX must call the shared MLX helper"
|
|
expr_src = ast.unparse(target)
|
|
assert expr_src == "_is_mlx_available()", "_IS_MLX must delegate to the shared MLX runtime gate"
|
|
|
|
helper = None
|
|
for node in ast.walk(tree):
|
|
if isinstance(node, ast.FunctionDef) and node.name == "_is_mlx_available":
|
|
helper = node
|
|
break
|
|
assert helper is not None, "_is_mlx_available helper not found"
|
|
|
|
helper_src = ast.unparse(helper)
|
|
assert (
|
|
"platform.system()" in helper_src
|
|
and "'Darwin'" in helper_src
|
|
and "platform.machine()" in helper_src
|
|
and "'arm64'" in helper_src
|
|
and "find_spec" in helper_src
|
|
and "'mlx'" in helper_src
|
|
and "from unsloth_zoo.mlx import is_mlx_available" in helper_src
|
|
), "_IS_MLX helper must precheck local MLX predicates before importing zoo"
|
|
assert (
|
|
"from unsloth_zoo.mlx import is_mlx_available" in helper_src
|
|
and "return is_mlx_available()" in helper_src
|
|
), "_IS_MLX helper must delegate final detection to the shared zoo MLX runtime gate"
|
|
assert helper_src.index("UNSLOTH_FORCE_GPU_PATH") < helper_src.index(
|
|
"from unsloth_zoo.mlx import is_mlx_available"
|
|
), "_IS_MLX helper must run the local MLX precheck before importing zoo"
|
|
|
|
|
|
# 2. Runtime gate behavior with platform spoofed to Apple Silicon + fake mlx.
|
|
# Re-evaluates the expression rather than reloading unsloth (avoids a torch
|
|
# cascade-reload).
|
|
|
|
|
|
def _evaluate_is_mlx_precheck(platform_module, importlib_util, os_module):
|
|
"""Re-evaluate the local _is_mlx_available precheck with injected deps."""
|
|
return (
|
|
os_module.environ.get("UNSLOTH_FORCE_GPU_PATH", "0") != "1"
|
|
and platform_module.system() == "Darwin"
|
|
and platform_module.machine() == "arm64"
|
|
and importlib_util.find_spec("mlx") is not None
|
|
)
|
|
|
|
|
|
def test_is_mlx_gate_true_on_apple_silicon_with_mlx_present(monkeypatch):
|
|
import platform
|
|
import importlib.util
|
|
|
|
# Fake mlx so find_spec returns a non-None ModuleSpec.
|
|
fake_mlx = types.ModuleType("mlx")
|
|
fake_mlx.__spec__ = importlib.machinery.ModuleSpec("mlx", loader = None)
|
|
fake_mlx.__path__ = []
|
|
monkeypatch.setitem(sys.modules, "mlx", fake_mlx)
|
|
|
|
monkeypatch.setattr(platform, "system", lambda: "Darwin")
|
|
monkeypatch.setattr(platform, "machine", lambda: "arm64")
|
|
|
|
import os
|
|
|
|
assert _evaluate_is_mlx_precheck(platform, importlib.util, os) is True
|
|
|
|
|
|
def test_is_mlx_gate_false_when_mlx_missing(monkeypatch):
|
|
import platform
|
|
import importlib.util
|
|
|
|
# Apple Silicon but no mlx -> gate must be False.
|
|
monkeypatch.delitem(sys.modules, "mlx", raising = False)
|
|
monkeypatch.setattr(platform, "system", lambda: "Darwin")
|
|
monkeypatch.setattr(platform, "machine", lambda: "arm64")
|
|
|
|
real_find_spec = importlib.util.find_spec
|
|
|
|
def _no_mlx(name, *args, **kwargs):
|
|
if name == "mlx":
|
|
return None
|
|
return real_find_spec(name, *args, **kwargs)
|
|
|
|
monkeypatch.setattr(importlib.util, "find_spec", _no_mlx)
|
|
|
|
import os
|
|
|
|
assert _evaluate_is_mlx_precheck(platform, importlib.util, os) is False
|
|
|
|
|
|
def test_is_mlx_gate_false_on_non_apple_silicon():
|
|
"""On the real Linux+CUDA / AMD / Intel test host, the gate stays False."""
|
|
import platform
|
|
import importlib.util
|
|
|
|
if platform.system() == "Darwin" and platform.machine() == "arm64":
|
|
import pytest
|
|
pytest.skip("Test host is Apple Silicon; CUDA-side canary doesn't apply.")
|
|
|
|
import os
|
|
|
|
assert _evaluate_is_mlx_precheck(platform, importlib.util, os) is False
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 3. detect_hardware() picks MLX only when CUDA+XPU are both unavailable AND
|
|
# the host is Apple Silicon AND mlx is importable.
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _import_studio_hardware():
|
|
"""Lazy import of the Unsloth hardware module (studio/backend on sys.path)."""
|
|
studio_backend = REPO_ROOT / "studio" / "backend"
|
|
if str(studio_backend) not in sys.path:
|
|
sys.path.insert(0, str(studio_backend))
|
|
from utils.hardware import hardware as hw # type: ignore
|
|
|
|
return hw
|
|
|
|
|
|
def test_detect_hardware_picks_mlx_when_only_apple_silicon_available(monkeypatch):
|
|
hw = _import_studio_hardware()
|
|
|
|
# Force CUDA + XPU off so detect_hardware falls through to MLX.
|
|
import torch
|
|
|
|
monkeypatch.setattr(torch.cuda, "is_available", lambda: False)
|
|
if hasattr(torch, "xpu"):
|
|
monkeypatch.setattr(torch.xpu, "is_available", lambda: False)
|
|
|
|
# Spoof Apple Silicon + importable mlx.core for _has_mlx().
|
|
import platform
|
|
|
|
monkeypatch.setattr(platform, "system", lambda: "Darwin")
|
|
monkeypatch.setattr(platform, "machine", lambda: "arm64")
|
|
|
|
fake_mlx = types.ModuleType("mlx")
|
|
fake_mlx_core = types.ModuleType("mlx.core")
|
|
fake_mlx.core = fake_mlx_core
|
|
monkeypatch.setitem(sys.modules, "mlx", fake_mlx)
|
|
monkeypatch.setitem(sys.modules, "mlx.core", fake_mlx_core)
|
|
|
|
# detect_hardware now gates MLX on the full stack via _has_usable_mlx_stack()
|
|
# (utils.mlx_repair.mlx_stack_available imports mlx_lm/mlx_vlm and checks
|
|
# versions); faking mlx.core alone no longer satisfies it. This test asserts the
|
|
# dispatch decision when the stack IS usable, so model that directly.
|
|
monkeypatch.setattr(hw, "_has_usable_mlx_stack", lambda: True)
|
|
|
|
detected = hw.detect_hardware()
|
|
assert detected == hw.DeviceType.MLX, f"expected MLX, got {detected!r}"
|
|
|
|
|
|
def test_detect_hardware_picks_cuda_on_real_host():
|
|
"""Canary: a real CUDA host must dispatch to CUDA even if mlx is importable."""
|
|
import torch
|
|
|
|
if not torch.cuda.is_available():
|
|
import pytest
|
|
pytest.skip("No CUDA available on this host; canary not applicable.")
|
|
|
|
hw = _import_studio_hardware()
|
|
detected = hw.detect_hardware()
|
|
assert detected == hw.DeviceType.CUDA, f"CUDA host must dispatch to CUDA, got {detected!r}"
|