[Bugfix] Refactor composite weight loading logic (#8656)
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
# Copyright (c) 2023 OpenGVLab
|
||||
# Licensed under The MIT License [see LICENSE for details]
|
||||
# --------------------------------------------------------
|
||||
import itertools
|
||||
import re
|
||||
from typing import (Iterable, List, Literal, Mapping, Optional, Tuple,
|
||||
TypedDict, Union)
|
||||
@@ -33,8 +32,8 @@ from vllm.utils import is_list_of
|
||||
from .clip import (dummy_image_for_clip, dummy_seq_data_for_clip,
|
||||
get_clip_num_patches)
|
||||
from .interfaces import SupportsMultiModal
|
||||
from .utils import (filter_weights, flatten_bn, init_vllm_registered_model,
|
||||
merge_multimodal_embeddings)
|
||||
from .utils import (flatten_bn, group_weights_with_prefix,
|
||||
init_vllm_registered_model, merge_multimodal_embeddings)
|
||||
|
||||
IMG_START = '<img>'
|
||||
IMG_END = '</img>'
|
||||
@@ -518,21 +517,18 @@ class InternVLChatModel(nn.Module, SupportsMultiModal):
|
||||
|
||||
def load_weights(self, weights: Iterable[Tuple[str, torch.Tensor]]):
|
||||
# prepare weight iterators for components
|
||||
vit_weights, mlp_weights, llm_weights = itertools.tee(weights, 3)
|
||||
weights_group = group_weights_with_prefix(weights)
|
||||
|
||||
# load vision encoder
|
||||
vit_weights = filter_weights(vit_weights, "vision_model")
|
||||
self.vision_model.load_weights(vit_weights)
|
||||
self.vision_model.load_weights(weights_group["vision_model"])
|
||||
|
||||
# load mlp projector
|
||||
mlp_weights = filter_weights(mlp_weights, "mlp1")
|
||||
mlp_params_dict = dict(self.mlp1.named_parameters())
|
||||
for name, loaded_weight in mlp_weights:
|
||||
for name, loaded_weight in weights_group["mlp1"]:
|
||||
param = mlp_params_dict[name]
|
||||
weight_loader = getattr(param, "weight_loader",
|
||||
default_weight_loader)
|
||||
weight_loader(param, loaded_weight)
|
||||
|
||||
# load llm backbone
|
||||
llm_weights = filter_weights(llm_weights, "language_model")
|
||||
self.language_model.load_weights(llm_weights)
|
||||
self.language_model.load_weights(weights_group["language_model"])
|
||||
|
||||
Reference in New Issue
Block a user