[Refactor] Define MultiModalKwargsItems separate from MultiModalKwargs (#23053)
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
This commit is contained in:
@@ -11,7 +11,9 @@ from vllm.logger import init_logger
|
||||
from vllm.utils import GiB_bytes, LRUCache
|
||||
from vllm.utils.jsontree import json_map_leaves, json_reduce_leaves
|
||||
|
||||
from .inputs import MultiModalKwargs, MultiModalKwargsItem, NestedTensors
|
||||
from .inputs import (MultiModalFieldElem, MultiModalKwargs,
|
||||
MultiModalKwargsItem, MultiModalKwargsItems,
|
||||
NestedTensors)
|
||||
|
||||
logger = init_logger(__name__)
|
||||
|
||||
@@ -26,8 +28,9 @@ class MultiModalCacheItemMetadata:
|
||||
|
||||
|
||||
MultiModalCacheValue = Union[
|
||||
MultiModalKwargs,
|
||||
MultiModalKwargsItems,
|
||||
MultiModalKwargsItem,
|
||||
MultiModalKwargs,
|
||||
Mapping[str, NestedTensors],
|
||||
MultiModalCacheItemMetadata,
|
||||
]
|
||||
@@ -44,14 +47,16 @@ class MultiModalCache:
|
||||
*,
|
||||
debug: bool = False,
|
||||
) -> int:
|
||||
# MultiModalKwargs is not a subclass of dict
|
||||
if isinstance(leaf, MultiModalKwargs):
|
||||
return cls.get_item_size(leaf.get_data(), debug=debug)
|
||||
if isinstance(leaf, MultiModalFieldElem):
|
||||
return cls.get_item_size(leaf.data) # type: ignore
|
||||
|
||||
# MultiModalKwargsItem is not a subclass of dict
|
||||
# These are not subclasses of dict
|
||||
if isinstance(leaf, MultiModalKwargsItems):
|
||||
return cls.get_item_size(leaf.data) # type: ignore
|
||||
if isinstance(leaf, MultiModalKwargsItem):
|
||||
leaf_data = {k: v.data for k, v in leaf.items()}
|
||||
return cls.get_item_size(leaf_data, debug=debug)
|
||||
return cls.get_item_size(leaf.data) # type: ignore
|
||||
if isinstance(leaf, MultiModalKwargs):
|
||||
return cls.get_item_size(leaf.data) # type: ignore
|
||||
|
||||
# sys.getsizeof doesn't work for tensors
|
||||
if isinstance(leaf, torch.Tensor):
|
||||
|
||||
Reference in New Issue
Block a user