diff --git a/README.md b/README.md index 588f3ae..fa81506 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ An API and command line interface (CLI) are provided to allow users to download * Virchow2: https://huggingface.co/paige-ai/Virchow2 * H-optimus-0: https://huggingface.co/bioptimus/H-optimus-0 * H-optimus-1: https://huggingface.co/bioptimus/H-optimus-1 +* OpenMidnight-1.1: https://huggingface.co/medarc/OpenMidnight-1.1 * GenBio-PathFM: https://huggingface.co/genbio-ai/genbio-pathfm * CONCH: https://huggingface.co/MahmoodLab/CONCH * TITAN/CONCHv1.5: https://huggingface.co/MahmoodLab/TITAN diff --git a/src/thunder/benchmark.py b/src/thunder/benchmark.py index 01f0e58..8b2ef19 100644 --- a/src/thunder/benchmark.py +++ b/src/thunder/benchmark.py @@ -21,7 +21,7 @@ def benchmark( where options are: - dataset: *bach*, *bracs*, *break_his*, *ccrcc*, *crc*, *esca*, *mhist*, *ocelot*, *pannuke*, *patch_camelyon*, *segpath_epithelial*, *segpath_lymphocytes*, *tcga_crc_msi*, *tcga_tils*, *tcga_uniform*, *wilds* - - model: *hiboub*, *hiboul*, *hoptimus0*, *hoptimus1*, *genbio-pathfm*, *midnight*, *phikon*, *phikon2*, *uni*, *uni2h*, *virchow*, *virchow2*, *conch*, *titan*, *keep*, *musk*, *plip*, *quiltnetb32*, *dinov2base*, *dinov2large*, *vitbasepatch16224in21k*, *vitlargepatch16224in21k*, *clipvitbasepatch32*, *clipvitlargepatch14* + - model: *hiboub*, *hiboul*, *hoptimus0*, *hoptimus1*, *genbio-pathfm*, *openmidnight11*, *midnight*, *phikon*, *phikon2*, *uni*, *uni2h*, *virchow*, *virchow2*, *conch*, *titan*, *keep*, *musk*, *plip*, *quiltnetb32*, *dinov2base*, *dinov2large*, *vitbasepatch16224in21k*, *vitlargepatch16224in21k*, *clipvitbasepatch32*, *clipvitlargepatch14* - task: *adversarial_attack*, *alignment_scoring*, *image_retrieval*, *knn*, *linear_probing*, *pre_computing_embeddings*, *segmentation*, *simple_shot*, *transformation_invariance*, *zero_shot_vlm* - loading_mode: *online_loading*, *image_pre_loading*, *embedding_pre_loading* diff --git a/src/thunder/config/pretrained_model/openmidnight11.yaml b/src/thunder/config/pretrained_model/openmidnight11.yaml new file mode 100644 index 0000000..258c4f9 --- /dev/null +++ b/src/thunder/config/pretrained_model/openmidnight11.yaml @@ -0,0 +1,8 @@ +model_name: openmidnight11 +type: timm +vlm: false +emb_dim: 1536 +ckpt_path: ${oc.env:THUNDER_BASE_DATA_FOLDER}/pretrained_ckpts/openmidnight1.1/model.safetensors +hf_tag: hf-hub:medarc/OpenMidnight-1.1 + +timm_kwargs: {} diff --git a/src/thunder/models/download.py b/src/thunder/models/download.py index db7e381..5b2f533 100644 --- a/src/thunder/models/download.py +++ b/src/thunder/models/download.py @@ -90,6 +90,10 @@ "kaiko-ai/midnight", "model.safetensors", ), # Midnight-12k (https://huggingface.co/kaiko-ai/midnight) + "openmidnight11": ( + "medarc/OpenMidnight-1.1", + "model.safetensors", + ), # OpenMidnight-1.1 (https://huggingface.co/medarc/OpenMidnight-1.1) "openmidnight": ( "SophontAI/OpenMidnight", "teacher_checkpoint_load.pt", @@ -170,6 +174,7 @@ def download_models(models: Union[List[str], str]) -> None: * hiboul * midnight * openmidnight + * openmidnight11 * kaiko_vits8 * kaiko_vits16 * kaiko_vitb8 @@ -262,7 +267,7 @@ def download_model(model: str) -> None: ] if local_dir_tag != "plip": extra_files.extend(["merges.txt", "vocab.json"]) - elif local_dir_tag == "midnight": + elif local_dir_tag in ["midnight", "openmidnight1.1"]: extra_files = ["config.json"] elif local_dir_tag == "titan": extra_files = [ diff --git a/src/thunder/models/pretrained_models.py b/src/thunder/models/pretrained_models.py index f39af21..5df400c 100644 --- a/src/thunder/models/pretrained_models.py +++ b/src/thunder/models/pretrained_models.py @@ -1,9 +1,11 @@ +import json from abc import ABC, abstractmethod from pathlib import Path import timm import torch from omegaconf import DictConfig, OmegaConf +from safetensors.torch import load_file from timm.data import resolve_data_config from timm.data.transforms_factory import create_transform from transformers import AutoImageProcessor, AutoModel, AutoTokenizer @@ -375,7 +377,11 @@ def extract_embedding(src, pretrained_model, task_type="linear_probing"): if model_cfg.model_name == "uni2h": nb_reg = 8 - elif model_cfg.model_name in ["hoptimus0", "hoptimus1"]: + elif model_cfg.model_name in [ + "hoptimus0", + "hoptimus1", + "openmidnight11", + ]: nb_reg = 4 else: nb_reg = 0 @@ -408,6 +414,7 @@ def get_model_from_name(model_name: str, device: str): * hiboul * midnight * openmidnight + * openmidnight11 * kaiko_vits8 * kaiko_vits16 * kaiko_vitb8 @@ -470,16 +477,28 @@ def get_from_timm(hf_tag: str, timm_kwargs: dict, ckpt_path: str, device: str): :param hf_tag: Huggingface model tag. :param timm_kargs: dictionary of timm arguments. - :ckpt_path: path to the stored checkpoint. + :param ckpt_path: path to the stored checkpoint. Timm safetensors require + an adjacent config.json. :param device: device to use (cpu, cuda). """ # Model - model = timm.create_model(hf_tag, pretrained=False, **timm_kwargs) - model.load_state_dict( - torch.load(ckpt_path, weights_only=True, map_location=torch.device(device)), - strict=True, - ) + if Path(ckpt_path).suffix == ".safetensors": + # Read the downloaded timm configuration so loading also works offline. + config = json.loads(Path(ckpt_path).with_name("config.json").read_text()) + model = timm.create_model( + config["architecture"], + pretrained=False, + pretrained_cfg=config["pretrained_cfg"], + **(config["model_args"] | timm_kwargs), + ) + model.load_state_dict(load_file(ckpt_path, device=device), strict=True) + else: + model = timm.create_model(hf_tag, pretrained=False, **timm_kwargs) + model.load_state_dict( + torch.load(ckpt_path, weights_only=True, map_location=torch.device(device)), + strict=True, + ) # Transform transform = create_transform( diff --git a/src/thunder/utils/constants.py b/src/thunder/utils/constants.py index 5a71411..77181f8 100644 --- a/src/thunder/utils/constants.py +++ b/src/thunder/utils/constants.py @@ -16,6 +16,7 @@ class ModelConstants(Enum): "kaiko_vitb16", "midnight", "openmidnight", + "openmidnight11", "phikon", "phikon2", "uni",