Update

common/utils.py

@@ -468,20 +468,7 @@ ransac_zoo = {
 # Matchers collections
 matcher_zoo = {
     "gim": {"config": match_dense.confs["gim"], "dense": True},
-    "gluestick": {"config": match_dense.confs["gluestick"], "dense": True},
-    "sold2": {"config": match_dense.confs["sold2"], "dense": True},
-    # 'dedode-sparse': {
-    #     'config': match_dense.confs['dedode_sparse'],
-    #     'dense': True  # dense mode, we need 2 images
-    # },
     "loftr": {"config": match_dense.confs["loftr"], "dense": True},
-    "topicfm": {"config": match_dense.confs["topicfm"], "dense": True},
-    "aspanformer": {"config": match_dense.confs["aspanformer"], "dense": True},
-    "dedode": {
-        "config": match_features.confs["Dual-Softmax"],
-        "config_feature": extract_features.confs["dedode"],
-        "dense": False,
-    },
     "superpoint+superglue": {
         "config": match_features.confs["superglue"],
         "config_feature": extract_features.confs["superpoint_max"],
@@ -492,79 +479,14 @@ matcher_zoo = {
         "config_feature": extract_features.confs["superpoint_max"],
         "dense": False,
     },
-    "disk": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["disk"],
-        "dense": False,
-    },
-    "disk+dualsoftmax": {
-        "config": match_features.confs["Dual-Softmax"],
-        "config_feature": extract_features.confs["disk"],
-        "dense": False,
-    },
-    "superpoint+dualsoftmax": {
-        "config": match_features.confs["Dual-Softmax"],
-        "config_feature": extract_features.confs["superpoint_max"],
-        "dense": False,
-    },
-    "disk+lightglue": {
-        "config": match_features.confs["disk-lightglue"],
-        "config_feature": extract_features.confs["disk"],
-        "dense": False,
-    },
-    "superpoint+mnn": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["superpoint_max"],
-        "dense": False,
-    },
-    "sift+sgmnet": {
-        "config": match_features.confs["sgmnet"],
-        "config_feature": extract_features.confs["sift"],
-        "dense": False,
-    },
-    "sosnet": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["sosnet"],
-        "dense": False,
-    },
-    "hardnet": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["hardnet"],
-        "dense": False,
-    },
     "d2net": {
         "config": match_features.confs["NN-mutual"],
         "config_feature": extract_features.confs["d2net-ss"],
         "dense": False,
     },
-    "rord": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["rord"],
-        "dense": False,
-    },
-    # "d2net-ms": {
-    #     "config": match_features.confs["NN-mutual"],
-    #     "config_feature": extract_features.confs["d2net-ms"],
-    #     "dense": False,
-    # },
-    "alike": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["alike"],
-        "dense": False,
-    },
-    "lanet": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["lanet"],
-        "dense": False,
-    },
-    "r2d2": {
-        "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["r2d2"],
-        "dense": False,
-    },
-    "darkfeat": {
+    "hardnet": {
         "config": match_features.confs["NN-mutual"],
-        "config_feature": extract_features.confs["darkfeat"],
+        "config_feature": extract_features.confs["hardnet"],
         "dense": False,
     },
     "sift": {
@@ -572,6 +494,4 @@ matcher_zoo = {
         "config_feature": extract_features.confs["sift"],
         "dense": False,
     },
-    # "roma": {"config": match_dense.confs["roma"], "dense": True},
-    # "DKMv3": {"config": match_dense.confs["dkm"], "dense": True},
 }

common/viz.py

@@ -91,6 +91,8 @@ def make_matching_figure(
     path=None,
     pad=0,
 ):
+    # color = np.random.rand(len(mkpts0), 3)
+
     # draw image pair
     # assert mkpts0.shape[0] == mkpts1.shape[0], f'mkpts0: {mkpts0.shape[0]} v.s. mkpts1: {mkpts1.shape[0]}'
     fig, axes = plt.subplots(1, 2, figsize=(10, 6), dpi=dpi)
@@ -122,8 +124,9 @@ def make_matching_figure(
                 (fkpts0[i, 0], fkpts1[i, 0]),
                 (fkpts0[i, 1], fkpts1[i, 1]),
                 transform=fig.transFigure,
-                c=color[i],
-                linewidth=2,
+                c='lime',
+                # c=(233 / 255, 50 / 255, 35 / 255),
+                linewidth=1,
             )
             for i in range(len(mkpts0))
         ]
@@ -132,8 +135,8 @@ def make_matching_figure(
         axes[0].autoscale(enable=False)
         axes[1].autoscale(enable=False)
 
-        axes[0].scatter(mkpts0[:, 0], mkpts0[:, 1], c=color[..., :3], s=4)
-        axes[1].scatter(mkpts1[:, 0], mkpts1[:, 1], c=color[..., :3], s=4)
+        axes[0].scatter(mkpts0[:, 0], mkpts0[:, 1], c='lime', s=4)
+        axes[1].scatter(mkpts1[:, 0], mkpts1[:, 1], c='lime', s=4)
 
     # put txts
     txt_color = "k" if img0[:100, :200].mean() > 200 else "w"