nystrom-ncut 0.1.10__py3-none-any.whl → 0.2.1__py3-none-any.whl

nystrom_ncut/nystrom/normalized_cut.py

@@ -104,7 +104,7 @@ class NCut(OnlineNystromSubsampleFit):
         n_components: int = 100,
         affinity_focal_gamma: float = 1.0,
         distance: DistanceOptions = "cosine",
-        adaptive_scaling: bool = True,
+        adaptive_scaling: bool = False,
         sample_config: SampleConfig = SampleConfig(),
         eig_solver: EigSolverOptions = "svd_lowrank",
         chunk_size: int = 8192,

nystrom_ncut/transformer/axis_align.py

@@ -1,4 +1,3 @@
-import random
 from typing import Literal
 
 import torch
@@ -14,7 +13,7 @@ class AxisAlign(TorchTransformerMixin):
     Args:
         max_iter (int, optional): Maximum number of iterations.
     """
-    SortOptions = Literal["count", "norm"]
+    SortOptions = Literal["count", "norm", "marginal_norm"]
 
     def __init__(
         self,
@@ -33,7 +32,7 @@ class AxisAlign(TorchTransformerMixin):
 
         # Initialize R matrix with the first column from a random row of EigenVectors
         self.R = torch.empty((d, d), device=X.device)
-        self.R[0] = normalized_X[random.randint(0, n - 1)]
+        self.R[0] = normalized_X[torch.randint(0, n, (), device=X.device)]
 
         # Loop to populate R with k orthogonal directions
         c = torch.zeros((n,), device=X.device)
@@ -46,7 +45,7 @@ class AxisAlign(TorchTransformerMixin):
         for _ in range(self.max_iter):
             # Discretize the projected eigenvectors
             idx = torch.argmax(normalized_X @ self.R.mT, dim=-1)
-            M = torch.zeros((d, d)).index_add_(0, idx, normalized_X)
+            M = torch.zeros((d, d), device=X.device).index_add_(0, idx, normalized_X)
 
             # Check for convergence
             objective = torch.norm(M)
@@ -62,23 +61,30 @@ class AxisAlign(TorchTransformerMixin):
         if self.sort_method == "count":
             sort_metric = torch.bincount(idx, minlength=d)
         elif self.sort_method == "norm":
-            sort_metric = torch.linalg.norm(X @ self.R.mT, p=2, dim=0)
+            rotated_X = X @ self.R.mT
+            sort_metric = torch.linalg.norm(rotated_X, dim=0)
+        elif self.sort_method == "marginal_norm":
+            rotated_X = X @ self.R.mT
+            sort_metric = torch.zeros((d,), device=X.device).index_add_(0, idx, rotated_X[range(n), idx] ** 2)
         else:
             raise ValueError(f"Invalid sort method {self.sort_method}.")
 
         self.R = self.R[torch.argsort(sort_metric, dim=0, descending=True)]
         return self
 
-    def transform(self, X: torch.Tensor, hard: bool = False) -> torch.Tensor:
+    def transform(self, X: torch.Tensor, normalize: bool = True, hard: bool = False) -> torch.Tensor:
         """
         Args:
             X (torch.Tensor): continuous eigenvectors from NCUT, shape (n, k)
+            normalize (bool): whether to normalize input features before rotating
             hard (bool): whether to return cluster indices of input features or just the rotated features
         Returns:
             torch.Tensor: Discretized eigenvectors, shape (n, k), each row is a one-hot vector.
         """
+        if normalize:
+            X = Fn.normalize(X, p=2, dim=1)
         rotated_X = X @ self.R.mT
         return torch.argmax(rotated_X, dim=1) if hard else rotated_X
 
-    def fit_transform(self, X: torch.Tensor, hard: bool = False) -> torch.Tensor:
-        return self.fit(X).transform(X, hard=hard)
+    def fit_transform(self, X: torch.Tensor, normalize: bool = True, hard: bool = False) -> torch.Tensor:
+        return self.fit(X).transform(X, normalize=normalize, hard=hard)

{nystrom_ncut-0.1.10.dist-info → nystrom_ncut-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nystrom_ncut
-Version: 0.1.10
+Version: 0.2.1
 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.1.10.dist-info → nystrom_ncut-0.2.1.dist-info}/RECORD

@@ -6,13 +6,13 @@ nystrom_ncut/sampling_utils.py,sha256=oMmhFcd_N_D15Ht7F0rCGPSgLeitJszAKMD3ICKwHN
 nystrom_ncut/visualize_utils.py,sha256=d3VXjzJPZPPyUMg_b8hKLQoBaRWvutu6u7l36S2gmIM,23007
 nystrom_ncut/nystrom/__init__.py,sha256=lAoO00i4FG5xqGKDO_OYcSvO4qPK64x_X_hDNBvuLUc,105
 nystrom_ncut/nystrom/distance_realization.py,sha256=InajllGtRVnLVlZoipZNbHFTGHaTs3zxizKe3kI2Los,5815
-nystrom_ncut/nystrom/normalized_cut.py,sha256=5aR-CbRAWQVOA1FlQCuxSKEik9tR9sNLsJVBA7_LXyE,5905
+nystrom_ncut/nystrom/normalized_cut.py,sha256=2ocwc4U3A6GGFs0cuL0DO1yNvt59SJ3uDtj00U0foPM,5906
 nystrom_ncut/nystrom/nystrom_utils.py,sha256=5w-2GAMb7b6ArZdPEnAnKPFFrsbHSfC-S78cvrR6O20,12806
 nystrom_ncut/transformer/__init__.py,sha256=jjXjcNp3LrxeF6mqG9VY5k3asrqaY6bXzJz6wTpH78Q,105
-nystrom_ncut/transformer/axis_align.py,sha256=pX7wk4O6fj-CwRv1TYyPYXsTmmXUtQ5q0c5fDQBVE6Q,3068
+nystrom_ncut/transformer/axis_align.py,sha256=6LTR-syJ-f4pcbnMexFmFNn1QADDhH5gka6979YBRrI,3549
 nystrom_ncut/transformer/transformer_mixin.py,sha256=YAjrDWTL5Hjnk9J2OsoxvtwT2N0u8IdgMSx0rRFmZzE,1653
-nystrom_ncut-0.1.10.dist-info/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-nystrom_ncut-0.1.10.dist-info/METADATA,sha256=klm6vyp2lsQA82we85bhvK6Xz2pAPhBeJw57lYN0abA,6059
-nystrom_ncut-0.1.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nystrom_ncut-0.1.10.dist-info/top_level.txt,sha256=gM8IWWHYysIRTCvCTcdS4RShOyl9pxpylgSwPUZR2XM,22
-nystrom_ncut-0.1.10.dist-info/RECORD,,
+nystrom_ncut-0.2.1.dist-info/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+nystrom_ncut-0.2.1.dist-info/METADATA,sha256=l5t4vEFtPANsQY8PK0YHDJ1tw6dZUulU5daxX9T8QC0,6058
+nystrom_ncut-0.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+nystrom_ncut-0.2.1.dist-info/top_level.txt,sha256=gM8IWWHYysIRTCvCTcdS4RShOyl9pxpylgSwPUZR2XM,22
+nystrom_ncut-0.2.1.dist-info/RECORD,,