Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: open clip device #36

Merged
merged 3 commits into from
Feb 29, 2024
Merged

fix: open clip device #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be29708
fix: add current device to the OpenCLIP model
eloy-encord Feb 28, 2024
7c36106
misc: update class naming to camel case
eloy-encord Feb 28, 2024
942289c
fix: remove test code
eloy-encord Feb 28, 2024
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
6 changes: 3 additions & 3 deletions clip_eval/models/CLIP_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _check_device(device: str):
raise ValueError(f"Unavailable device: {device}")


class closed_CLIPModel(CLIPModel):
class ClosedCLIPModel(CLIPModel):
def __init__(self, title: str, title_in_source: str, device: str | None = None) -> None:
super().__init__(title, title_in_source, device)

Expand Down Expand Up @@ -115,7 +115,7 @@ def build_embedding(self, dataloader: DataLoader) -> tuple[EmbeddingArray, Class
return image_embeddings, labels


class open_CLIPModel(CLIPModel):
class OpenCLIPModel(CLIPModel):
def __init__(
self,
title: str,
Expand Down Expand Up @@ -155,7 +155,7 @@ def _setup(self, **kwargs) -> None:
model, _, preprocess = open_clip.create_model_and_transforms(
model_name=self.model_name, pretrained=self.pretrained, **kwargs
)
self.model = model
self.model = model.to(self.device)
self.processor = preprocess

def build_embedding(self, dataloader: DataLoader):
Expand Down
24 changes: 12 additions & 12 deletions clip_eval/models/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .CLIP_model import CLIPModel, SiglipModel, closed_CLIPModel, open_CLIPModel
from .CLIP_model import CLIPModel, ClosedCLIPModel, OpenCLIPModel, SiglipModel


class ModelProvider:
Expand All @@ -19,24 +19,24 @@ def list_model_names(self) -> list[str]:


model_provider = ModelProvider()
model_provider.register_model("clip", closed_CLIPModel, title_in_source="openai/clip-vit-large-patch14-336")
model_provider.register_model("plip", closed_CLIPModel, title_in_source="vinid/plip")
model_provider.register_model("clip", ClosedCLIPModel, title_in_source="openai/clip-vit-large-patch14-336")
model_provider.register_model("plip", ClosedCLIPModel, title_in_source="vinid/plip")
model_provider.register_model(
"pubmed",
closed_CLIPModel,
ClosedCLIPModel,
title_in_source="flaviagiammarino/pubmed-clip-vit-base-patch32",
)
model_provider.register_model("bioclip", closed_CLIPModel, title_in_source="imageomics/bioclip")
model_provider.register_model("bioclip", ClosedCLIPModel, title_in_source="imageomics/bioclip")
model_provider.register_model(
"tinyclip",
closed_CLIPModel,
ClosedCLIPModel,
title_in_source="wkcn/TinyCLIP-ViT-40M-32-Text-19M-LAION400M",
)
model_provider.register_model("fashion", closed_CLIPModel, title_in_source="patrickjohncyh/fashion-clip")
model_provider.register_model("rscid", closed_CLIPModel, title_in_source="flax-community/clip-rsicd")
model_provider.register_model("street", closed_CLIPModel, title_in_source="geolocal/StreetCLIP")
model_provider.register_model("apple", open_CLIPModel, title_in_source="apple/DFN5B-CLIP-ViT-H-14")
model_provider.register_model("eva-clip", open_CLIPModel, title_in_source="BAAI/EVA-CLIP-8B-448")
model_provider.register_model("vit-b-32-laion2b", open_CLIPModel, model_name="ViT-B-32", pretrained="laion2b_e16")
model_provider.register_model("fashion", ClosedCLIPModel, title_in_source="patrickjohncyh/fashion-clip")
model_provider.register_model("rscid", ClosedCLIPModel, title_in_source="flax-community/clip-rsicd")
model_provider.register_model("street", ClosedCLIPModel, title_in_source="geolocal/StreetCLIP")
model_provider.register_model("apple", OpenCLIPModel, title_in_source="apple/DFN5B-CLIP-ViT-H-14")
model_provider.register_model("eva-clip", OpenCLIPModel, title_in_source="BAAI/EVA-CLIP-8B-448")
model_provider.register_model("vit-b-32-laion2b", OpenCLIPModel, model_name="ViT-B-32", pretrained="laion2b_e16")
model_provider.register_model("siglip_small", SiglipModel, title_in_source="google/siglip-base-patch16-224")
model_provider.register_model("siglip_large", SiglipModel, title_in_source="google/siglip-large-patch16-256")
Loading