From 7097a204835360890606c362034e0cd847bd97ba Mon Sep 17 00:00:00 2001 From: Roger Wang Date: Wed, 26 Jun 2024 23:54:08 -0700 Subject: [PATCH] remove unsued functions --- vllm/model_executor/models/phi3v.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/vllm/model_executor/models/phi3v.py b/vllm/model_executor/models/phi3v.py index 0eadd0b8cfdb4..578e22beaa3d6 100644 --- a/vllm/model_executor/models/phi3v.py +++ b/vllm/model_executor/models/phi3v.py @@ -65,12 +65,6 @@ def __init__(self, wte=None) -> None: self.type_feature: str self.img_processor: CLIPVisionModel - def set_img_features(self, img_features: torch.FloatTensor) -> None: - self.img_features = img_features - - def set_img_sizes(self, img_sizes: torch.LongTensor) -> None: - self.img_sizes = img_sizes - def get_img_features(self, img_embeds: torch.FloatTensor) -> torch.FloatTensor: LAYER_IDX = self.layer_idx @@ -144,21 +138,16 @@ def __init__(self, self.layer_idx = config.img_processor.get('layer_idx', -2) self.type_feature = config.img_processor.get('type_feature', 'patch') - def forward(self, - input_ids: torch.LongTensor, + def forward(self, input_ids: torch.LongTensor, pixel_values: torch.FloatTensor, - image_sizes=None) -> torch.FloatTensor: + image_sizes: torch.Tensor) -> torch.FloatTensor: """process and merge text embeddings with image embeddings.""" + # (batch_size, max_num_crops, 3, height, width) img_embeds = pixel_values - img_sizes = image_sizes - if self.img_features is not None: - img_embeds = self.img_features.clone() - self.img_features = None - - if self.img_sizes is not None: - img_sizes = self.img_sizes + # (batch_size, 2) + img_sizes = image_sizes input_shape = input_ids.size() input_ids = input_ids.view(-1, input_shape[-1]) @@ -190,9 +179,6 @@ def forward(self, output_imgs = [] output_len = [] - if isinstance(img_sizes, torch.Tensor): - img_sizes.squeeze_(0) - for _bs in range(bs): h, w = img_sizes[_bs] h = h // 336