add: logger

.gitignore

@@ -20,6 +20,7 @@ third_party/QuadTreeAttention
 desktop.ini
 *.egg-info
 output.pkl
+log.txt
 experiments*
 gen_example.py
 datasets/lines/terrace0.JPG

hloc/__init__.py

@@ -1,21 +1,44 @@
 import logging
+import sys
 
 import torch
 from packaging import version
 
 __version__ = "1.5"
 
+LOG_PATH = "log.txt"
+
+
+def read_logs():
+    sys.stdout.flush()
+    with open(LOG_PATH, "r") as f:
+        return f.read()
+
+
+def flush_logs():
+    sys.stdout.flush()
+    logs = open(LOG_PATH, "w")
+    logs.close()
+
+
 formatter = logging.Formatter(
     fmt="[%(asctime)s %(name)s %(levelname)s] %(message)s",
     datefmt="%Y/%m/%d %H:%M:%S",
 )
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-handler.setLevel(logging.INFO)
 
+logs_file = open(LOG_PATH, "w")
+logs_file.close()
+
+file_handler = logging.FileHandler(filename=LOG_PATH)
+file_handler.setFormatter(formatter)
+file_handler.setLevel(logging.INFO)
+stdout_handler = logging.StreamHandler()
+stdout_handler.setFormatter(formatter)
+stdout_handler.setLevel(logging.INFO)
 logger = logging.getLogger("hloc")
 logger.setLevel(logging.INFO)
-logger.addHandler(handler)
+logger.addHandler(file_handler)
+logger.addHandler(stdout_handler)
 logger.propagate = False
 
 try:

ui/app_class.py

@@ -6,6 +6,7 @@ import numpy as np
 from easydict import EasyDict as edict
 from omegaconf import OmegaConf
 
+from hloc import flush_logs, read_logs
 from ui.sfm import SfmEngine
 from ui.utils import (
     GRADIO_VERSION,
@@ -30,6 +31,11 @@ This Space demonstrates [Image Matching WebUI](https://github.com/Vincentqyw/ima
 🐛 Your feedback is valuable to me. Please do not hesitate to report any bugs [here](https://github.com/Vincentqyw/image-matching-webui/issues).
 """
 
+CSS = """
+#warning {background-color: #FFCCCB}
+.logs_class textarea {font-size: 12px !important}
+"""
+
 
 class ImageMatchingApp:
     def __init__(self, server_name="0.0.0.0", server_port=7860, **kwargs):
@@ -52,7 +58,7 @@ class ImageMatchingApp:
         return algos
 
     def init_interface(self):
-        with gr.Blocks() as self.app:
+        with gr.Blocks(css=CSS) as self.app:
             with gr.Tab("Image Matching"):
                 with gr.Row():
                     with gr.Column(scale=1):
@@ -138,7 +144,7 @@ class ImageMatchingApp:
                                         minimum=0.0,
                                         maximum=1,
                                         step=0.001,
-                                        label="Match thres.",
+                                        label="Match threshold",
                                         value=0.1,
                                     )
                                     match_setting_max_keypoints = gr.Slider(
@@ -154,7 +160,7 @@ class ImageMatchingApp:
                                         minimum=0,
                                         maximum=1,
                                         step=0.001,
-                                        label="Keypoint thres.",
+                                        label="Keypoint threshold",
                                         value=0.015,
                                     )
                                     detect_line_threshold = (  # noqa: F841
@@ -162,7 +168,7 @@ class ImageMatchingApp:
                                             minimum=0.1,
                                             maximum=1,
                                             step=0.01,
-                                            label="Line thres.",
+                                            label="Line threshold",
                                             value=0.2,
                                         )
                                     )
@@ -266,6 +272,25 @@ class ImageMatchingApp:
                             self.display_supported_algorithms()
 
                     with gr.Column():
+                        with gr.Accordion("Open for More: Logs", open=False):
+                            logs = gr.Textbox(
+                                placeholder="\n" * 10,
+                                label="Logs",
+                                info="Verbose from inference will be displayed below.",
+                                lines=10,
+                                max_lines=10,
+                                autoscroll=True,
+                                elem_id="logs",
+                                show_copy_button=True,
+                                container=True,
+                                elem_classes="logs_class",
+                            )
+                            self.app.load(read_logs, None, logs, every=1)
+                            btn_clear_logs = gr.Button(
+                                "Clear logs", elem_id="logs-button"
+                            )
+                            btn_clear_logs.click(flush_logs, [], [])
+
                         with gr.Accordion(
                             "Open for More: Keypoints", open=True
                         ):
@@ -453,25 +478,7 @@ class ImageMatchingApp:
             }
 
     def _on_select_force_resize(self, visible: bool = False):
-        image_height = gr.Slider(
-            minimum=48,
-            maximum=2048,
-            step=16,
-            label="Image Height",
-            value=480,
-            visible=visible,
-            interactive=True,
-        )
-        image_width = gr.Slider(
-            minimum=64,
-            maximum=2048,
-            step=16,
-            label="Image Width",
-            value=640,
-            visible=visible,
-            interactive=True,
-        )
-        return image_width, image_height
+        return gr.update(visible=visible), gr.update(visible=visible)
 
     def ui_reset_state(
         self,
@@ -642,12 +649,7 @@ class AppSfmUI(AppBaseUI):
             return gr.Textbox("not set", visible=True)
 
     def _on_select_custom_params(self, value: bool = False):
-        return gr.Textbox(
-            label="Camera Params",
-            value="0,0,0,0",
-            interactive=value,
-            visible=value,
-        )
+        return gr.update(visible=value)
 
     def _init_ui(self):
         with gr.Row():

ui/utils.py

@@ -948,9 +948,9 @@ def run_matching(
         )
         pred = match_features.match_images(matcher, pred0, pred1)
         del extractor
-    gr.Info(
-        f"Matching images done using: {time.time()-t1:.3f}s",
-    )
+    # gr.Info(
+    #     f"Matching images done using: {time.time()-t1:.3f}s",
+    # )
     logger.info(f"Matching images done using: {time.time()-t1:.3f}s")
     t1 = time.time()