Skip to content

Commit 0448953

Browse files
authored
Merge pull request #7 from Guo-Chenxu/minicpm_o_2_6
change user api
2 parents 1a5101b + 87915f9 commit 0448953

File tree

8 files changed

+583
-823
lines changed

8 files changed

+583
-823
lines changed

src/transformers/models/minicpm_o_2_6/feature_extractor_minicpm_o_2_6.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def __call__(
3636
chunk_length: Optional[int] = 1,
3737
**kwargs,
3838
):
39+
# in batch inference, it may be [[]]
3940
if isinstance(audios, np.ndarray):
4041
audios_list = [[audios]]
4142
elif isinstance(audios[0], np.ndarray):

src/transformers/models/minicpm_o_2_6/image_processing_minicpm.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,13 @@ def preprocess(
259259
return_tensors: Optional[Union[str, TensorType]] = None,
260260
**kwargs,
261261
) -> MiniCPMOBatchFeature:
262-
images_list = make_nested_list_of_images(images)
262+
# in batch inference, it may be [[]], so we can't use `make_nested_list_of_images`
263+
if isinstance(images, Image.Image):
264+
images_list = [[images]]
265+
elif isinstance(images[0], Image.Image):
266+
images_list = [images]
267+
else:
268+
images_list = images
263269

264270
to_tensor = transforms.ToTensor()
265271
normalize_transform = transforms.Normalize(
@@ -308,7 +314,9 @@ def preprocess(
308314
(slice_image.shape[1] // self.patch_size, slice_image.shape[2] // self.patch_size))
309315
)
310316

311-
tgt_sizes = np.vstack(tgt_sizes)
317+
# in batch inference, it may be []
318+
if tgt_sizes:
319+
tgt_sizes = np.vstack(tgt_sizes)
312320

313321
new_images_list.append(new_images)
314322
image_sizes_list.append(image_sizes)

0 commit comments

Comments
 (0)