Skip to content

Commit f7ad6a1

Browse files
authored
[CI Failure] fix tests/entrypoints/openai/test_skip_tokenizer.py (#22708)
Signed-off-by: wang.yuqi <[email protected]>
1 parent 80bb1e8 commit f7ad6a1

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

vllm/model_executor/models/prithvi_geospatial_mae.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
from transformers import BatchFeature
2626

2727
from vllm.config import VllmConfig
28-
from vllm.model_executor.layers.pooler import (AllPool, PoolerHead,
29-
PoolerIdentity, SimplePooler)
28+
from vllm.model_executor.layers.pooler import DispatchPooler, Pooler
3029
from vllm.model_executor.model_loader.weight_utils import default_weight_loader
3130
from vllm.model_executor.models.interfaces import (
32-
IsAttentionFree, MultiModalEmbeddings, SupportsMultiModalWithRawInput)
31+
IsAttentionFree, MultiModalEmbeddings, SupportsMultiModalWithRawInput,
32+
default_pooling_type)
3333
from vllm.model_executor.models.utils import AutoWeightsLoader
3434
from vllm.multimodal import MULTIMODAL_REGISTRY
3535
from vllm.multimodal.inputs import (MultiModalDataDict, MultiModalFieldConfig,
@@ -142,6 +142,7 @@ def apply(
142142
)
143143

144144

145+
@default_pooling_type("All")
145146
@MULTIMODAL_REGISTRY.register_processor(
146147
PrithviGeoSpatialMAEMultiModalProcessor,
147148
info=PrithviGeoSpatialMAEProcessingInfo,
@@ -198,7 +199,11 @@ def __init__(self, vllm_config: VllmConfig, prefix: str = ""):
198199
"Only SemanticSegmentationTask is supported for now "
199200
"by PrithviGeospatialMAE.")
200201

201-
self.pooler = SimplePooler(AllPool(), PoolerHead(PoolerIdentity()))
202+
pooler_config = vllm_config.model_config.pooler_config
203+
assert pooler_config is not None
204+
205+
self.pooler = DispatchPooler(
206+
{"encode": Pooler.for_encode(pooler_config)}, )
202207

203208
def _parse_and_validate_multimodal_data(
204209
self, **kwargs) -> tuple[torch.Tensor, Optional[torch.Tensor]]:

0 commit comments

Comments
 (0)