Compatible for windows system (#29)

Compatibility for Windows: handle paths and globs properly. Co-authored-by: mason.suh <[email protected]>
cvg · Dec 7, 2020 · 39ced98 · 39ced98
1 parent 82c3bc2
commit 39ced98
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/hloc/extract_features.py b/hloc/extract_features.py
@@ -76,6 +76,7 @@ def __init__(self, root, conf):
             self.paths += list(Path(root).glob('**/'+g))
         if len(self.paths) == 0:
             raise ValueError(f'Could not find any image in root: {root}.')
+        self.paths = sorted(list(set(self.paths)))
         self.paths = [i.relative_to(root) for i in self.paths]
         logging.info(f'Found {len(self.paths)} images in root {root}.')
 
@@ -107,7 +108,7 @@ def __getitem__(self, idx):
         image = image / 255.
 
         data = {
-            'name': str(path),
+            'name': path.as_posix(),
             'image': image,
             'original_size': np.array(size),
         }

diff --git a/hloc/triangulation.py b/hloc/triangulation.py
@@ -128,7 +128,7 @@ def run_triangulation(colmap_path, model_path, database_path, image_dir,
         exit(ret)
 
     stats_raw = subprocess.check_output(
-        [str(colmap_path), 'model_analyzer', '--path', model_path])
+        [str(colmap_path), 'model_analyzer', '--path', str(model_path)])
     stats_raw = stats_raw.decode().split("\n")
     stats = dict()
     for stat in stats_raw: