A high-throughput and memory-efficient inference and serving engine for LLMs
Mirrored from https://github.com/tduncan-lum/Nvidia-Optimization-Stack---VLLM.git
Synced Nov 14, 05:30 UTC
[Misc] Move jsontree to utils (#22622)
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Cyrus Leung committed
Aug 11, 2025 at 18:49 UTC
951b038298cae379d1321087a296882aae61fce7
8 files changed
+7
-7
vllm/inputs/registry.py
+1
-1
@@ -8,10 +8,10 @@ import torch
8
from transformers import BatchFeature, PretrainedConfig, ProcessorMixin
9
from typing_extensions import TypeVar
10
11
-from vllm.jsontree import JSONTree, json_map_leaves
11
from vllm.logger import init_logger
12
from vllm.transformers_utils.processor import cached_processor_from_config
13
from vllm.utils import get_allowed_kwarg_only_overrides
14
+from vllm.utils.jsontree import JSONTree, json_map_leaves
15
16
if TYPE_CHECKING:
17
from vllm.config import ModelConfig
vllm/model_executor/models/aya_vision.py
+1
-1
@@ -16,7 +16,6 @@ from transformers.models.got_ocr2.image_processing_got_ocr2 import (
16
get_optimal_tiled_canvas)
17
18
from vllm.config import VllmConfig
19
-from vllm.jsontree import json_map_leaves
19
from vllm.model_executor.sampling_metadata import SamplingMetadata
20
from vllm.multimodal import MULTIMODAL_REGISTRY
21
from vllm.multimodal.inputs import MultiModalDataDict, MultiModalKwargs
@@ -29,6 +28,7 @@ from vllm.multimodal.processing import (BaseMultiModalProcessor,
28
PromptUpdateDetails)
29
from vllm.multimodal.profiling import BaseDummyInputsBuilder
30
from vllm.sequence import IntermediateTensors
31
+from vllm.utils.jsontree import json_map_leaves
32
from vllm.utils.tensor_schema import TensorSchema, TensorShape
33
34
from .interfaces import MultiModalEmbeddings, SupportsMultiModal, SupportsPP
vllm/model_executor/models/llava.py
+1
-1
@@ -16,7 +16,6 @@ from transformers.models.pixtral import PixtralProcessor
16
17
from vllm.config import VllmConfig
18
from vllm.inputs import InputProcessingContext
19
-from vllm.jsontree import json_map_leaves
19
from vllm.model_executor.layers.activation import get_act_fn
20
from vllm.model_executor.layers.linear import (ColumnParallelLinear,
21
RowParallelLinear)
@@ -33,6 +32,7 @@ from vllm.multimodal.processing import (BaseMultiModalProcessor,
32
PromptUpdateDetails)
33
from vllm.multimodal.profiling import BaseDummyInputsBuilder
34
from vllm.sequence import IntermediateTensors
35
+from vllm.utils.jsontree import json_map_leaves
36
from vllm.utils.tensor_schema import TensorSchema, TensorShape
37
38
from .clip import CLIPVisionModel
vllm/model_executor/models/minimax_vl_01.py
+1
-1
@@ -8,7 +8,6 @@ import torch.nn as nn
8
from transformers import BatchFeature, PretrainedConfig
9
10
from vllm.config import VllmConfig
11
-from vllm.jsontree import json_map_leaves
11
from vllm.model_executor.layers.activation import get_act_fn
12
from vllm.model_executor.layers.linear import (ColumnParallelLinear,
13
RowParallelLinear)
@@ -17,6 +16,7 @@ from vllm.model_executor.sampling_metadata import SamplingMetadata
16
from vllm.multimodal import MULTIMODAL_REGISTRY
17
from vllm.multimodal.inputs import MultiModalFieldConfig
18
from vllm.sequence import IntermediateTensors
19
+from vllm.utils.jsontree import json_map_leaves
20
21
from .clip import CLIPVisionModel
22
from .interfaces import MultiModalEmbeddings, SupportsMultiModal, SupportsPP
vllm/model_executor/models/tarsier.py
+1
-1
@@ -18,7 +18,6 @@ from transformers.tokenization_utils_base import PreTokenizedInput, TextInput
18
19
from vllm.config import VllmConfig
20
from vllm.inputs import InputProcessingContext
21
-from vllm.jsontree import json_map_leaves
21
from vllm.model_executor.layers.activation import get_act_fn
22
from vllm.model_executor.layers.linear import (ColumnParallelLinear,
23
RowParallelLinear)
@@ -34,6 +33,7 @@ from vllm.multimodal.processing import (BaseMultiModalProcessor,
33
PromptReplacement, PromptUpdate)
34
from vllm.multimodal.profiling import BaseDummyInputsBuilder
35
from vllm.sequence import IntermediateTensors
36
+from vllm.utils.jsontree import json_map_leaves
37
38
from .clip import CLIPVisionModel
39
from .interfaces import MultiModalEmbeddings, SupportsMultiModal, SupportsPP
vllm/multimodal/cache.py
+1
-1
@@ -7,9 +7,9 @@ from typing import TypeVar, Union
7
8
import torch
9
10
-from vllm.jsontree import json_map_leaves, json_reduce_leaves
10
from vllm.logger import init_logger
11
from vllm.utils import GiB_bytes, LRUCache
12
+from vllm.utils.jsontree import json_map_leaves, json_reduce_leaves
13
14
from .inputs import MultiModalKwargs, MultiModalKwargsItem, NestedTensors
15
vllm/multimodal/inputs.py
+1
-1
@@ -13,8 +13,8 @@ from typing import (TYPE_CHECKING, Any, Literal, Optional, TypedDict, TypeVar,
13
import numpy as np
14
from typing_extensions import NotRequired, TypeAlias
15
16
-from vllm.jsontree import JSONTree, json_map_leaves
16
from vllm.utils import LazyLoader, full_groupby, is_list_of
17
+from vllm.utils.jsontree import JSONTree, json_map_leaves
18
19
if TYPE_CHECKING:
20
import torch