diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 72993d8..bb0d2ea 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -3,10 +3,10 @@ name: Format on: push: paths: - - 'utils/**' + - 'CollaborativeCoding/**' pull_request: paths: - - 'utils/**' + - 'CollaborativeCoding/**' jobs: format: @@ -28,8 +28,8 @@ jobs: - name: Run Ruff check run: | - ruff check utils/ + ruff check CollaborativeCoding/ - name: Run isort check run: | - isort --check-only utils/ + isort --check-only CollaborativeCoding/ diff --git a/utils/__init__.py b/CollaborativeCoding/__init__.py similarity index 100% rename from utils/__init__.py rename to CollaborativeCoding/__init__.py diff --git a/utils/arg_parser.py b/CollaborativeCoding/arg_parser.py similarity index 100% rename from utils/arg_parser.py rename to CollaborativeCoding/arg_parser.py diff --git a/utils/createfolders.py b/CollaborativeCoding/createfolders.py similarity index 100% rename from utils/createfolders.py rename to CollaborativeCoding/createfolders.py diff --git a/utils/dataloaders/__init__.py b/CollaborativeCoding/dataloaders/__init__.py similarity index 100% rename from utils/dataloaders/__init__.py rename to CollaborativeCoding/dataloaders/__init__.py diff --git a/utils/dataloaders/datasources.py b/CollaborativeCoding/dataloaders/datasources.py similarity index 100% rename from utils/dataloaders/datasources.py rename to CollaborativeCoding/dataloaders/datasources.py diff --git a/utils/dataloaders/download.py b/CollaborativeCoding/dataloaders/download.py similarity index 100% rename from utils/dataloaders/download.py rename to CollaborativeCoding/dataloaders/download.py diff --git a/utils/dataloaders/mnist_0_3.py b/CollaborativeCoding/dataloaders/mnist_0_3.py similarity index 100% rename from utils/dataloaders/mnist_0_3.py rename to CollaborativeCoding/dataloaders/mnist_0_3.py diff --git a/utils/dataloaders/mnist_4_9.py b/CollaborativeCoding/dataloaders/mnist_4_9.py similarity index 100% rename from utils/dataloaders/mnist_4_9.py rename to CollaborativeCoding/dataloaders/mnist_4_9.py diff --git a/utils/dataloaders/svhn.py b/CollaborativeCoding/dataloaders/svhn.py similarity index 100% rename from utils/dataloaders/svhn.py rename to CollaborativeCoding/dataloaders/svhn.py diff --git a/utils/dataloaders/usps_0_6.py b/CollaborativeCoding/dataloaders/usps_0_6.py similarity index 100% rename from utils/dataloaders/usps_0_6.py rename to CollaborativeCoding/dataloaders/usps_0_6.py diff --git a/utils/dataloaders/uspsh5_7_9.py b/CollaborativeCoding/dataloaders/uspsh5_7_9.py similarity index 100% rename from utils/dataloaders/uspsh5_7_9.py rename to CollaborativeCoding/dataloaders/uspsh5_7_9.py diff --git a/utils/load_data.py b/CollaborativeCoding/load_data.py similarity index 100% rename from utils/load_data.py rename to CollaborativeCoding/load_data.py diff --git a/utils/load_metric.py b/CollaborativeCoding/load_metric.py similarity index 98% rename from utils/load_metric.py rename to CollaborativeCoding/load_metric.py index 48ecb28..11e091b 100644 --- a/utils/load_metric.py +++ b/CollaborativeCoding/load_metric.py @@ -31,7 +31,7 @@ class MetricWrapper(nn.Module): Resets the state of all metric computations. Examples -------- - >>> from utils import MetricWrapperProposed + >>> from CollaborativeCoding import MetricWrapperProposed >>> metrics = MetricWrapperProposed(2, "entropy", "f1", "precision") >>> y_true = [0, 1, 0, 1] >>> y_pred = [0, 1, 1, 0] diff --git a/utils/load_model.py b/CollaborativeCoding/load_model.py similarity index 100% rename from utils/load_model.py rename to CollaborativeCoding/load_model.py diff --git a/utils/metrics/EntropyPred.py b/CollaborativeCoding/metrics/EntropyPred.py similarity index 100% rename from utils/metrics/EntropyPred.py rename to CollaborativeCoding/metrics/EntropyPred.py diff --git a/utils/metrics/F1.py b/CollaborativeCoding/metrics/F1.py similarity index 100% rename from utils/metrics/F1.py rename to CollaborativeCoding/metrics/F1.py diff --git a/utils/metrics/__init__.py b/CollaborativeCoding/metrics/__init__.py similarity index 100% rename from utils/metrics/__init__.py rename to CollaborativeCoding/metrics/__init__.py diff --git a/utils/metrics/accuracy.py b/CollaborativeCoding/metrics/accuracy.py similarity index 100% rename from utils/metrics/accuracy.py rename to CollaborativeCoding/metrics/accuracy.py diff --git a/utils/metrics/precision.py b/CollaborativeCoding/metrics/precision.py similarity index 100% rename from utils/metrics/precision.py rename to CollaborativeCoding/metrics/precision.py diff --git a/utils/metrics/recall.py b/CollaborativeCoding/metrics/recall.py similarity index 100% rename from utils/metrics/recall.py rename to CollaborativeCoding/metrics/recall.py diff --git a/utils/models/__init__.py b/CollaborativeCoding/models/__init__.py similarity index 100% rename from utils/models/__init__.py rename to CollaborativeCoding/models/__init__.py diff --git a/utils/models/christian_model.py b/CollaborativeCoding/models/christian_model.py similarity index 100% rename from utils/models/christian_model.py rename to CollaborativeCoding/models/christian_model.py diff --git a/utils/models/jan_model.py b/CollaborativeCoding/models/jan_model.py similarity index 100% rename from utils/models/jan_model.py rename to CollaborativeCoding/models/jan_model.py diff --git a/utils/models/johan_model.py b/CollaborativeCoding/models/johan_model.py similarity index 100% rename from utils/models/johan_model.py rename to CollaborativeCoding/models/johan_model.py diff --git a/utils/models/magnus_model.py b/CollaborativeCoding/models/magnus_model.py similarity index 100% rename from utils/models/magnus_model.py rename to CollaborativeCoding/models/magnus_model.py diff --git a/utils/models/solveig_model.py b/CollaborativeCoding/models/solveig_model.py similarity index 100% rename from utils/models/solveig_model.py rename to CollaborativeCoding/models/solveig_model.py diff --git a/doc/conf.py b/doc/conf.py index 964b138..32ac3c2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -11,7 +11,7 @@ ] # search this directory for Python files -autoapi_dirs = ["../utils"] +autoapi_dirs = ["../CollaborativeCoding"] myst_enable_extensions = [ "colon_fence", # ::: can be used instead of ``` for better rendering diff --git a/main.py b/main.py index c6230eb..ba37479 100644 --- a/main.py +++ b/main.py @@ -5,9 +5,14 @@ from torch.utils.data import DataLoader from torchvision import transforms from tqdm import tqdm -from wandb_api import WANDB_API -from utils import MetricWrapper, createfolders, get_args, load_data, load_model +from CollaborativeCoding import ( + MetricWrapper, + createfolders, + get_args, + load_data, + load_model, +) def main(): diff --git a/tests/test_createfolders.py b/tests/test_createfolders.py index 2db90aa..ee3d551 100644 --- a/tests/test_createfolders.py +++ b/tests/test_createfolders.py @@ -1,4 +1,4 @@ -from utils import createfolders +from CollaborativeCoding import createfolders def test_createfolders(): diff --git a/tests/test_dataloaders.py b/tests/test_dataloaders.py index a0c1bf6..b0fa78d 100644 --- a/tests/test_dataloaders.py +++ b/tests/test_dataloaders.py @@ -6,8 +6,12 @@ from PIL import Image from torchvision import transforms -from utils.dataloaders import MNISTDataset0_3, USPSDataset0_6, USPSH5_Digit_7_9_Dataset -from utils.load_data import load_data +from CollaborativeCoding.dataloaders import ( + MNISTDataset0_3, + USPSDataset0_6, + USPSH5_Digit_7_9_Dataset, +) +from CollaborativeCoding.load_data import load_data @pytest.mark.parametrize( diff --git a/tests/test_metrics.py b/tests/test_metrics.py index f4d7323..b747a1c 100644 --- a/tests/test_metrics.py +++ b/tests/test_metrics.py @@ -2,8 +2,8 @@ import pytest -from utils.load_metric import MetricWrapper -from utils.metrics import Accuracy, F1Score, Precision, Recall +from CollaborativeCoding.load_metric import MetricWrapper +from CollaborativeCoding.metrics import Accuracy, F1Score, Precision, Recall @pytest.mark.parametrize( diff --git a/tests/test_models.py b/tests/test_models.py index e94c805..0af2717 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -1,7 +1,7 @@ import pytest import torch -from utils.models import ChristianModel, JanModel, MagnusModel, SolveigModel +from CollaborativeCoding.models import ChristianModel, JanModel, MagnusModel @pytest.mark.parametrize( diff --git a/tests/test_wrappers.py b/tests/test_wrappers.py index b01a478..e2ac595 100644 --- a/tests/test_wrappers.py +++ b/tests/test_wrappers.py @@ -1,4 +1,4 @@ -from utils import load_data, load_metric, load_model +from CollaborativeCoding import load_data, load_metric, load_model # def test_load_model(): # import torch as th