nystrom-ncut 0.0.7__tar.gz → 0.0.8__tar.gz

{nystrom_ncut-0.0.7/src/nystrom_ncut.egg-info → nystrom_ncut-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nystrom_ncut
-Version: 0.0.7
+Version: 0.0.8
 Summary: Normalized Cut and Nyström Approximation
 Author-email: Huzheng Yang <huze.yann@gmail.com>, Wentinn Liao <wentinn.liao@gmail.com>
 Project-URL: Documentation, https://github.com/JophiArcana/Nystrom-NCUT/

{nystrom_ncut-0.0.7 → nystrom_ncut-0.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nystrom_ncut"
-version = "0.0.7"
+version = "0.0.8"
 authors = [
     { name = "Huzheng Yang", email = "huze.yann@gmail.com" },
     { name = "Wentinn Liao", email = "wentinn.liao@gmail.com" },

{nystrom_ncut-0.0.7 → nystrom_ncut-0.0.8}/src/nystrom_ncut/ncut_pytorch.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Literal, Tuple
+from typing import Tuple
 
 import torch
 import torch.nn.functional as Fn

{nystrom_ncut-0.0.7 → nystrom_ncut-0.0.8}/src/nystrom_ncut/propagation_utils.py

@@ -98,7 +98,11 @@ def distance_from_features(
         D = torch.cdist(features, features_B, p=2)
     elif distance == "rbf":
         D = torch.cdist(features, features_B, p=2) ** 2
-        D = D / (2 * features.var(dim=0).sum())
+
+        # Outlier-robust scale invariance using quantiles to estimate standard deviation
+        stds = torch.quantile(features, q=torch.tensor((0.158655, 0.841345), device=features.device), dim=0)
+        stds = (stds[1] - stds[0]) / 2
+        D = D / (2 * torch.linalg.norm(stds) ** 2)
     else:
         raise ValueError("distance should be 'cosine' or 'euclidean', 'rbf'")
     return D
@@ -178,39 +182,17 @@ def extrapolate_knn(
     V_list = []
     for _v in torch.chunk(extrapolation_features, n_chunks, dim=0):
         _v = _v.to(device)                                                                              # [_m x d]
+
         _A = affinity_from_features(anchor_features, _v, affinity_focal_gamma, distance).mT             # [_m x n]
         if knn is not None:
             _A, indices = _A.topk(k=knn, dim=-1, largest=True)                                          # [_m x k], [_m x k]
             _anchor_output = anchor_output[indices]                                                     # [_m x k x d]
         else:
             _anchor_output = anchor_output[None]                                                        # [1 x n x d]
-        _A = Fn.normalize(_A, p=1, dim=-1)
-
-        # if distance == 'cosine':
-        #     _A = _v @ subgraph_features.T
-        # elif distance == 'euclidean':
-        #     _A = - torch.cdist(_v, subgraph_features, p=2)
-        # elif distance == 'rbf':
-        #     _A = - torch.cdist(_v, subgraph_features, p=2) ** 2
-        # else:
-        #     raise ValueError("distance should be 'cosine' or 'euclidean', 'rbf'")
-        #
-        # # keep topk KNN for each row
-        # topk_sim, topk_idx = _A.topk(knn, dim=-1, largest=True)
-        # row_id = torch.arange(topk_idx.shape[0], device=_A.device)[:, None].expand(
-        #     -1, topk_idx.shape[1]
-        # )
-        # _A = torch.sparse_coo_tensor(
-        #     torch.stack([row_id, topk_idx], dim=-1).reshape(-1, 2).T,
-        #     topk_sim.reshape(-1),
-        #     size=(_A.shape[0], _A.shape[1]),
-        #     device=_A.device,
-        # )
-        # _A = _A.to_dense().to(dtype=subgraph_output.dtype)
-        # _D = _A.sum(-1)
-        # _A /= _D[:, None]
-
-        _V = (_A[:, None, :] @ _anchor_output).squeeze(1)
+
+        _A = Fn.normalize(_A, p=1, dim=-1)                                                              # [_m x k]
+        _V = (_A[:, None, :] @ _anchor_output).squeeze(1)                                               # [_m x d]
+
         if move_output_to_cpu:
             _V = _V.cpu()
         V_list.append(_V)

{nystrom_ncut-0.0.7 → nystrom_ncut-0.0.8}/src/nystrom_ncut/visualize_utils.py

@@ -38,14 +38,9 @@ def _rgb_with_dimensionality_reduction(
 ) -> Tuple[torch.Tensor, torch.Tensor]:
 
     if pre_smooth:
-        _subgraph_indices = run_subgraph_sampling(
-            features,
-            num_sample,
-            sample_method="farthest",
-        )
         features = extrapolate_knn(
-            features[_subgraph_indices],
-            features[_subgraph_indices],
+            features,
+            features,
             features,
             distance="cosine",
         )

{nystrom_ncut-0.0.7 → nystrom_ncut-0.0.8/src/nystrom_ncut.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nystrom_ncut
-Version: 0.0.7
+Version: 0.0.8
 Summary: Normalized Cut and Nyström Approximation
 Author-email: Huzheng Yang <huze.yann@gmail.com>, Wentinn Liao <wentinn.liao@gmail.com>
 Project-URL: Documentation, https://github.com/JophiArcana/Nystrom-NCUT/