Skip to content

Commit 8d604b1

Browse files
authored
Simplify python read_image() (openvinotoolkit#1763)
1 parent 4595a87 commit 8d604b1

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ from PIL import Image
135135
pipe = openvino_genai.VLMPipeline("./InternVL2-1B", "CPU")
136136

137137
image = Image.open("dog.jpg")
138-
image_data = np.array(image.getdata()).reshape(1, image.size[1], image.size[0], 3).astype(np.uint8)
139-
image_data = ov.Tensor(image_data)
138+
image_data = np.array(image)
139+
image_data = ov.Tensor(image_data)
140140

141141
prompt = "Can you describe the image?"
142142
result = pipe.generate(prompt, image=image_data, max_new_tokens=100)
@@ -232,7 +232,7 @@ device = 'CPU' # GPU can be used as well
232232
pipe = openvino_genai.Image2ImagePipeline("./dreamlike_anime_1_0_ov/INT8", device)
233233
234234
image = Image.open("small_city.jpg")
235-
image_data = np.array(image.getdata()).reshape(1, image.size[1], image.size[0], 3).astype(np.uint8)
235+
image_data = np.array(image)[None]
236236
image_data = ov.Tensor(image_data)
237237
238238
image_tensor = pipe.generate(
@@ -277,7 +277,7 @@ import openvino as ov
277277
278278
def read_image(path: str) -> openvino.Tensor:
279279
pic = Image.open(path).convert("RGB")
280-
image_data = np.array(pic.getdata()).reshape(1, pic.size[1], pic.size[0], 3).astype(np.uint8)
280+
image_data = np.array(pic)[None]
281281
return openvino.Tensor(image_data)
282282
283283
device = 'CPU' # GPU can be used as well

samples/python/image_generation/benchmark_image_gen.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def text2image(args):
118118

119119
def read_image(path: str) -> openvino.Tensor:
120120
pic = Image.open(path).convert("RGB")
121-
image_data = np.array(pic.getdata()).reshape(1, pic.size[1], pic.size[0], 3).astype(np.uint8)
121+
image_data = np.array(pic)[None]
122122
return openvino.Tensor(image_data)
123123

124124
def image2image(args):

samples/python/image_generation/image2image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
def read_image(path: str) -> openvino.Tensor:
1313
pic = Image.open(path).convert("RGB")
14-
image_data = np.array(pic.getdata()).reshape(1, pic.size[1], pic.size[0], 3).astype(np.uint8)
14+
image_data = np.array(pic)[None]
1515
return openvino.Tensor(image_data)
1616

1717
def main():

samples/python/image_generation/inpainting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
def read_image(path: str) -> openvino.Tensor:
1313
pic = Image.open(path).convert("RGB")
14-
image_data = np.array(pic.getdata()).reshape(1, pic.size[1], pic.size[0], 3).astype(np.uint8)
14+
image_data = np.array(pic)[None]
1515
return openvino.Tensor(image_data)
1616

1717
def main():

samples/python/visual_language_chat/benchmark_vlm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def read_image(path: str) -> Tensor:
1919
2020
'''
2121
pic = Image.open(path).convert("RGB")
22-
image_data = np.array(pic.getdata()).reshape(1, pic.size[1], pic.size[0], 3).astype(np.uint8)
22+
image_data = np.array(pic)
2323
return Tensor(image_data)
2424

2525

samples/python/visual_language_chat/visual_language_chat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def read_image(path: str) -> Tensor:
3636
3737
'''
3838
pic = Image.open(path).convert("RGB")
39-
image_data = np.array(pic.getdata()).reshape(1, pic.size[1], pic.size[0], 3).astype(np.uint8)
39+
image_data = np.array(pic)
4040
return Tensor(image_data)
4141

4242

tools/llm_bench/task/visual_language_generation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def run_visual_language_generation_optimum(
182182

183183
def load_image_genai(image_path):
184184
pil_image = load_image(image_path)
185-
image_data = np.array(pil_image.getdata()).reshape(1, pil_image.size[1], pil_image.size[0], 3).astype(np.uint8)
185+
image_data = np.array(pil_image)[None]
186186
return ov.Tensor(image_data)
187187

188188

tools/who_what_benchmark/whowhatbench/wwb.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def genai_gen_image(model, prompt, num_inference_steps, generator=None):
308308

309309

310310
def genai_gen_image2image(model, prompt, image, num_inference_steps, generator=None):
311-
image_data = ov.Tensor(np.array(image.getdata()).reshape(1, image.size[1], image.size[0], 3).astype(np.uint8))
311+
image_data = ov.Tensor(np.array(image)[None])
312312
image_tensor = model.generate(
313313
prompt,
314314
image=image_data,
@@ -321,8 +321,8 @@ def genai_gen_image2image(model, prompt, image, num_inference_steps, generator=N
321321

322322

323323
def genai_gen_inpainting(model, prompt, image, mask, num_inference_steps, generator=None):
324-
image_data = ov.Tensor(np.array(image.getdata()).reshape(1, image.size[1], image.size[0], 3).astype(np.uint8))
325-
mask_data = ov.Tensor(np.array(mask.getdata()).reshape(1, mask.size[1], mask.size[0], 3).astype(np.uint8))
324+
image_data = ov.Tensor(np.array(image)[None])
325+
mask_data = ov.Tensor(np.array(mask)[None])
326326
image_tensor = model.generate(
327327
prompt,
328328
image=image_data,
@@ -335,7 +335,7 @@ def genai_gen_inpainting(model, prompt, image, mask, num_inference_steps, genera
335335

336336

337337
def genai_gen_visual_text(model, prompt, image, processor, tokenizer, max_new_tokens, crop_question):
338-
image_data = ov.Tensor(np.array(image.getdata()).reshape(1, image.size[1], image.size[0], 3).astype(np.uint8))
338+
image_data = ov.Tensor(np.array(image)[None])
339339
out = model.generate(prompt, image=image_data, do_sample=False, max_new_tokens=max_new_tokens)
340340
return out.texts[0]
341341

0 commit comments

Comments
 (0)