remove threading to avoid trying reading features before they are suc…

…cessfully stored on disk

main.py

@@ -112,6 +112,7 @@
     try:
         # To be sure, check if pycolmap is available, otherwise skip reconstruction
         pycolmap = import_module("pycolmap")
+        logger.info(f"Using pycolmap version {pycolmap.__version__}")
     except ImportError:
         logger.error("Pycomlap is not available.")
         use_pycolmap = False

src/deep_image_matching/extractors/extractor_base.py

@@ -1,5 +1,4 @@
 import inspect
-import threading
 from abc import ABCMeta, abstractmethod
 from pathlib import Path
 from typing import Optional, Tuple, TypedDict, Union
@@ -221,18 +220,14 @@ def extract(self, img: Union[Image, Path, str]) -> np.ndarray:
         features["image_size"] = np.array(image.shape[:2])
 
         # Save features to disk in h5 format
-        h5_thread = threading.Thread(
-            target=lambda: save_features_h5(
-                feature_path,
-                features,
-                im_path.name,
-                as_half=self.features_as_half,
-            )
+        save_features_h5(
+            feature_path,
+            features,
+            im_path.name,
+            as_half=self.features_as_half,
         )
-        h5_thread.start()
 
         # For debug: visualize keypoints and save to disk
-        # Do everything in a separate thread not to block the main thread
         if self._config["general"]["verbose"]:
             viz_dir = output_dir / "debug" / "keypoints"
             viz_dir.mkdir(parents=True, exist_ok=True)

src/deep_image_matching/image_matching.py

@@ -346,8 +346,6 @@ def match_pairs(self, feature_path: Path, try_full_image: bool = False) -> Path:
             timer.update("Match pair")
 
             # NOTE: Geometric verif. has been moved to the end of the matching process
-            # if matches is None:
-            #     continue
 
         # TODO: Clean up features with no matches
 

src/deep_image_matching/matchers/matcher_base.py

@@ -1,5 +1,4 @@
 import inspect
-import threading
 from abc import ABCMeta, abstractmethod
 from itertools import product
 from pathlib import Path
@@ -364,21 +363,17 @@ def match(
 
         # For debugging
         if self._config["general"]["verbose"]:
-
-            def debug_viz():
-                viz_dir = self._output_dir / "debug" / "matches"
-                viz_dir.mkdir(parents=True, exist_ok=True)
-                self.viz_matches(
-                    feature_path,
-                    matches_path,
-                    img0,
-                    img1,
-                    save_path=viz_dir / f"{img0_name}_{img1_name}.jpg",
-                    img_format="jpg",
-                    jpg_quality=70,
-                )
-
-            threading.Thread(target=debug_viz()).start()
+            viz_dir = self._output_dir / "debug" / "matches"
+            viz_dir.mkdir(parents=True, exist_ok=True)
+            self.viz_matches(
+                feature_path,
+                matches_path,
+                img0,
+                img1,
+                save_path=viz_dir / f"{img0_name}_{img1_name}.jpg",
+                img_format="jpg",
+                jpg_quality=70,
+            )
 
         return matches