update: r2d2

app.py

@@ -234,7 +234,7 @@ def run(config):
                         inputs=inputs,
                         outputs=[],
                         fn=run_matching,
-                        cache_examples=False,
+                        cache_examples=True,
                         label="Examples (click one of the images below to Run Match)",
                     )
 

hloc/extractors/r2d2.py

@@ -4,9 +4,10 @@ import torchvision.transforms as tvf
 
 from ..utils.base_model import BaseModel
 
+base_path = Path(__file__).parent / "../../third_party"
+sys.path.append(str(base_path))
 r2d2_path = Path(__file__).parent / "../../third_party/r2d2"
-sys.path.append(str(r2d2_path))
-from extract import load_network, NonMaxSuppression, extract_multiscale
+from r2d2.extract import load_network, NonMaxSuppression, extract_multiscale
 
 
 class R2D2(BaseModel):

third_party/r2d2/extract.py

@@ -8,9 +8,9 @@ from PIL import Image
 import numpy as np
 import torch
 
-from tools import common
-from tools.dataloader import norm_RGB
-from nets.patchnet import *
+from .tools import common
+from .tools.dataloader import norm_RGB
+from .nets.patchnet import *
 
 
 def load_network(model_fn):

third_party/r2d2/tools/dataloader.py

@@ -9,8 +9,8 @@ import numpy as np
 import torch
 import torchvision.transforms as tvf
 
-from tools.transforms import instanciate_transformation
-from tools.transforms_tools import persp_apply
+from .transforms import instanciate_transformation
+from .transforms_tools import persp_apply
 
 
 RGB_mean = [0.485, 0.456, 0.406]