Spaces:
Runtime error
Runtime error
update: format
Browse files- common/config.yaml +0 -4
- hloc/extractors/darkfeat.py +3 -3
- hloc/extractors/disk.py +2 -0
- hloc/extractors/lanet.py +1 -1
- hloc/extractors/rord.py +5 -3
- hloc/matchers/aspanformer.py +3 -3
- hloc/matchers/sgmnet.py +2 -1
common/config.yaml
CHANGED
|
@@ -30,7 +30,6 @@ matcher_zoo:
|
|
| 30 |
DUSt3R:
|
| 31 |
# TODO: duster is under development
|
| 32 |
enable: true
|
| 33 |
-
skip_ci: true
|
| 34 |
matcher: duster
|
| 35 |
dense: true
|
| 36 |
info:
|
|
@@ -42,7 +41,6 @@ matcher_zoo:
|
|
| 42 |
display: true
|
| 43 |
GIM(dkm):
|
| 44 |
enable: true
|
| 45 |
-
skip_ci: true
|
| 46 |
matcher: gim(dkm)
|
| 47 |
dense: true
|
| 48 |
info:
|
|
@@ -54,7 +52,6 @@ matcher_zoo:
|
|
| 54 |
display: true
|
| 55 |
RoMa:
|
| 56 |
matcher: roma
|
| 57 |
-
skip_ci: true
|
| 58 |
dense: true
|
| 59 |
info:
|
| 60 |
name: RoMa #dispaly name
|
|
@@ -65,7 +62,6 @@ matcher_zoo:
|
|
| 65 |
display: true
|
| 66 |
dkm:
|
| 67 |
matcher: dkm
|
| 68 |
-
skip_ci: true
|
| 69 |
dense: true
|
| 70 |
info:
|
| 71 |
name: DKM #dispaly name
|
|
|
|
| 30 |
DUSt3R:
|
| 31 |
# TODO: duster is under development
|
| 32 |
enable: true
|
|
|
|
| 33 |
matcher: duster
|
| 34 |
dense: true
|
| 35 |
info:
|
|
|
|
| 41 |
display: true
|
| 42 |
GIM(dkm):
|
| 43 |
enable: true
|
|
|
|
| 44 |
matcher: gim(dkm)
|
| 45 |
dense: true
|
| 46 |
info:
|
|
|
|
| 52 |
display: true
|
| 53 |
RoMa:
|
| 54 |
matcher: roma
|
|
|
|
| 55 |
dense: true
|
| 56 |
info:
|
| 57 |
name: RoMa #dispaly name
|
|
|
|
| 62 |
display: true
|
| 63 |
dkm:
|
| 64 |
matcher: dkm
|
|
|
|
| 65 |
dense: true
|
| 66 |
info:
|
| 67 |
name: DKM #dispaly name
|
hloc/extractors/darkfeat.py
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
|
|
| 1 |
import sys
|
| 2 |
from pathlib import Path
|
| 3 |
|
| 4 |
-
import subprocess
|
| 5 |
-
|
| 6 |
from hloc import logger
|
| 7 |
|
| 8 |
from ..utils.base_model import BaseModel
|
|
@@ -38,11 +37,12 @@ class DarkFeat(BaseModel):
|
|
| 38 |
try:
|
| 39 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 40 |
except subprocess.CalledProcessError as e:
|
|
|
|
| 41 |
logger.info(f"Downloading the DarkFeat model with `{cmd}`.")
|
| 42 |
try:
|
| 43 |
subprocess.run(cmd, check=True)
|
| 44 |
except subprocess.CalledProcessError as e:
|
| 45 |
-
logger.error(
|
| 46 |
raise e
|
| 47 |
|
| 48 |
self.net = DarkFeat_(model_path)
|
|
|
|
| 1 |
+
import subprocess
|
| 2 |
import sys
|
| 3 |
from pathlib import Path
|
| 4 |
|
|
|
|
|
|
|
| 5 |
from hloc import logger
|
| 6 |
|
| 7 |
from ..utils.base_model import BaseModel
|
|
|
|
| 37 |
try:
|
| 38 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 39 |
except subprocess.CalledProcessError as e:
|
| 40 |
+
logger.info(f"Downloading the model failed `{e}`.")
|
| 41 |
logger.info(f"Downloading the DarkFeat model with `{cmd}`.")
|
| 42 |
try:
|
| 43 |
subprocess.run(cmd, check=True)
|
| 44 |
except subprocess.CalledProcessError as e:
|
| 45 |
+
logger.error("Failed to download the DarkFeat model.")
|
| 46 |
raise e
|
| 47 |
|
| 48 |
self.net = DarkFeat_(model_path)
|
hloc/extractors/disk.py
CHANGED
|
@@ -1,5 +1,7 @@
|
|
| 1 |
import kornia
|
|
|
|
| 2 |
from hloc import logger
|
|
|
|
| 3 |
from ..utils.base_model import BaseModel
|
| 4 |
|
| 5 |
|
|
|
|
| 1 |
import kornia
|
| 2 |
+
|
| 3 |
from hloc import logger
|
| 4 |
+
|
| 5 |
from ..utils.base_model import BaseModel
|
| 6 |
|
| 7 |
|
hloc/extractors/lanet.py
CHANGED
|
@@ -1,8 +1,8 @@
|
|
| 1 |
-
import subprocess
|
| 2 |
import sys
|
| 3 |
from pathlib import Path
|
| 4 |
|
| 5 |
import torch
|
|
|
|
| 6 |
from hloc import logger
|
| 7 |
|
| 8 |
from ..utils.base_model import BaseModel
|
|
|
|
|
|
|
| 1 |
import sys
|
| 2 |
from pathlib import Path
|
| 3 |
|
| 4 |
import torch
|
| 5 |
+
|
| 6 |
from hloc import logger
|
| 7 |
|
| 8 |
from ..utils.base_model import BaseModel
|
hloc/extractors/rord.py
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
|
|
| 1 |
import sys
|
| 2 |
from pathlib import Path
|
| 3 |
-
|
| 4 |
import torch
|
| 5 |
|
| 6 |
from hloc import logger
|
|
@@ -38,11 +39,12 @@ class RoRD(BaseModel):
|
|
| 38 |
try:
|
| 39 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 40 |
except subprocess.CalledProcessError as e:
|
| 41 |
-
logger.info(f"Downloading
|
|
|
|
| 42 |
try:
|
| 43 |
subprocess.run(cmd, check=True)
|
| 44 |
except subprocess.CalledProcessError as e:
|
| 45 |
-
logger.error(f"Failed to download the RoRD model
|
| 46 |
self.net = _RoRD(
|
| 47 |
model_file=model_path, use_relu=conf["use_relu"], use_cuda=False
|
| 48 |
)
|
|
|
|
| 1 |
+
import subprocess
|
| 2 |
import sys
|
| 3 |
from pathlib import Path
|
| 4 |
+
|
| 5 |
import torch
|
| 6 |
|
| 7 |
from hloc import logger
|
|
|
|
| 39 |
try:
|
| 40 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 41 |
except subprocess.CalledProcessError as e:
|
| 42 |
+
logger.info(f"Downloading failed {e}.")
|
| 43 |
+
logger.info(f"Downloading the RoRD model with {cmd}.")
|
| 44 |
try:
|
| 45 |
subprocess.run(cmd, check=True)
|
| 46 |
except subprocess.CalledProcessError as e:
|
| 47 |
+
logger.error(f"Failed to download the RoRD model: {e}")
|
| 48 |
self.net = _RoRD(
|
| 49 |
model_file=model_path, use_relu=conf["use_relu"], use_cuda=False
|
| 50 |
)
|
hloc/matchers/aspanformer.py
CHANGED
|
@@ -4,7 +4,7 @@ from pathlib import Path
|
|
| 4 |
|
| 5 |
import torch
|
| 6 |
|
| 7 |
-
from .. import logger
|
| 8 |
from ..utils.base_model import BaseModel
|
| 9 |
|
| 10 |
sys.path.append(str(Path(__file__).parent / "../../third_party"))
|
|
@@ -55,6 +55,7 @@ class ASpanFormer(BaseModel):
|
|
| 55 |
try:
|
| 56 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 57 |
except subprocess.CalledProcessError as e:
|
|
|
|
| 58 |
logger.info(
|
| 59 |
f"Downloading the Aspanformer model with `{cmd}`."
|
| 60 |
)
|
|
@@ -62,9 +63,8 @@ class ASpanFormer(BaseModel):
|
|
| 62 |
subprocess.run(cmd, check=True)
|
| 63 |
except subprocess.CalledProcessError as e:
|
| 64 |
logger.error(
|
| 65 |
-
f"Failed to download the Aspanformer model
|
| 66 |
)
|
| 67 |
-
raise e
|
| 68 |
|
| 69 |
do_system(f"cd {str(aspanformer_path)} & tar -xvf {str(tar_path)}")
|
| 70 |
|
|
|
|
| 4 |
|
| 5 |
import torch
|
| 6 |
|
| 7 |
+
from .. import do_system, logger
|
| 8 |
from ..utils.base_model import BaseModel
|
| 9 |
|
| 10 |
sys.path.append(str(Path(__file__).parent / "../../third_party"))
|
|
|
|
| 55 |
try:
|
| 56 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 57 |
except subprocess.CalledProcessError as e:
|
| 58 |
+
logger.info(f"Downloading failed {e}.")
|
| 59 |
logger.info(
|
| 60 |
f"Downloading the Aspanformer model with `{cmd}`."
|
| 61 |
)
|
|
|
|
| 63 |
subprocess.run(cmd, check=True)
|
| 64 |
except subprocess.CalledProcessError as e:
|
| 65 |
logger.error(
|
| 66 |
+
f"Failed to download the Aspanformer model: {e}"
|
| 67 |
)
|
|
|
|
| 68 |
|
| 69 |
do_system(f"cd {str(aspanformer_path)} & tar -xvf {str(tar_path)}")
|
| 70 |
|
hloc/matchers/sgmnet.py
CHANGED
|
@@ -66,11 +66,12 @@ class SGMNet(BaseModel):
|
|
| 66 |
try:
|
| 67 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 68 |
except subprocess.CalledProcessError as e:
|
|
|
|
| 69 |
logger.info(f"Downloading the SGMNet model with `{cmd}`.")
|
| 70 |
try:
|
| 71 |
subprocess.run(cmd, check=True)
|
| 72 |
except subprocess.CalledProcessError as e:
|
| 73 |
-
logger.error(
|
| 74 |
raise e
|
| 75 |
cmd = ["tar", "-xvf", str(tar_path), "-C", str(sgmnet_path)]
|
| 76 |
logger.info(f"Unzip model file `{cmd}`.")
|
|
|
|
| 66 |
try:
|
| 67 |
subprocess.run(cmd_wo_proxy, check=True)
|
| 68 |
except subprocess.CalledProcessError as e:
|
| 69 |
+
logger.info(f"Downloading failed {e}.")
|
| 70 |
logger.info(f"Downloading the SGMNet model with `{cmd}`.")
|
| 71 |
try:
|
| 72 |
subprocess.run(cmd, check=True)
|
| 73 |
except subprocess.CalledProcessError as e:
|
| 74 |
+
logger.error("Failed to download the SGMNet model.")
|
| 75 |
raise e
|
| 76 |
cmd = ["tar", "-xvf", str(tar_path), "-C", str(sgmnet_path)]
|
| 77 |
logger.info(f"Unzip model file `{cmd}`.")
|