zju3dv · pd-michaelstanley · Feb 2, 2024 · Feb 2, 2024 · Feb 2, 2024 · Feb 2, 2024
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ weights/
 dump/
 demo/*.mp4
 demo/demo_images/
-src/loftr/utils/superglue.py
+loftr/loftr/utils/superglue.py
 demo/utils.py
 
 notebooks/QccDayNight.ipynb
@@ -24,4 +24,4 @@ tools/draw_QccDayNights.py
 
 scripts/slurm/
 scripts/sbatch_submit.sh
-src/utils/client.py
+loftr/utils/client.py
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ If you want to run LoFTR-OT, some extra steps are needed:
   We use the code from [SuperGluePretrainedNetwork](https://github.com/magicleap/SuperGluePretrainedNetwork) for optimal transport. However, we can't provide the code directly due its strict LICENSE requirements. We recommend downloading it with the following command instead. 
 
   ```shell
-  cd src/loftr/utils  
+  cd loftr/loftr/utils  
   wget https://raw.githubusercontent.com/magicleap/SuperGluePretrainedNetwork/master/models/superglue.py 
   ```
 </details>
@@ -82,7 +82,7 @@ If you want to run LoFTR-OT, some extra steps are needed:
   <summary>[code snippets]</summary>
 
   ```python
-  from src.loftr import LoFTR, default_cfg
+  from loftr.loftr import LoFTR, default_cfg
 
   # Initialize LoFTR
   matcher = LoFTR(config=default_cfg)

diff --git a/configs/loftr/indoor/buggy_pos_enc/loftr_ds.py b/configs/loftr/indoor/buggy_pos_enc/loftr_ds.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'

diff --git a/configs/loftr/indoor/buggy_pos_enc/loftr_ds_dense.py b/configs/loftr/indoor/buggy_pos_enc/loftr_ds_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'

diff --git a/configs/loftr/indoor/buggy_pos_enc/loftr_ot.py b/configs/loftr/indoor/buggy_pos_enc/loftr_ot.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'

diff --git a/configs/loftr/indoor/buggy_pos_enc/loftr_ot_dense.py b/configs/loftr/indoor/buggy_pos_enc/loftr_ot_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'

diff --git a/configs/loftr/indoor/loftr_ds.py b/configs/loftr/indoor/loftr_ds.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'
 

diff --git a/configs/loftr/indoor/loftr_ds_dense.py b/configs/loftr/indoor/loftr_ds_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'
 

diff --git a/configs/loftr/indoor/loftr_ot.py b/configs/loftr/indoor/loftr_ot.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'
 

diff --git a/configs/loftr/indoor/loftr_ot_dense.py b/configs/loftr/indoor/loftr_ot_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'
 

diff --git a/configs/loftr/indoor/scannet/loftr_ds_eval.py b/configs/loftr/indoor/scannet/loftr_ds_eval.py
@@ -8,7 +8,7 @@
 to be consistent with the results in our paper.
 """
 
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'

diff --git a/configs/loftr/indoor/scannet/loftr_ds_eval_new.py b/configs/loftr/indoor/scannet/loftr_ds_eval_new.py
@@ -10,7 +10,7 @@
 Update: This config is for testing the re-trained model with the pos-enc bug fixed.
 """
 
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = True
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'

diff --git a/configs/loftr/outdoor/buggy_pos_enc/loftr_ds.py b/configs/loftr/outdoor/buggy_pos_enc/loftr_ds.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'

diff --git a/configs/loftr/outdoor/buggy_pos_enc/loftr_ds_dense.py b/configs/loftr/outdoor/buggy_pos_enc/loftr_ds_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'

diff --git a/configs/loftr/outdoor/buggy_pos_enc/loftr_ot.py b/configs/loftr/outdoor/buggy_pos_enc/loftr_ot.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'

diff --git a/configs/loftr/outdoor/buggy_pos_enc/loftr_ot_dense.py b/configs/loftr/outdoor/buggy_pos_enc/loftr_ot_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.COARSE.TEMP_BUG_FIX = False
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'

diff --git a/configs/loftr/outdoor/loftr_ds.py b/configs/loftr/outdoor/loftr_ds.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'
 

diff --git a/configs/loftr/outdoor/loftr_ds_dense.py b/configs/loftr/outdoor/loftr_ds_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'
 cfg.LOFTR.MATCH_COARSE.SPARSE_SPVS = False

diff --git a/configs/loftr/outdoor/loftr_ot.py b/configs/loftr/outdoor/loftr_ot.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'
 

diff --git a/configs/loftr/outdoor/loftr_ot_dense.py b/configs/loftr/outdoor/loftr_ot_dense.py
@@ -1,4 +1,4 @@
-from src.config.default import _CN as cfg
+from loftr.config.default import _CN as cfg
 
 cfg.LOFTR.MATCH_COARSE.MATCH_TYPE = 'sinkhorn'
 cfg.LOFTR.MATCH_COARSE.SPARSE_SPVS = False

diff --git a/demo/demo_loftr.py b/demo/demo_loftr.py
@@ -16,8 +16,8 @@
 import matplotlib.cm as cm
 
 os.sys.path.append("../")  # Add the project directory
-from src.loftr import LoFTR, default_cfg
-from src.config.default import get_cfg_defaults
+from loftr.loftr import LoFTR, default_cfg
+from loftr.config.default import get_cfg_defaults
 try:
     from demo.utils import (AverageTimer, VideoStreamer,
                             make_matching_plot_fast, make_matching_plot, frame2tensor)

diff --git a/src/__init__.py → loftr/__init__.py b/src/__init__.py → loftr/__init__.py
diff --git a/src/config/default.py → loftr/config/default.py b/src/config/default.py → loftr/config/default.py
diff --git a/src/datasets/megadepth.py → loftr/datasets/megadepth.py b/src/datasets/megadepth.py → loftr/datasets/megadepth.py
@@ -5,7 +5,7 @@
 from torch.utils.data import Dataset
 from loguru import logger
 
-from src.utils.dataset import read_megadepth_gray, read_megadepth_depth
+from loftr.utils.dataset import read_megadepth_gray, read_megadepth_depth
 
 
 class MegaDepthDataset(Dataset):

diff --git a/src/datasets/sampler.py → loftr/datasets/sampler.py b/src/datasets/sampler.py → loftr/datasets/sampler.py
diff --git a/src/datasets/scannet.py → loftr/datasets/scannet.py b/src/datasets/scannet.py → loftr/datasets/scannet.py
@@ -6,7 +6,7 @@
 import torch
 import torch.utils as utils
 from numpy.linalg import inv
-from src.utils.dataset import (
+from loftr.utils.dataset import (
     read_scannet_gray,
     read_scannet_depth,
     read_scannet_pose,

diff --git a/src/lightning/data.py → loftr/lightning/data.py b/src/lightning/data.py → loftr/lightning/data.py
@@ -19,13 +19,13 @@
     dataloader
 )
 
-from src.utils.augment import build_augmentor
-from src.utils.dataloader import get_local_split
-from src.utils.misc import tqdm_joblib
-from src.utils import comm
-from src.datasets.megadepth import MegaDepthDataset
-from src.datasets.scannet import ScanNetDataset
-from src.datasets.sampler import RandomConcatSampler
+from loftr.utils.augment import build_augmentor
+from loftr.utils.dataloader import get_local_split
+from loftr.utils.misc import tqdm_joblib
+from loftr.utils import comm
+from loftr.datasets.megadepth import MegaDepthDataset
+from loftr.datasets.scannet import ScanNetDataset
+from loftr.datasets.sampler import RandomConcatSampler
 
 
 class MultiSceneDataModule(pl.LightningDataModule):

diff --git a/src/lightning/lightning_loftr.py → loftr/lightning/lightning_loftr.py b/src/lightning/lightning_loftr.py → loftr/lightning/lightning_loftr.py
@@ -9,19 +9,19 @@
 import pytorch_lightning as pl
 from matplotlib import pyplot as plt
 
-from src.loftr import LoFTR
-from src.loftr.utils.supervision import compute_supervision_coarse, compute_supervision_fine
-from src.losses.loftr_loss import LoFTRLoss
-from src.optimizers import build_optimizer, build_scheduler
-from src.utils.metrics import (
+from loftr.loftr import LoFTR
+from loftr.loftr.utils.supervision import compute_supervision_coarse, compute_supervision_fine
+from loftr.losses.loftr_loss import LoFTRLoss
+from loftr.optimizers import build_optimizer, build_scheduler
+from loftr.utils.metrics import (
     compute_symmetrical_epipolar_errors,
     compute_pose_errors,
     aggregate_metrics
 )
-from src.utils.plotting import make_matching_figures
-from src.utils.comm import gather, all_gather
-from src.utils.misc import lower_config, flattenList
-from src.utils.profiler import PassThroughProfiler
+from loftr.utils.plotting import make_matching_figures
+from loftr.utils.comm import gather, all_gather
+from loftr.utils.misc import lower_config, flattenList
+from loftr.utils.profiler import PassThroughProfiler
 
 
 class PL_LoFTR(pl.LightningModule):

diff --git a/src/loftr/__init__.py → loftr/loftr/__init__.py b/src/loftr/__init__.py → loftr/loftr/__init__.py
diff --git a/src/loftr/backbone/__init__.py → loftr/loftr/backbone/__init__.py b/src/loftr/backbone/__init__.py → loftr/loftr/backbone/__init__.py
diff --git a/src/loftr/backbone/resnet_fpn.py → loftr/loftr/backbone/resnet_fpn.py b/src/loftr/backbone/resnet_fpn.py → loftr/loftr/backbone/resnet_fpn.py
diff --git a/src/loftr/loftr.py → loftr/loftr/loftr.py b/src/loftr/loftr.py → loftr/loftr/loftr.py
diff --git a/src/loftr/loftr_module/__init__.py → loftr/loftr/loftr_module/__init__.py b/src/loftr/loftr_module/__init__.py → loftr/loftr/loftr_module/__init__.py
diff --git a/src/loftr/loftr_module/fine_preprocess.py → loftr/loftr/loftr_module/fine_preprocess.py b/src/loftr/loftr_module/fine_preprocess.py → loftr/loftr/loftr_module/fine_preprocess.py
diff --git a/src/loftr/loftr_module/linear_attention.py → loftr/loftr/loftr_module/linear_attention.py b/src/loftr/loftr_module/linear_attention.py → loftr/loftr/loftr_module/linear_attention.py
diff --git a/src/loftr/loftr_module/transformer.py → loftr/loftr/loftr_module/transformer.py b/src/loftr/loftr_module/transformer.py → loftr/loftr/loftr_module/transformer.py
diff --git a/loftr/loftr/utils/__init__.py b/loftr/loftr/utils/__init__.py
diff --git a/src/loftr/utils/coarse_matching.py → loftr/loftr/utils/coarse_matching.py b/src/loftr/utils/coarse_matching.py → loftr/loftr/utils/coarse_matching.py
diff --git a/src/loftr/utils/cvpr_ds_config.py → loftr/loftr/utils/cvpr_ds_config.py b/src/loftr/utils/cvpr_ds_config.py → loftr/loftr/utils/cvpr_ds_config.py
@@ -29,7 +29,7 @@ def lower_config(yacs_cfg):
 
 # 3. Coarse-Matching config
 _CN.MATCH_COARSE = CN()
-_CN.MATCH_COARSE.THR = 0.2
+_CN.MATCH_COARSE.THR = 0.5 # was 0.2
 _CN.MATCH_COARSE.BORDER_RM = 2
 _CN.MATCH_COARSE.MATCH_TYPE = 'dual_softmax'  # options: ['dual_softmax, 'sinkhorn']
 _CN.MATCH_COARSE.DSMAX_TEMPERATURE = 0.1

diff --git a/src/loftr/utils/fine_matching.py → loftr/loftr/utils/fine_matching.py b/src/loftr/utils/fine_matching.py → loftr/loftr/utils/fine_matching.py
diff --git a/src/loftr/utils/geometry.py → loftr/loftr/utils/geometry.py b/src/loftr/utils/geometry.py → loftr/loftr/utils/geometry.py
diff --git a/src/loftr/utils/position_encoding.py → loftr/loftr/utils/position_encoding.py b/src/loftr/utils/position_encoding.py → loftr/loftr/utils/position_encoding.py
diff --git a/src/loftr/utils/supervision.py → loftr/loftr/utils/supervision.py b/src/loftr/utils/supervision.py → loftr/loftr/utils/supervision.py
diff --git a/src/losses/loftr_loss.py → loftr/losses/loftr_loss.py b/src/losses/loftr_loss.py → loftr/losses/loftr_loss.py
diff --git a/src/optimizers/__init__.py → loftr/optimizers/__init__.py b/src/optimizers/__init__.py → loftr/optimizers/__init__.py
diff --git a/loftr/utils/__init__.py b/loftr/utils/__init__.py
diff --git a/src/utils/augment.py → loftr/utils/augment.py b/src/utils/augment.py → loftr/utils/augment.py