fix: lib conflicts

hloc/matchers/omniglue.py

@@ -7,9 +7,10 @@ from pathlib import Path
 from .. import logger
 from ..utils.base_model import BaseModel
 
-omniglue_path = Path(__file__).parent / "../../third_party/omniglue"
-sys.path.append(str(omniglue_path))
-from src import omniglue
+thirdparty_path = Path(__file__).parent / "../../third_party"
+sys.path.append(str(thirdparty_path))
+from omniglue.src import omniglue
+omniglue_path = thirdparty_path / "omniglue"
 
 
 class OmniGlue(BaseModel):
@@ -23,7 +24,7 @@ class OmniGlue(BaseModel):
     }
 
     def _init(self, conf):
-        logger.info(f"Loadeding OmniGlue model")
+        logger.info(f"Loading OmniGlue model")
         og_model_path = omniglue_path / "models" / "omniglue.onnx"
         sp_model_path = omniglue_path / "models" / "sp_v6.onnx"
         dino_model_path = (
@@ -42,7 +43,7 @@ class OmniGlue(BaseModel):
             og_export=str(og_model_path),
             sp_export=str(sp_model_path),
             dino_export=str(dino_model_path),
-            max_keypoints=self.conf["max_keypoints"] * 4,
+            max_keypoints=self.conf["max_keypoints"],
         )
         logger.info(f"Loaded OmniGlue model done!")
 

third_party/omniglue/.gitignore

@@ -25,4 +25,4 @@ poetry.lock
 .idea
 models/sp_v6/*
 models/og_export*
-models/dinov2_vitb14_pretrain.pth
+# models/dinov2_vitb14_pretrain.pth

third_party/omniglue/src/omniglue/dino_extract.py

@@ -15,8 +15,11 @@
 """Wrapper for performing DINOv2 inference."""
 
 import cv2
+import sys
 import numpy as np
-from third_party.dinov2 import dino
+from pathlib import Path
+sys.path.append(str(Path(__file__).parent.parent.parent / "third_party"))
+from dinov2 import dino
 
 from . import utils
 import torch

third_party/omniglue/third_party/dinov2/dino.py

@@ -12,7 +12,7 @@ from functools import partial
 import math
 from typing import Callable, Sequence, Tuple, Union
 
-from third_party.dinov2 import dino_utils
+from . import dino_utils
 import torch
 from torch import nn
 from torch.nn.init import trunc_normal_