[Bugfix] Fix layerwise reload alias-buffer corruption (#42481)
Signed-off-by: rasdani <73563550+rasdani@users.noreply.github.com> Co-authored-by: OpenAI Codex <codex@openai.com> Co-authored-by: Roger Wang <hey@rogerw.io>
This commit is contained in:
co-authored by
OpenAI Codex
Roger Wang
parent
bd9dbe6060
commit
1ccdf87507
@@ -6,8 +6,15 @@ from weakref import WeakKeyDictionary, ref
|
||||
|
||||
import pytest
|
||||
import torch
|
||||
from torch.nn.parameter import UninitializedParameter
|
||||
|
||||
import vllm.model_executor.model_loader.reload.meta as reload_meta
|
||||
from vllm.model_executor.layers.linear import QKVParallelLinear
|
||||
from vllm.model_executor.model_loader.reload.layerwise import (
|
||||
finalize_layerwise_reload,
|
||||
initialize_layerwise_reload,
|
||||
record_metadata_for_reloading,
|
||||
)
|
||||
from vllm.model_executor.model_loader.reload.meta import (
|
||||
capture_layer_to_meta,
|
||||
get_numel_loaded,
|
||||
@@ -21,6 +28,38 @@ from vllm.model_executor.model_loader.reload.utils import get_layer_tensors
|
||||
from vllm.platforms import current_platform
|
||||
|
||||
|
||||
class _AliasedBufferLayer(torch.nn.Module):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
weight = torch.arange(6, dtype=torch.float32).reshape(2, 3)
|
||||
self.weight = torch.nn.Parameter(weight)
|
||||
self.register_buffer(
|
||||
"weight_view", self.weight.detach().view(-1), persistent=False
|
||||
)
|
||||
|
||||
|
||||
class _ParentAliasedChildBufferLayer(torch.nn.Module):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.scale = torch.nn.Parameter(torch.ones(1))
|
||||
self.conv1d = torch.nn.Linear(3, 2, bias=False)
|
||||
self.conv1d.weight.data.copy_(
|
||||
torch.arange(6, dtype=torch.float32).reshape(2, 3)
|
||||
)
|
||||
self.register_buffer(
|
||||
"conv_weights", self.conv1d.weight.detach().view(-1), persistent=False
|
||||
)
|
||||
|
||||
|
||||
class _AliasedBufferWithUninitializedChildLayer(_AliasedBufferLayer):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.child = torch.nn.Module()
|
||||
self.child.register_parameter(
|
||||
"lazy_weight", UninitializedParameter(requires_grad=False)
|
||||
)
|
||||
|
||||
|
||||
def test_move_metatensors():
|
||||
tensor = torch.empty((1, 2, 3))
|
||||
meta_tensor = to_meta_tensor(tensor)
|
||||
@@ -123,6 +162,81 @@ def test_get_numel_loaded():
|
||||
assert ret == "value"
|
||||
|
||||
|
||||
def test_layerwise_reload_skips_non_persistent_parameter_alias_buffers(monkeypatch):
|
||||
layer = _AliasedBufferLayer()
|
||||
model = torch.nn.Sequential(layer)
|
||||
loaded_weight = torch.full_like(layer.weight, 7.0)
|
||||
|
||||
def materialize_with_sentinel(meta_tensor):
|
||||
tensor = torch.empty_strided(
|
||||
size=tuple(meta_tensor.size()),
|
||||
stride=tuple(meta_tensor.stride()),
|
||||
dtype=meta_tensor.dtype,
|
||||
requires_grad=False,
|
||||
)
|
||||
tensor.fill_(-123.0)
|
||||
tensor.__class__ = meta_tensor.__class__
|
||||
tensor.__dict__ = meta_tensor.__dict__.copy()
|
||||
return tensor
|
||||
|
||||
monkeypatch.setattr(
|
||||
reload_meta, "materialize_meta_tensor", materialize_with_sentinel
|
||||
)
|
||||
|
||||
record_metadata_for_reloading(model)
|
||||
initialize_layerwise_reload(model)
|
||||
layer.weight.weight_loader(layer.weight, loaded_weight)
|
||||
finalize_layerwise_reload(model, model_config=None)
|
||||
|
||||
assert torch.equal(layer.weight, loaded_weight)
|
||||
assert layer.weight_view.untyped_storage().data_ptr() == (
|
||||
layer.weight.untyped_storage().data_ptr()
|
||||
)
|
||||
|
||||
|
||||
def test_capture_layer_to_meta_skips_uninitialized_parameter_storage_ptrs():
|
||||
layer = _AliasedBufferWithUninitializedChildLayer()
|
||||
|
||||
_, buffers = capture_layer_to_meta(layer)
|
||||
|
||||
assert "weight_view" not in buffers
|
||||
|
||||
|
||||
def test_layerwise_reload_skips_child_parameter_alias_buffers(monkeypatch):
|
||||
layer = _ParentAliasedChildBufferLayer()
|
||||
model = torch.nn.Sequential(layer)
|
||||
loaded_conv = torch.full_like(layer.conv1d.weight, 7.0)
|
||||
loaded_scale = torch.full_like(layer.scale, 3.0)
|
||||
|
||||
def materialize_with_sentinel(meta_tensor):
|
||||
tensor = torch.empty_strided(
|
||||
size=tuple(meta_tensor.size()),
|
||||
stride=tuple(meta_tensor.stride()),
|
||||
dtype=meta_tensor.dtype,
|
||||
requires_grad=False,
|
||||
)
|
||||
tensor.fill_(-123.0)
|
||||
tensor.__class__ = meta_tensor.__class__
|
||||
tensor.__dict__ = meta_tensor.__dict__.copy()
|
||||
return tensor
|
||||
|
||||
monkeypatch.setattr(
|
||||
reload_meta, "materialize_meta_tensor", materialize_with_sentinel
|
||||
)
|
||||
|
||||
record_metadata_for_reloading(model)
|
||||
initialize_layerwise_reload(model)
|
||||
layer.conv1d.weight.weight_loader(layer.conv1d.weight, loaded_conv)
|
||||
layer.scale.weight_loader(layer.scale, loaded_scale)
|
||||
finalize_layerwise_reload(model, model_config=None)
|
||||
|
||||
assert torch.equal(layer.conv1d.weight, loaded_conv)
|
||||
assert torch.equal(layer.conv_weights, loaded_conv.view(-1))
|
||||
assert layer.conv_weights.untyped_storage().data_ptr() == (
|
||||
layer.conv1d.weight.untyped_storage().data_ptr()
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"tp_size", [pytest.param(1), pytest.param(2, marks=[pytest.mark.slow_test])]
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user