fix: keep LoRA reloads working with PEFT 0.19 (#6748)
* fix: keep LoRA reloads working with PEFT 0.19 * test: exercise the PEFT tensor-parallel symbol extractor * test: prove the full PEFT tensor-parallel seam * fix: harden PEFT tensor-parallel shims * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: fall back when PEFT tensor-parallel source inspection fails --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Lee Jackson <130007945+Imagineer99@users.noreply.github.com> Co-authored-by: imagineer99 <samleejackson0@gmail.com>
This commit is contained in:
Rod Boev
GitHub
parent
d915a139eb
commit
2246a6c9ae
4 changed files with 402 additions and 4 deletions
|
|
@ -23,6 +23,7 @@ import inspect
|
|||
import os
|
||||
import re
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from importlib.metadata import version as importlib_version
|
||||
|
||||
import pytest
|
||||
|
|
@ -593,6 +594,7 @@ def test_accelerate_gather_empty_logits_debug_mode_patch():
|
|||
orig_debug = state.debug
|
||||
orig_dist_type = state.distributed_type
|
||||
orig_num_processes = state.num_processes
|
||||
orig_device = state.device
|
||||
|
||||
state.debug = True
|
||||
state.distributed_type = DistributedType.MULTI_GPU
|
||||
|
|
@ -624,6 +626,8 @@ def test_accelerate_gather_empty_logits_debug_mode_patch():
|
|||
side_effect = mock_gpu_broadcast,
|
||||
),
|
||||
):
|
||||
state.device = torch.device("cpu")
|
||||
|
||||
# Top-level EmptyLogits gathers to itself
|
||||
res = acc_ops.gather(e)
|
||||
assert res is e
|
||||
|
|
@ -656,6 +660,7 @@ def test_accelerate_gather_empty_logits_debug_mode_patch():
|
|||
state.debug = orig_debug
|
||||
state.distributed_type = orig_dist_type
|
||||
state.num_processes = orig_num_processes
|
||||
state.device = orig_device
|
||||
|
||||
|
||||
def test_accelerate_patch_is_idempotent():
|
||||
|
|
@ -698,10 +703,8 @@ def test_accelerate_find_device_skips_empty_logits():
|
|||
|
||||
def test_accelerate_patch_wired_into_gpu_init():
|
||||
"""The patch must be installed at startup, not only importable."""
|
||||
import pathlib
|
||||
import unsloth.import_fixes as import_fixes
|
||||
|
||||
source = pathlib.Path(import_fixes.__file__).with_name("_gpu_init.py").read_text()
|
||||
source = Path(__file__).resolve().parent.parent / "unsloth" / "_gpu_init.py"
|
||||
source = source.read_text()
|
||||
assert "patch_accelerate_recursively_apply()" in source, (
|
||||
"DRIFT DETECTED: patch_accelerate_recursively_apply is defined but "
|
||||
"never called in _gpu_init.py, so real imports never install it."
|
||||
|
|
|
|||
252
tests/test_peft_tensor_parallel_compat.py
Normal file
252
tests/test_peft_tensor_parallel_compat.py
Normal file
|
|
@ -0,0 +1,252 @@
|
|||
import importlib.machinery
|
||||
import importlib.util
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import types
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
REPO_ROOT = Path(__file__).resolve().parents[1]
|
||||
IMPORT_FIXES = REPO_ROOT / "unsloth" / "import_fixes.py"
|
||||
|
||||
|
||||
def _load_import_fixes():
|
||||
spec = importlib.util.spec_from_file_location("_unsloth_import_fixes_peft_tp", IMPORT_FIXES)
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
|
||||
|
||||
def _install_fake_module(
|
||||
name,
|
||||
*,
|
||||
is_package = False,
|
||||
attrs = None,
|
||||
):
|
||||
module = types.ModuleType(name)
|
||||
module.__spec__ = importlib.machinery.ModuleSpec(name, loader = None, is_package = is_package)
|
||||
if is_package:
|
||||
module.__path__ = []
|
||||
if attrs:
|
||||
for k, v in attrs.items():
|
||||
setattr(module, k, v)
|
||||
sys.modules[name] = module
|
||||
return module
|
||||
|
||||
|
||||
@pytest.fixture(autouse = True)
|
||||
def _restore_import_fixtures():
|
||||
keep = {
|
||||
"transformers",
|
||||
"transformers.integrations",
|
||||
"transformers.integrations.tensor_parallel",
|
||||
"peft",
|
||||
"peft.utils",
|
||||
"peft.utils.save_and_load",
|
||||
}
|
||||
snapshot = {name: sys.modules.get(name) for name in keep}
|
||||
yield
|
||||
for name, value in snapshot.items():
|
||||
if value is None:
|
||||
sys.modules.pop(name, None)
|
||||
else:
|
||||
sys.modules[name] = value
|
||||
|
||||
|
||||
def _install_fake_transformers_tensor_parallel(existing):
|
||||
transformers = _install_fake_module("transformers", is_package = True)
|
||||
integrations = _install_fake_module("transformers.integrations", is_package = True)
|
||||
setattr(transformers, "integrations", integrations)
|
||||
|
||||
tp = _install_fake_module(
|
||||
"transformers.integrations.tensor_parallel",
|
||||
attrs = existing,
|
||||
)
|
||||
setattr(integrations, "tensor_parallel", tp)
|
||||
return tp
|
||||
|
||||
|
||||
def _fake_peft_shard_state_dict_for_tp():
|
||||
from transformers.integrations.tensor_parallel import (
|
||||
ALL_PARALLEL_STYLES,
|
||||
ColwiseParallel,
|
||||
EmbeddingParallel,
|
||||
RowwiseParallel,
|
||||
)
|
||||
return (
|
||||
ALL_PARALLEL_STYLES,
|
||||
ColwiseParallel,
|
||||
EmbeddingParallel,
|
||||
RowwiseParallel,
|
||||
)
|
||||
|
||||
|
||||
def _install_fake_peft_tensor_parallel_import():
|
||||
peft = _install_fake_module("peft", is_package = True)
|
||||
utils = _install_fake_module("peft.utils", is_package = True)
|
||||
setattr(peft, "utils", utils)
|
||||
|
||||
save_and_load = _install_fake_module("peft.utils.save_and_load")
|
||||
save_and_load._maybe_shard_state_dict_for_tp = _fake_peft_shard_state_dict_for_tp
|
||||
setattr(utils, "save_and_load", save_and_load)
|
||||
return save_and_load
|
||||
|
||||
|
||||
def test_missing_tensor_parallel_symbol_import_succeeds_after_fix(monkeypatch):
|
||||
module = _load_import_fixes()
|
||||
|
||||
_install_fake_peft_tensor_parallel_import()
|
||||
_install_fake_transformers_tensor_parallel(
|
||||
{
|
||||
"ColwiseParallel": object,
|
||||
"RowwiseParallel": object,
|
||||
}
|
||||
)
|
||||
|
||||
with pytest.raises(ImportError):
|
||||
_fake_peft_shard_state_dict_for_tp()
|
||||
|
||||
assert module.fix_peft_transformers_tensor_parallel_import_compat() is True
|
||||
|
||||
import transformers.integrations.tensor_parallel as patched
|
||||
|
||||
all_parallel_styles, _, embedding_parallel, _ = _fake_peft_shard_state_dict_for_tp()
|
||||
|
||||
assert patched == sys.modules["transformers.integrations.tensor_parallel"]
|
||||
assert embedding_parallel is getattr(patched, "EmbeddingParallel")
|
||||
assert getattr(embedding_parallel, "__unsloth_stub__", False)
|
||||
with pytest.raises(NotImplementedError, match = "ALL_PARALLEL_STYLES"):
|
||||
all_parallel_styles["rowwise"]
|
||||
with pytest.raises(NotImplementedError, match = "ALL_PARALLEL_STYLES"):
|
||||
"rowwise" in all_parallel_styles
|
||||
with pytest.raises(NotImplementedError, match = "ALL_PARALLEL_STYLES"):
|
||||
iter(all_parallel_styles)
|
||||
with pytest.raises(NotImplementedError, match = "ALL_PARALLEL_STYLES"):
|
||||
len(all_parallel_styles)
|
||||
|
||||
|
||||
def test_existing_embedding_parallel_is_not_replaced(monkeypatch):
|
||||
module = _load_import_fixes()
|
||||
|
||||
class RealEmbeddingParallel:
|
||||
pass
|
||||
|
||||
tp_mod = _install_fake_transformers_tensor_parallel(
|
||||
{
|
||||
"EmbeddingParallel": RealEmbeddingParallel,
|
||||
"ColwiseParallel": object,
|
||||
}
|
||||
)
|
||||
|
||||
monkeypatch.setattr(
|
||||
module,
|
||||
"_extract_peft_tensor_parallel_imported_symbols",
|
||||
lambda: ("ALL_PARALLEL_STYLES", "ColwiseParallel", "EmbeddingParallel", "RowwiseParallel"),
|
||||
)
|
||||
assert module.fix_peft_transformers_tensor_parallel_import_compat() is True
|
||||
|
||||
assert tp_mod.EmbeddingParallel is RealEmbeddingParallel
|
||||
assert not getattr(tp_mod.EmbeddingParallel, "__unsloth_stub__", False)
|
||||
|
||||
|
||||
def test_missing_tensor_parallel_module_is_not_created(monkeypatch):
|
||||
module = _load_import_fixes()
|
||||
previous_tp_module = sys.modules.pop("transformers.integrations.tensor_parallel", None)
|
||||
|
||||
original_find_spec = module.importlib.util.find_spec
|
||||
|
||||
def fake_find_spec(name):
|
||||
if name == "transformers.integrations.tensor_parallel":
|
||||
return None
|
||||
return original_find_spec(name)
|
||||
|
||||
monkeypatch.setattr(module.importlib.util, "find_spec", fake_find_spec)
|
||||
monkeypatch.setattr(
|
||||
module,
|
||||
"_extract_peft_tensor_parallel_imported_symbols",
|
||||
lambda: ("EmbeddingParallel",),
|
||||
)
|
||||
|
||||
assert module.fix_peft_transformers_tensor_parallel_import_compat() is None
|
||||
|
||||
try:
|
||||
spec = importlib.util.find_spec("transformers.integrations.tensor_parallel")
|
||||
except ModuleNotFoundError as exc:
|
||||
assert exc.name == "transformers"
|
||||
else:
|
||||
assert spec is None
|
||||
assert "transformers.integrations.tensor_parallel" not in sys.modules
|
||||
|
||||
|
||||
def test_placeholder_raises_on_real_use(monkeypatch):
|
||||
module = _load_import_fixes()
|
||||
|
||||
tp_mod = _install_fake_transformers_tensor_parallel({})
|
||||
monkeypatch.setattr(
|
||||
module,
|
||||
"_extract_peft_tensor_parallel_imported_symbols",
|
||||
lambda: ("EmbeddingParallel",),
|
||||
)
|
||||
assert module.fix_peft_transformers_tensor_parallel_import_compat() is True
|
||||
|
||||
with pytest.raises(NotImplementedError, match = "EmbeddingParallel"):
|
||||
tp_mod.EmbeddingParallel()
|
||||
|
||||
assert getattr(tp_mod.EmbeddingParallel, "__unsloth_stub__", False)
|
||||
|
||||
|
||||
def test_symbol_extractor_falls_back_when_parse_returns_no_identifiers(monkeypatch):
|
||||
module = _load_import_fixes()
|
||||
|
||||
_install_fake_peft_tensor_parallel_import()
|
||||
monkeypatch.setattr(
|
||||
module.inspect,
|
||||
"getsource",
|
||||
lambda _: "from transformers.integrations.tensor_parallel import ()",
|
||||
)
|
||||
|
||||
assert module._extract_peft_tensor_parallel_imported_symbols() == (
|
||||
"ALL_PARALLEL_STYLES",
|
||||
"ColwiseParallel",
|
||||
"EmbeddingParallel",
|
||||
"RowwiseParallel",
|
||||
)
|
||||
|
||||
|
||||
def test_symbol_extractor_falls_back_when_getsource_fails(monkeypatch):
|
||||
module = _load_import_fixes()
|
||||
|
||||
_install_fake_peft_tensor_parallel_import()
|
||||
monkeypatch.setattr(
|
||||
module.inspect,
|
||||
"getsource",
|
||||
lambda _: (_ for _ in ()).throw(ValueError("no source")),
|
||||
)
|
||||
|
||||
assert module._extract_peft_tensor_parallel_imported_symbols() == (
|
||||
"ALL_PARALLEL_STYLES",
|
||||
"ColwiseParallel",
|
||||
"EmbeddingParallel",
|
||||
"RowwiseParallel",
|
||||
)
|
||||
|
||||
|
||||
def test_tensor_parallel_import_module_not_found_returns_none(monkeypatch):
|
||||
module = _load_import_fixes()
|
||||
_install_fake_peft_tensor_parallel_import()
|
||||
|
||||
monkeypatch.setattr(
|
||||
module.importlib.util,
|
||||
"find_spec",
|
||||
lambda name: object() if name == "transformers.integrations.tensor_parallel" else None,
|
||||
)
|
||||
|
||||
def _raise_missing(name):
|
||||
exc = ModuleNotFoundError(name)
|
||||
exc.name = name
|
||||
raise exc
|
||||
|
||||
monkeypatch.setattr(module.importlib, "import_module", _raise_missing)
|
||||
|
||||
assert module.fix_peft_transformers_tensor_parallel_import_compat() is None
|
||||
Loading…
Add table
Add a link
Reference in a new issue