SAM FIX2
Browse files- models/__init__.py +10 -2
models/__init__.py
CHANGED
|
@@ -255,7 +255,15 @@ def _resolve_sam2_cfg(cfg_str: str) -> str:
|
|
| 255 |
return str(candidate)
|
| 256 |
if cfg_path.exists():
|
| 257 |
return str(cfg_path)
|
| 258 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 259 |
p = TP_SAM2 / name
|
| 260 |
if p.exists():
|
| 261 |
return str(p)
|
|
@@ -299,7 +307,7 @@ def load_sam2() -> Tuple[Optional[object], bool, Dict[str, Any]]:
|
|
| 299 |
return None, False, meta
|
| 300 |
|
| 301 |
device = _pick_device("SAM2_DEVICE")
|
| 302 |
-
cfg_env = os.environ.get("SAM2_MODEL_CFG", "configs/sam2/sam2_hiera_l.yaml")
|
| 303 |
cfg = _resolve_sam2_cfg(cfg_env)
|
| 304 |
ckpt = os.environ.get("SAM2_CHECKPOINT", "")
|
| 305 |
|
|
|
|
| 255 |
return str(candidate)
|
| 256 |
if cfg_path.exists():
|
| 257 |
return str(cfg_path)
|
| 258 |
+
# Updated SAM2 config search paths to match actual repository structure
|
| 259 |
+
for name in [
|
| 260 |
+
"sam2/configs/sam2.1/sam2.1_hiera_l.yaml", # SAM 2.1 (preferred)
|
| 261 |
+
"sam2/configs/sam2/sam2_hiera_l.yaml", # SAM 2.0
|
| 262 |
+
"sam2/configs/sam2.1/sam2.1_hiera_b.yaml",
|
| 263 |
+
"sam2/configs/sam2/sam2_hiera_b.yaml",
|
| 264 |
+
"sam2/configs/sam2.1/sam2.1_hiera_s.yaml",
|
| 265 |
+
"sam2/configs/sam2/sam2_hiera_s.yaml"
|
| 266 |
+
]:
|
| 267 |
p = TP_SAM2 / name
|
| 268 |
if p.exists():
|
| 269 |
return str(p)
|
|
|
|
| 307 |
return None, False, meta
|
| 308 |
|
| 309 |
device = _pick_device("SAM2_DEVICE")
|
| 310 |
+
cfg_env = os.environ.get("SAM2_MODEL_CFG", "sam2/configs/sam2/sam2_hiera_l.yaml")
|
| 311 |
cfg = _resolve_sam2_cfg(cfg_env)
|
| 312 |
ckpt = os.environ.get("SAM2_CHECKPOINT", "")
|
| 313 |
|