Unverified Commit aec9674d authored by Cyrus Leung's avatar Cyrus Leung Committed by GitHub
Browse files

[Core] Remove legacy input mapper/processor from V0 (#15686)


Signed-off-by: default avatarDarkLight1337 <tlleungac@connect.ust.hk>
parent 7fcc4223
...@@ -188,20 +188,11 @@ class ModelInputForXPUBuilder(ModelRunnerInputBuilderBase[ModelInputForXPU]): ...@@ -188,20 +188,11 @@ class ModelInputForXPUBuilder(ModelRunnerInputBuilderBase[ModelInputForXPU]):
input_positions.extend(list(positions_range)) input_positions.extend(list(positions_range))
if seq_group_metadata.multi_modal_data: if seq_group_metadata.multi_modal_data:
# NOTE: mm_data only includes the subset of multi-modal items # NOTE: mm_kwargs only includes the subset of multi-modal items
# that intersect with the current prefill positions. # that intersect with the current prefill positions.
mm_data, placeholder_maps = MultiModalPlaceholderMap \ mm_kwargs, placeholder_maps = MultiModalPlaceholderMap \
.from_seq_group(seq_group_metadata, positions_range) .from_seq_group(seq_group_metadata, positions_range)
if self.runner.mm_registry.has_processor(
self.runner.model_config):
mm_kwargs = mm_data
else:
mm_kwargs = self.runner.multi_modal_input_mapper(
mm_data,
seq_group_metadata.mm_processor_kwargs,
)
multi_modal_kwargs_list.append(mm_kwargs) multi_modal_kwargs_list.append(mm_kwargs)
for modality, placeholder_map in placeholder_maps.items(): for modality, placeholder_map in placeholder_maps.items():
...@@ -404,9 +395,6 @@ class XPUModelRunner(ModelRunnerBase[ModelInputForXPUWithSamplingMetadata]): ...@@ -404,9 +395,6 @@ class XPUModelRunner(ModelRunnerBase[ModelInputForXPUWithSamplingMetadata]):
# Multi-modal data support # Multi-modal data support
self.input_registry = input_registry self.input_registry = input_registry
self.mm_registry = mm_registry self.mm_registry = mm_registry
self.multi_modal_input_mapper = mm_registry \
.create_input_mapper(model_config)
self.mm_registry.init_mm_limits_per_prompt(self.model_config)
# Lazy initialization. # Lazy initialization.
self.model: nn.Module # Set after init_Model self.model: nn.Module # Set after init_Model
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment