triangulation and reconstruction module imported only if pycolmap is available

Author: franioli

README.md

@@ -68,27 +68,40 @@ DIM can also be utilized as a library instead of being executed through the Comm
 
 For installing deep-image-matching, first create a conda environment:
 
-```
+```bash
 conda create -n deep-image-matching python=3.9
 conda activate deep-image-matching
 pip install --upgrade pip
 ```
 
-Clone the repository and install deep-image-matching in editable mode:
+Then, you can install deep-image-matching using pip with the following command:
 
+```bash
+pip install deep-image-matching
 ```
+
+If there is any issue with the installation, you can also install the package from the source code.
+Clone the repository and install deep-image-matching in editable mode:
+
+```bash
 git clone https://github.com/3DOM-FBK/deep-image-matching.git
 cd deep-image-matching
 pip install -e .
 ```
 
 Install pycolmap (optional, but recommended):
 
-```
+```bash
 pip install pycolmap==0.6.1
 ```
 Pycolmap is optional to run reconstruction directly in DIM. If pycolmap is not available, matches will be written both in a h5 and colmap database for later processing with COLMAP GUI or API, or other processing.
 
+Try to run the tests to check if deep-image-matching is correctly installed, try to import the package in a Python shell:
+
+```python
+import deep_image_matching as dim
+```
+
 For more information, check the [documentation](https://3dom-fbk.github.io/deep-image-matching/installation/).
 
 ## Docker Installation

docs/installation.md

@@ -17,6 +17,13 @@ conda activate deep-image-matching
 pip install --upgrade pip
 ```
 
+Then, you can install deep-image-matching using pip with the following command:
+
+```bash
+pip install deep-image-matching
+```
+
+If there is any issue with the installation, you can also install the package from the source code.
 Clone the repository and install deep-image-matching in editable mode:
 
 ```bash
@@ -32,6 +39,12 @@ pip install pycolmap==0.6.1
 ```
 Pycolmap is optional to run reconstruction directly in DIM. If pycolmap is not available, matches will be written both in a h5 and colmap database for later processing with COLMAP GUI or API, or other processing.
 
+Try to run the tests to check if deep-image-matching is correctly installed, try to import the package in a Python shell:
+
+```python
+import deep_image_matching as dim
+```
+
 
 ### Notes and troubleshooting
 

src/deep_image_matching/__init__.py

@@ -20,28 +20,16 @@
 
 # Import submodules
 from . import extractors
-
-time_dict["extractors"] = time() - time_dict["start"]
 from . import matchers
-
-time_dict["matchers"] = time() - time_dict["extractors"]
-
-from . import reconstruction
-
-time_dict["reconstruction"] = time() - time_dict["matchers"]
-
 from . import io
 from . import utils
 from . import visualization
 from . import thirdparty
 
-time_dict["aux"] = time() - time_dict["reconstruction"]
-
 if not NO_PYCOLMAP:
-    from . import triangulation  # the triangulation module strictly requires pycolmap
-
-    time_dict["triangulation"] = time() - time_dict["aux"]
-
+    # Import submodules that require pycolmap
+    from . import reconstruction
+    from . import triangulation
 try:
     from . import graph
 except ImportError:
@@ -57,6 +45,3 @@
 from .config import Config
 
 print("Deep Image Matching loaded in {:.3f} seconds.".format(time() - time_dict["start"]))
-# print("Time breakdown:")
-# for key in time_dict:
-#     print(f"{key}: {time_dict[key]:.3f}")