update: hloc rel path

imcui/__init__.py

@@ -1,4 +0,0 @@
-import sys
-from pathlib import Path
-
-sys.path.append(str(Path(__file__).parent))

imcui/api/__init__.py

@@ -1,18 +1,13 @@
 import base64
 import io
-import sys
-from pathlib import Path
 from typing import List
 
 import numpy as np
 from fastapi.exceptions import HTTPException
 from PIL import Image
 from pydantic import BaseModel
 
-sys.path.append(str(Path(__file__).parents[1]))
-
-from hloc import logger
-
+from ..hloc import logger
 from .core import ImageMatchingAPI
 
 

imcui/api/server.py

@@ -12,9 +12,10 @@
 from PIL import Image
 from ray import serve
 
-from imcui.api import ImageMatchingAPI, ImagesInput, to_base64_nparray
-from imcui.hloc import DEVICE
-from imcui.ui import get_version
+from . import ImagesInput, to_base64_nparray
+from .core import ImageMatchingAPI
+from ..hloc import DEVICE
+from ..ui import get_version
 
 warnings.simplefilter("ignore")
 app = FastAPI()

imcui/hloc/extractors/alike.py

@@ -3,7 +3,7 @@
 
 import torch
 
-from hloc import MODEL_REPO_ID, logger
+from .. import MODEL_REPO_ID, logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/darkfeat.py

@@ -1,7 +1,7 @@
 import sys
 from pathlib import Path
 
-from hloc import MODEL_REPO_ID, logger
+from .. import MODEL_REPO_ID, logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/dedode.py

@@ -4,7 +4,7 @@
 import torch
 import torchvision.transforms as transforms
 
-from hloc import MODEL_REPO_ID, logger
+from .. import MODEL_REPO_ID, logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/disk.py

@@ -1,6 +1,6 @@
 import kornia
 
-from hloc import logger
+from .. import logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/lanet.py

@@ -3,7 +3,7 @@
 
 import torch
 
-from hloc import MODEL_REPO_ID, logger
+from .. import MODEL_REPO_ID, logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/r2d2.py

@@ -3,7 +3,7 @@
 
 import torchvision.transforms as tvf
 
-from hloc import MODEL_REPO_ID, logger
+from .. import MODEL_REPO_ID, logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/rekd.py

@@ -3,7 +3,7 @@
 
 import torch
 
-from hloc import MODEL_REPO_ID, logger
+from .. import MODEL_REPO_ID, logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/rord.py

@@ -3,7 +3,7 @@
 
 import torch
 
-from hloc import MODEL_REPO_ID, logger
+from .. import MODEL_REPO_ID, logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/superpoint.py

@@ -3,7 +3,7 @@
 
 import torch
 
-from hloc import logger
+from .. import logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/extractors/xfeat.py

@@ -1,6 +1,6 @@
 import torch
 
-from hloc import logger
+from .. import logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/matchers/aspanformer.py

@@ -3,8 +3,8 @@
 
 import torch
 
-from hloc import MODEL_REPO_ID, logger
-from hloc.utils.base_model import BaseModel
+from .. import MODEL_REPO_ID, logger
+from ..utils.base_model import BaseModel
 
 sys.path.append(str(Path(__file__).parent / "../../third_party"))
 from ASpanFormer.src.ASpanFormer.aspanformer import ASpanFormer as _ASpanFormer

imcui/hloc/matchers/cotr.py

@@ -6,7 +6,7 @@
 import torch
 from torchvision.transforms import ToPILImage
 
-from hloc import DEVICE, MODEL_REPO_ID
+from .. import DEVICE, MODEL_REPO_ID
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/matchers/dkm.py

@@ -3,8 +3,8 @@
 
 from PIL import Image
 
-from hloc import DEVICE, MODEL_REPO_ID, logger
-from hloc.utils.base_model import BaseModel
+from .. import DEVICE, MODEL_REPO_ID, logger
+from ..utils.base_model import BaseModel
 
 sys.path.append(str(Path(__file__).parent / "../../third_party"))
 from DKM.dkm import DKMv3_outdoor

imcui/hloc/matchers/eloftr.py

@@ -5,7 +5,7 @@
 
 import torch
 
-from hloc import MODEL_REPO_ID
+from .. import MODEL_REPO_ID, logger
 
 tp_path = Path(__file__).parent / "../../third_party"
 sys.path.append(str(tp_path))
@@ -17,7 +17,6 @@
     reparameter,
 )
 
-from hloc import logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/matchers/loftr.py

@@ -4,7 +4,7 @@
 from kornia.feature import LoFTR as LoFTR_
 from kornia.feature.loftr.loftr import default_cfg
 
-from hloc import logger
+from .. import logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/matchers/topicfm.py

@@ -3,7 +3,7 @@
 
 import torch
 
-from hloc import MODEL_REPO_ID
+from .. import MODEL_REPO_ID
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/matchers/xfeat_dense.py

@@ -1,6 +1,6 @@
 import torch
 
-from hloc import logger
+from .. import logger
 
 from ..utils.base_model import BaseModel
 

imcui/hloc/matchers/xoftr.py

@@ -4,7 +4,7 @@
 
 import torch
 
-from hloc import DEVICE, MODEL_REPO_ID
+from .. import DEVICE, MODEL_REPO_ID, logger
 
 tp_path = Path(__file__).parent / "../../third_party"
 sys.path.append(str(tp_path))
@@ -13,7 +13,6 @@
 from XoFTR.src.utils.misc import lower_config
 from XoFTR.src.xoftr import XoFTR as XoFTR_
 
-from hloc import logger
 
 from ..utils.base_model import BaseModel
 

tests/test_basic.py

@@ -8,7 +8,7 @@
 
 
 def test_all():
-    config = load_config(ROOT / "tests/config.yaml")
+    config = load_config(ROOT / "config/config.yaml")
     img_path1 = ROOT / "tests/data/02928139_3448003521.jpg"
     img_path2 = ROOT / "tests/data/17295357_9106075285.jpg"
     image0 = cv2.imread(str(img_path1))[:, :, ::-1]  # RGB