nystrom-ncut 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

nystrom_ncut/ncut_pytorch.py

@@ -173,9 +173,10 @@ class NCUT(OnlineNystrom):
         else:
             sampled_indices = run_subgraph_sampling(
                 features,
-                num_sample=self.num_sample,
+                self.num_sample,
                 sample_method=self.sample_method,
             )
+        sampled_indices = torch.sort(sampled_indices).values
         sampled_features = features[sampled_indices]
         OnlineNystrom.fit(self, sampled_features)
 

nystrom_ncut/nystrom.py

@@ -52,6 +52,18 @@ class OnlineNystrom:
         self.transform_matrix: torch.Tensor = None  # [n x n_components]
         self.LS: torch.Tensor = None                # [n]
 
+    def _update_to_kernel(self) -> Tuple[torch.Tensor, torch.Tensor]:
+        self.A = self.S = self.kernel.transform()
+        U, L = solve_eig(
+            self.A,
+            num_eig=self.inverse_approximation_dim,
+            eig_solver=self.eig_solver,
+        )                                                                                           # [n x (? + 1)], [? + 1]
+        self.Ahinv_UL = U * (L ** -0.5)                                                             # [n x (? + 1)]
+        self.Ahinv_VT = U.mT                                                                        # [(? + 1) x n]
+        self.Ahinv = self.Ahinv_UL @ self.Ahinv_VT                                                  # [n x n]
+        return U, L
+
     def fit(self, features: torch.Tensor):
         OnlineNystrom.fit_transform(self, features)
         return self
@@ -60,17 +72,8 @@ class OnlineNystrom:
         self.anchor_features = features
 
         self.kernel.fit(self.anchor_features)
-        self.A = self.S = self.kernel.transform()                                                   # [n x n]
-
         self.inverse_approximation_dim = max(self.n_components, features.shape[-1]) + 1
-        U, L = solve_eig(
-            self.A,
-            num_eig=self.inverse_approximation_dim,
-            eig_solver=self.eig_solver,
-        )                                                                                           # [n x (? + 1)], [? + 1]
-        self.Ahinv_UL = U * (L ** -0.5)                                                             # [n x (? + 1)]
-        self.Ahinv_VT = U.mT                                                                        # [(? + 1) x n]
-        self.Ahinv = self.Ahinv_UL @ self.Ahinv_VT                                                  # [n x n]
+        U, L = self._update_to_kernel()                                                             # [n x (? + 1)], [? + 1]
 
         self.transform_matrix = (U / L)[:, :self.n_components]                                      # [n x n_components]
         self.LS = L[:self.n_components]                                                             # [n_components]
@@ -83,6 +86,7 @@ class OnlineNystrom:
             chunks = torch.chunk(features, n_chunks, dim=0)
             for chunk in chunks:
                 self.kernel.update(chunk)
+            self._update_to_kernel()
 
             compressed_BBT = torch.zeros((self.inverse_approximation_dim, self.inverse_approximation_dim))  # [(? + 1) x (? + 1))]
             for i, chunk in enumerate(chunks):
@@ -101,6 +105,7 @@ class OnlineNystrom:
         else:
             """ Unchunked version """
             B = self.kernel.update(features).mT                                                         # [n x m]
+            self._update_to_kernel()
             compressed_B = self.Ahinv_VT @ B                                                            # [indirect_pca_dim x m]
 
             self.S = self.S + self.Ahinv_UL @ (compressed_B @ compressed_B.mT) @ self.Ahinv_UL.mT       # [n x n]

nystrom_ncut/propagation_utils.py

@@ -11,7 +11,7 @@ from .common import ceildiv, lazy_normalize
 @torch.no_grad()
 def run_subgraph_sampling(
     features: torch.Tensor,
-    num_sample: int = 300,
+    num_sample: int,
     max_draw: int = 1000000,
     sample_method: Literal["farthest", "random"] = "farthest",
 ):
@@ -272,7 +272,7 @@ def propagate_eigenvectors(
     # sample subgraph
     subgraph_indices = run_subgraph_sampling(
         features,
-        num_sample=num_sample,
+        num_sample,
         sample_method=sample_method,
     )
 

nystrom_ncut/visualize_utils.py

@@ -34,7 +34,7 @@ def _rgb_with_dimensionality_reduction(
 ) -> Tuple[torch.Tensor, torch.Tensor]:
     subgraph_indices = run_subgraph_sampling(
         features,
-        num_sample=num_sample,
+        num_sample,
         sample_method="farthest",
     )
 

{nystrom_ncut-0.0.3.dist-info → nystrom_ncut-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nystrom_ncut
-Version: 0.0.3
+Version: 0.0.5
 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.5.dist-info/RECORD

@@ -0,0 +1,11 @@
+nystrom_ncut/__init__.py,sha256=Cww-_OsyQHLKpgw_Wh28_tUOvIMMr7Ey8w-tH7v99xQ,452
+nystrom_ncut/common.py,sha256=qdR_JwknT9H1Cv5LopwdwZfORFx-O8MLiRI6ZF1Qohc,558
+nystrom_ncut/ncut_pytorch.py,sha256=wRQXUPBOW2_vutocKf0J19HrFVkBYQePAYUEfotLfx4,11701
+nystrom_ncut/nystrom.py,sha256=HbwON9pLW3gEZvOmbDJwkQNHolOo1EBvwBPeh2p2uJE,8833
+nystrom_ncut/propagation_utils.py,sha256=mD6rZ_mwYjYXs1cp5ZaTK0FrJ4YhyCdoIUrdGRP9k-M,12119
+nystrom_ncut/visualize_utils.py,sha256=QmBatlX7Q-ZWF_iJ1zFDnPHFuofz3tCmtoNeeoMPw3U,18558
+nystrom_ncut-0.0.5.dist-info/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+nystrom_ncut-0.0.5.dist-info/METADATA,sha256=n9zlRYBD02k478INScrj9V9rZ1mhXTylcMjkmQDgl1A,6058
+nystrom_ncut-0.0.5.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+nystrom_ncut-0.0.5.dist-info/top_level.txt,sha256=j7g_j0S048EvguFFnGgD5Ewd3r2H6klsxd5A4dd-wHw,13
+nystrom_ncut-0.0.5.dist-info/RECORD,,

nystrom_ncut-0.0.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-nystrom_ncut/__init__.py,sha256=Cww-_OsyQHLKpgw_Wh28_tUOvIMMr7Ey8w-tH7v99xQ,452
-nystrom_ncut/common.py,sha256=qdR_JwknT9H1Cv5LopwdwZfORFx-O8MLiRI6ZF1Qohc,558
-nystrom_ncut/ncut_pytorch.py,sha256=8LfznDwhq-WL_vQxbFBFLSzymg9SEDti_zzf9QQLnrA,11651
-nystrom_ncut/nystrom.py,sha256=Jo-P-2vnYk8yEZinGZnN3jHMiiB5AueoaLAYK4OmRqE,8604
-nystrom_ncut/propagation_utils.py,sha256=pigecB0rAmlbCoMNb8zhCyyNwh3QzkxXEnaBsDRE_ns,12136
-nystrom_ncut/visualize_utils.py,sha256=oNaDz_Xn12g3knEZZTb-QWVN-wTrnCNE5gn9cu8Xl_U,18569
-nystrom_ncut-0.0.3.dist-info/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-nystrom_ncut-0.0.3.dist-info/METADATA,sha256=yh1pDFHUL2Z4WPVnuQyeHjgSEokUtpB6OPzPMxEClsM,6058
-nystrom_ncut-0.0.3.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-nystrom_ncut-0.0.3.dist-info/top_level.txt,sha256=j7g_j0S048EvguFFnGgD5Ewd3r2H6klsxd5A4dd-wHw,13
-nystrom_ncut-0.0.3.dist-info/RECORD,,