chore: Remove scope_reducing module

VIDA-NYU · Jul 19, 2024 · 2c56739 · 2c56739
1 parent 0f187ab
commit 2c56739
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 31 deletions.
diff --git a/bdikit/mapping_algorithms/column_mapping/algorithms.py b/bdikit/mapping_algorithms/column_mapping/algorithms.py
@@ -11,7 +11,7 @@
 )
 from valentine.algorithms.matcher_results import MatcherResults
 from openai import OpenAI
-from bdikit.mapping_algorithms.scope_reducing._algorithms.contrastive_learning.cl_api import (
+from bdikit.models.contrastive_learning.cl_api import (
     DEFAULT_CL_MODEL,
 )
 from bdikit.mapping_algorithms.column_mapping.topk_matchers import (

diff --git a/bdikit/mapping_algorithms/column_mapping/topk_matchers.py b/bdikit/mapping_algorithms/column_mapping/topk_matchers.py
@@ -2,7 +2,7 @@
 import pandas as pd
 import numpy as np
 from sklearn.metrics.pairwise import cosine_similarity
-from bdikit.mapping_algorithms.scope_reducing._algorithms.contrastive_learning.cl_api import (
+from bdikit.models.contrastive_learning.cl_api import (
     ContrastiveLearningAPI,
     DEFAULT_CL_MODEL,
 )

diff --git a/bdikit/mapping_algorithms/scope_reducing/algorithms.py b/bdikit/mapping_algorithms/scope_reducing/algorithms.py
diff --git a/...gorithms/contrastive_learning/__init__.py → bdikit/models/__init__.py b/...gorithms/contrastive_learning/__init__.py → bdikit/models/__init__.py
diff --git a/bdikit/models/contrastive_learning/__init__.py b/bdikit/models/contrastive_learning/__init__.py
diff --git a/...algorithms/contrastive_learning/cl_api.py → bdikit/models/contrastive_learning/cl_api.py b/...algorithms/contrastive_learning/cl_api.py → bdikit/models/contrastive_learning/cl_api.py
@@ -4,10 +4,10 @@
 import numpy as np
 import pandas as pd
 import torch
-from bdikit.mapping_algorithms.scope_reducing._algorithms.contrastive_learning.cl_models import (
+from bdikit.models.contrastive_learning.cl_models import (
     BarlowTwinsSimCLR,
 )
-from bdikit.mapping_algorithms.scope_reducing._algorithms.contrastive_learning.cl_pretrained_dataset import (
+from bdikit.models.contrastive_learning.cl_pretrained_dataset import (
     PretrainTableDataset,
 )
 from sklearn.metrics.pairwise import cosine_similarity

diff --git a/...orithms/contrastive_learning/cl_models.py → .../models/contrastive_learning/cl_models.py b/...orithms/contrastive_learning/cl_models.py → .../models/contrastive_learning/cl_models.py
diff --git a/...s/contrastive_learning/cl_preprocessor.py → ...s/contrastive_learning/cl_preprocessor.py b/...s/contrastive_learning/cl_preprocessor.py → ...s/contrastive_learning/cl_preprocessor.py
diff --git a/...rastive_learning/cl_pretrained_dataset.py → ...rastive_learning/cl_pretrained_dataset.py b/...rastive_learning/cl_pretrained_dataset.py → ...rastive_learning/cl_pretrained_dataset.py
@@ -1,6 +1,6 @@
 import pandas as pd
 import torch
-from bdikit.mapping_algorithms.scope_reducing._algorithms.contrastive_learning.cl_preprocessor import (
+from bdikit.models.contrastive_learning.cl_preprocessor import (
     preprocess,
 )
 from torch.utils import data

diff --git a/bdikit/visualization/schema_matching.py b/bdikit/visualization/schema_matching.py
@@ -20,7 +20,7 @@
     TopkColumnMatcher,
     TopkMatching,
 )
-from bdikit.mapping_algorithms.scope_reducing._algorithms.contrastive_learning.cl_api import (
+from bdikit.models.contrastive_learning.cl_api import (
     DEFAULT_CL_MODEL,
 )
 from bdikit.utils import get_gdc_layered_metadata, read_gdc_schema