Remove SCCL from repo

viswavi · Oct 26, 2023 · 4f9637a · 4f9637a
1 parent 23647dd
commit 4f9637a
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 270 deletions.
diff --git a/README.md b/README.md
@@ -29,8 +29,8 @@ pip install active-semi-supervised-clustering
 
 ```python
 from sklearn import datasets, metrics
-from active_semi_clustering.semi_supervised.pairwise_constraints import PCKMeans
-from active_semi_clustering.active.pairwise_constraints import ExampleOracle, ExploreConsolidate, MinMax
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.pairwise_constraints import PCKMeans
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.active.pairwise_constraints import ExampleOracle, ExploreConsolidate, MinMax
 ```
 
 ```python

diff --git a/active_semi_clustering/active/pairwise_constraints/min_max_finetune.py b/active_semi_clustering/active/pairwise_constraints/min_max_finetune.py
@@ -2,7 +2,7 @@
 
 from .example_oracle import MaximumQueriesExceeded
 from .explore_consolidate import ExploreConsolidate
-from active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
 
 class MinMaxFinetune(ExploreConsolidate):
     def set_initial_clusterer(self, initial_clusterer):

diff --git a/active_semi_clustering/active/pairwise_constraints/npu.py b/active_semi_clustering/active/pairwise_constraints/npu.py
@@ -2,7 +2,7 @@
 from sklearn.ensemble import RandomForestClassifier
 
 from .example_oracle import MaximumQueriesExceeded
-from active_semi_clustering.exceptions import EmptyClustersException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException
 
 
 class NPU:

diff --git a/active_semi_clustering/semi_supervised/labeled_data/dec.py b/active_semi_clustering/semi_supervised/labeled_data/dec.py
@@ -1,6 +1,6 @@
 
-from active_semi_clustering.exceptions import EmptyClustersException
-from active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
 
 from collections import namedtuple
 import numpy as np

diff --git a/active_semi_clustering/semi_supervised/labeled_data/kmeans.py b/active_semi_clustering/semi_supervised/labeled_data/kmeans.py
@@ -1,5 +1,5 @@
 
-from active_semi_clustering.exceptions import EmptyClustersException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException
 import math
 import numpy as np
 from ortools.linear_solver import pywraplp

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/__init__.py b/active_semi_clustering/semi_supervised/pairwise_constraints/__init__.py
@@ -7,4 +7,3 @@
 from .mpckmeansmf import MPCKMeansMF
 from .mkmeans import MKMeans
 from .rcakmeans import RCAKMeans
-from .sccl import SCCL, DeepSCCL
diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/cc_pckmeans.py b/active_semi_clustering/semi_supervised/pairwise_constraints/cc_pckmeans.py
@@ -3,7 +3,7 @@
 from ortools.linear_solver import pywraplp
 import time
 
-from active_semi_clustering.semi_supervised.pairwise_constraints.pckmeans import PCKMeans
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.pairwise_constraints.pckmeans import PCKMeans
 
 import sys
 sys.path.append("cmvc")

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/constraints.py b/active_semi_clustering/semi_supervised/pairwise_constraints/constraints.py
@@ -1,6 +1,6 @@
 from tqdm import tqdm
 
-from active_semi_clustering.exceptions import InconsistentConstraintsException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import InconsistentConstraintsException
 
 # Taken from https://github.com/Behrouz-Babaki/COP-Kmeans/blob/master/copkmeans/cop_kmeans.py
 def preprocess_constraints(ml, cl, n):

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/copkmeans.py b/active_semi_clustering/semi_supervised/pairwise_constraints/copkmeans.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from active_semi_clustering.exceptions import EmptyClustersException, ClusteringNotFoundException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException, ClusteringNotFoundException
 from .constraints import preprocess_constraints
 
 

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/gptclustering.py b/active_semi_clustering/semi_supervised/pairwise_constraints/gptclustering.py
@@ -9,11 +9,11 @@
 from tqdm import tqdm
 
 
-from active_semi_clustering.exceptions import EmptyClustersException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException
 from .constraints import preprocess_constraints
-from active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
-from active_semi_clustering.semi_supervised.pairwise_constraints.pckmeans import PCKMeans
-from active_semi_clustering.semi_supervised.pairwise_constraints.gptclustering_prompts import select_keyphrase_expansion_prompt
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.pairwise_constraints.pckmeans import PCKMeans
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.pairwise_constraints.gptclustering_prompts import select_keyphrase_expansion_prompt
 from InstructorEmbedding import INSTRUCTOR
 from sentence_transformers import SentenceTransformer
 

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/kmeans_corrector.py b/active_semi_clustering/semi_supervised/pairwise_constraints/kmeans_corrector.py
@@ -5,8 +5,8 @@
 from sklearn.preprocessing import normalize
 from tqdm import tqdm
 
-from active_semi_clustering.active.pairwise_constraints import ExampleOracle
-from active_semi_clustering.active.pairwise_constraints.example_oracle import MaximumQueriesExceeded
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.active.pairwise_constraints import ExampleOracle
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.active.pairwise_constraints.example_oracle import MaximumQueriesExceeded
 
 class KMeansCorrection:
     def __init__(self, oracle, cluster_predictions, cluster_centers, labels):
@@ -179,7 +179,7 @@ def fit(self, X, num_corrections):
         print(f"Num Correct Corrections: {num_correct_corrections_made}")
 
         '''
-        from active_semi_clustering.active.pairwise_constraints import ExampleOracle
+        from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.active.pairwise_constraints import ExampleOracle
         oracle = ExampleOracle(labels, max_queries_cnt=100000)
 
         from dataloaders import load_dataset, generate_synthetic_data

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/mpckmeans.py b/active_semi_clustering/semi_supervised/pairwise_constraints/mpckmeans.py
@@ -1,8 +1,8 @@
 import numpy as np
 import scipy
 
-from active_semi_clustering.exceptions import EmptyClustersException
-from active_semi_clustering.farthest_first_traversal import weighted_farthest_first_traversal
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.farthest_first_traversal import weighted_farthest_first_traversal
 from .constraints import preprocess_constraints
 
 np.seterr('raise')

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/mpckmeansmf.py b/active_semi_clustering/semi_supervised/pairwise_constraints/mpckmeansmf.py
@@ -1,8 +1,8 @@
 import numpy as np
 import scipy
 
-from active_semi_clustering.exceptions import EmptyClustersException
-from active_semi_clustering.farthest_first_traversal import weighted_farthest_first_traversal
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.farthest_first_traversal import weighted_farthest_first_traversal
 from .constraints import preprocess_constraints
 
 

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/pckmeans.py b/active_semi_clustering/semi_supervised/pairwise_constraints/pckmeans.py
@@ -6,9 +6,9 @@
 from sklearn.metrics.pairwise import euclidean_distances
 import time
 
-from active_semi_clustering.exceptions import EmptyClustersException
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.exceptions import EmptyClustersException
 from .constraints import preprocess_constraints, preprocess_constraints_no_transitive_closure
-from active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
+from few_shot_clustering.active_semi_supervised_clustering.active_semi_clustering.semi_supervised.labeled_data.kmeans import KMeans
 
 import sys
 sys.path.append("cmvc")

diff --git a/active_semi_clustering/semi_supervised/pairwise_constraints/sccl.py b/active_semi_clustering/semi_supervised/pairwise_constraints/sccl.py