matcher_type freedom

pull/1362/head
Piero Toffanin 2021-11-15 13:05:51 -05:00
rodzic d9f208cf31
commit 7fd8fb4c87
3 zmienionych plików z 2 dodań i 9 usunięć

Wyświetl plik

@ -21,8 +21,8 @@ RUN bash configure.sh clean
### Use a second image for the final asset to reduce the number and ### Use a second image for the final asset to reduce the number and
# size of the layers. # size of the layers.
#FROM nvidia/cuda:11.2.0-runtime-ubuntu20.04 FROM nvidia/cuda:11.2.0-runtime-ubuntu20.04
FROM nvidia/cuda:11.2.0-devel-ubuntu20.04 #FROM nvidia/cuda:11.2.0-devel-ubuntu20.04
# Env variables # Env variables
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \

Wyświetl plik

@ -224,12 +224,6 @@ class OSFMContext:
log.ODM_WARNING("Using BOW matching, will use HAHOG feature type, not SIFT") log.ODM_WARNING("Using BOW matching, will use HAHOG feature type, not SIFT")
feature_type = "HAHOG" feature_type = "HAHOG"
if feature_type == "AKAZE" or feature_type == "ORB":
# Cannot use anything other than BRUTEFORCE with AKAZE/ORB
if matcher_type != "bruteforce":
log.ODM_WARNING("Using BRUTEFORCE matching (needed since %s is selected)" % feature_type)
matcher_type = "bruteforce"
config.append("matcher_type: %s" % osfm_matchers[matcher_type]) config.append("matcher_type: %s" % osfm_matchers[matcher_type])
# GPU acceleration? # GPU acceleration?

Wyświetl plik

@ -5,7 +5,6 @@ import numpy as np
from opendm import get_image_size from opendm import get_image_size
from opendm import location from opendm import location
from opendm.gcp import GCPFile from opendm.gcp import GCPFile
from opendm.geo import GeoFile
from pyproj import CRS from pyproj import CRS
import xmltodict as x2d import xmltodict as x2d
from six import string_types from six import string_types