Skip to content

Fixed warning log | Added _DEFAULT_MODEL #1207

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Fixed warning log | Added _DEFAULT_MODEL #1207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 2 deletions cellpose/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
MODEL_DIR = Path(_MODEL_DIR_ENV) if _MODEL_DIR_ENV else _MODEL_DIR_DEFAULT

MODEL_NAMES = ["cpsam"]
_DEFAULT_MODEL = "cpsam"

MODEL_LIST_PATH = os.fspath(MODEL_DIR.joinpath("gui_models.txt"))

Expand Down Expand Up @@ -133,10 +134,11 @@ def __init__(self, gpu=False, pretrained_model="cpsam", model_type=None,
if pretrained_model in all_models:
pretrained_model = os.path.join(MODEL_DIR, pretrained_model)
else:
pretrained_model = os.path.join(MODEL_DIR, "cpsam")
models_logger.warning(
f"pretrained model {pretrained_model} not found, using default model"
)
pretrained_model = os.path.join(MODEL_DIR, _DEFAULT_MODEL)


self.pretrained_model = pretrained_model
self.net = Transformer().to(self.device)
Expand All @@ -145,7 +147,7 @@ def __init__(self, gpu=False, pretrained_model="cpsam", model_type=None,
models_logger.info(f">>>> loading model {self.pretrained_model}")
self.net.load_model(self.pretrained_model, device=self.device)
else:
if os.path.split(self.pretrained_model)[-1] != 'cpsam':
if os.path.split(self.pretrained_model)[-1] != _DEFAULT_MODEL:
raise FileNotFoundError('model file not recognized')
cache_CPSAM_model_path()
self.net.load_model(self.pretrained_model, device=self.device)
Expand Down