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: broken models #41

Merged
merged 2 commits into from
Mar 8, 2024
Merged

fix: broken models #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a9fc3
fix: broken models
eloy-encord Mar 5, 2024
f9d4fdd
misc: use model title in the cache folder
eloy-encord Mar 5, 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
16 changes: 7 additions & 9 deletions clip_eval/models/CLIP_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def __init__(
self.__device = torch.device(device)
if cache_dir is None:
cache_dir = CACHE_PATH
self._cache_dir = Path(cache_dir).expanduser().resolve() / "models"
self._cache_dir = Path(cache_dir).expanduser().resolve() / "models" / title

@property
def title(self) -> str:
Expand Down Expand Up @@ -84,7 +84,6 @@ def __init__(
**kwargs,
) -> None:
super().__init__(title, device, title_in_source=title_in_source, cache_dir=cache_dir)
self._cache_dir /= "huggingface"
self._setup(**kwargs)

def get_transform(self) -> Callable[[dict[str, Any]], dict[str, list[Any]]]:
Expand Down Expand Up @@ -140,16 +139,13 @@ def __init__(
title: str,
device: str | None = None,
*,
model_name: str,
pretrained: str,
title_in_source: str,
pretrained: str | None = None,
cache_dir: str | None = None,
**kwargs,
) -> None:
self.pretrained = pretrained
self.model_name = model_name
title_in_source = model_name + "_" + pretrained
super().__init__(title, device, title_in_source=title_in_source, cache_dir=cache_dir, **kwargs)
self._cache_dir /= "openai"
self._setup(**kwargs)

def get_transform(self) -> Callable[[dict[str, Any]], dict[str, list[Any]]]:
Expand All @@ -176,7 +172,10 @@ def collate_fn(examples) -> dict[str, torch.Tensor]:

def _setup(self, **kwargs) -> None:
model, _, preprocess = open_clip.create_model_and_transforms(
model_name=self.model_name, pretrained=self.pretrained, cache_dir=self._cache_dir.as_posix(), **kwargs
model_name=self.title_in_source,
pretrained=self.pretrained,
cache_dir=self._cache_dir.as_posix(),
**kwargs,
)
self.model = model.to(self.device)
self.processor = preprocess
Expand Down Expand Up @@ -207,7 +206,6 @@ def __init__(
**kwargs,
) -> None:
super().__init__(title, device, title_in_source=title_in_source, cache_dir=cache_dir, **kwargs)
self._cache_dir /= "huggingface"
self._setup(**kwargs)

def _setup(self, **kwargs):
Expand Down
8 changes: 5 additions & 3 deletions clip_eval/models/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ def list_model_names(self) -> list[str]:
ClosedCLIPModel,
title_in_source="flaviagiammarino/pubmed-clip-vit-base-patch32",
)
model_provider.register_model("bioclip", ClosedCLIPModel, title_in_source="imageomics/bioclip")
model_provider.register_model(
"tinyclip",
ClosedCLIPModel,
Expand All @@ -35,8 +34,11 @@ def list_model_names(self) -> list[str]:
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("apple", OpenCLIPModel, title_in_source="hf-hub: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("bioclip", OpenCLIPModel, title_in_source="hf-hub:imageomics/bioclip")
model_provider.register_model("vit-b-32-laion2b", OpenCLIPModel, title_in_source="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