Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions mteb/models/jina_clip.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,34 @@ def __init__(
self.device
)

def get_text_embeddings(self, texts: list[str], batch_size: int = 32):
def get_text_embeddings(
self,
texts: list[str],
batch_size: int = 32,
convert_to_numpy=False,
convert_to_tensor=True,
):
all_text_embeddings = []

with torch.no_grad():
for i in tqdm(range(0, len(texts), batch_size)):
batch_texts = texts[i : i + batch_size]
text_outputs = self.model.encode_text(
batch_texts, convert_to_numpy=False, convert_to_tensor=True
batch_texts,
convert_to_numpy=convert_to_numpy,
convert_to_tensor=convert_to_tensor,
)
all_text_embeddings.append(text_outputs.cpu())

all_text_embeddings = torch.cat(all_text_embeddings, dim=0)
return all_text_embeddings

def get_image_embeddings(
self, images: list[Image.Image] | DataLoader, batch_size: int = 32
self,
images: list[Image.Image] | DataLoader,
batch_size: int = 32,
convert_to_numpy=False,
convert_to_tensor=True,
):
all_image_embeddings = []

Expand All @@ -51,8 +63,8 @@ def get_image_embeddings(
for batch in tqdm(images):
image_outputs = self.model.encode_image(
[F.to_pil_image(b.to("cpu")) for b in batch],
convert_to_numpy=False,
convert_to_tensor=True,
convert_to_numpy=convert_to_numpy,
convert_to_tensor=convert_to_tensor,
)
all_image_embeddings.append(image_outputs.cpu())
else:
Expand Down Expand Up @@ -90,15 +102,15 @@ def get_fused_embeddings(
image_embeddings = None

if texts is not None:
text_embeddings = self.encode_text(
text_embeddings = self.get_text_embeddings(
texts,
batch_size=batch_size,
convert_to_numpy=False,
convert_to_tensor=True,
)

if images is not None:
image_embeddings = self.encode_image(
image_embeddings = self.get_image_embeddings(
images,
batch_size=batch_size,
convert_to_numpy=False,
Expand Down