From ceecb2202f90fe5fb00835164343e1c9aa6cd08f Mon Sep 17 00:00:00 2001 From: seilmast Date: Thu, 13 Feb 2025 13:17:18 +0100 Subject: [PATCH 1/3] Package name --- {utils => CollaborativeCoding}/__init__.py | 0 {utils => CollaborativeCoding}/arg_parser.py | 0 {utils => CollaborativeCoding}/createfolders.py | 0 {utils => CollaborativeCoding}/dataloaders/__init__.py | 0 .../dataloaders/datasources.py | 0 {utils => CollaborativeCoding}/dataloaders/download.py | 0 {utils => CollaborativeCoding}/dataloaders/mnist_0_3.py | 0 {utils => CollaborativeCoding}/dataloaders/mnist_4_9.py | 0 {utils => CollaborativeCoding}/dataloaders/svhn.py | 0 {utils => CollaborativeCoding}/dataloaders/usps_0_6.py | 0 {utils => CollaborativeCoding}/dataloaders/uspsh5_7_9.py | 0 {utils => CollaborativeCoding}/load_data.py | 0 {utils => CollaborativeCoding}/load_metric.py | 0 {utils => CollaborativeCoding}/load_model.py | 0 {utils => CollaborativeCoding}/metrics/EntropyPred.py | 0 {utils => CollaborativeCoding}/metrics/F1.py | 0 {utils => CollaborativeCoding}/metrics/__init__.py | 0 {utils => CollaborativeCoding}/metrics/accuracy.py | 0 {utils => CollaborativeCoding}/metrics/precision.py | 0 {utils => CollaborativeCoding}/metrics/recall.py | 0 {utils => CollaborativeCoding}/models/__init__.py | 0 {utils => CollaborativeCoding}/models/christian_model.py | 0 {utils => CollaborativeCoding}/models/jan_model.py | 0 {utils => CollaborativeCoding}/models/johan_model.py | 0 {utils => CollaborativeCoding}/models/magnus_model.py | 0 {utils => CollaborativeCoding}/models/solveig_model.py | 0 main.py | 9 +++++++-- 27 files changed, 7 insertions(+), 2 deletions(-) rename {utils => CollaborativeCoding}/__init__.py (100%) rename {utils => CollaborativeCoding}/arg_parser.py (100%) rename {utils => CollaborativeCoding}/createfolders.py (100%) rename {utils => CollaborativeCoding}/dataloaders/__init__.py (100%) rename {utils => CollaborativeCoding}/dataloaders/datasources.py (100%) rename {utils => CollaborativeCoding}/dataloaders/download.py (100%) rename {utils => CollaborativeCoding}/dataloaders/mnist_0_3.py (100%) rename {utils => CollaborativeCoding}/dataloaders/mnist_4_9.py (100%) rename {utils => CollaborativeCoding}/dataloaders/svhn.py (100%) rename {utils => CollaborativeCoding}/dataloaders/usps_0_6.py (100%) rename {utils => CollaborativeCoding}/dataloaders/uspsh5_7_9.py (100%) rename {utils => CollaborativeCoding}/load_data.py (100%) rename {utils => CollaborativeCoding}/load_metric.py (100%) rename {utils => CollaborativeCoding}/load_model.py (100%) rename {utils => CollaborativeCoding}/metrics/EntropyPred.py (100%) rename {utils => CollaborativeCoding}/metrics/F1.py (100%) rename {utils => CollaborativeCoding}/metrics/__init__.py (100%) rename {utils => CollaborativeCoding}/metrics/accuracy.py (100%) rename {utils => CollaborativeCoding}/metrics/precision.py (100%) rename {utils => CollaborativeCoding}/metrics/recall.py (100%) rename {utils => CollaborativeCoding}/models/__init__.py (100%) rename {utils => CollaborativeCoding}/models/christian_model.py (100%) rename {utils => CollaborativeCoding}/models/jan_model.py (100%) rename {utils => CollaborativeCoding}/models/johan_model.py (100%) rename {utils => CollaborativeCoding}/models/magnus_model.py (100%) rename {utils => CollaborativeCoding}/models/solveig_model.py (100%) 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 100% rename from utils/load_metric.py rename to CollaborativeCoding/load_metric.py 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/main.py b/main.py index 5ec469e..0001954 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(): From d90cf35a7abc723bf1a480b7f7a877a71862b7df Mon Sep 17 00:00:00 2001 From: seilmast Date: Thu, 13 Feb 2025 13:21:06 +0100 Subject: [PATCH 2/3] test --- tests/test_createfolders.py | 2 +- tests/test_dataloaders.py | 2 +- tests/test_metrics.py | 4 ++-- tests/test_models.py | 2 +- tests/test_wrappers.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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 32634d6..814ace5 100644 --- a/tests/test_dataloaders.py +++ b/tests/test_dataloaders.py @@ -1,4 +1,4 @@ -from utils.dataloaders.usps_0_6 import USPSDataset0_6 +from CollaborativeCoding.dataloaders.usps_0_6 import USPSDataset0_6 def test_uspsdataset0_6(): 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 5266f0e..5899e2d 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 +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 From 9aaee999b3d3224a39c5c38430492c5c4753c479 Mon Sep 17 00:00:00 2001 From: seilmast Date: Thu, 13 Feb 2025 13:25:26 +0100 Subject: [PATCH 3/3] more fixes --- .github/workflows/format.yml | 8 ++++---- CollaborativeCoding/load_metric.py | 2 +- doc/conf.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) 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/CollaborativeCoding/load_metric.py b/CollaborativeCoding/load_metric.py index 48ecb28..11e091b 100644 --- a/CollaborativeCoding/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/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