From 838214041e34a0aaa6eb7c37fa81a5d4dd3d82df Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 3 Aug 2023 10:18:28 +0200
Subject: [PATCH] [models.config] Make preset configurations location
 independent

---
 src/ptbench/configs/models/__init__.py                        | 0
 src/ptbench/{configs => models/config}/__init__.py            | 0
 src/ptbench/{configs/models => models/config}/alexnet.py      | 4 ++--
 .../{configs/models => models/config}/alexnet_pretrained.py   | 4 ++--
 src/ptbench/{configs/models => models/config}/densenet.py     | 4 ++--
 .../{configs/models => models/config}/densenet_pretrained.py  | 4 ++--
 src/ptbench/{configs/models => models/config}/densenet_rs.py  | 4 ++--
 .../{configs/models => models/config}/logistic_regression.py  | 2 +-
 src/ptbench/{configs/models => models/config}/pasa.py         | 4 ++--
 src/ptbench/{configs/models => models/config}/signs_to_tb.py  | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 src/ptbench/configs/models/__init__.py
 rename src/ptbench/{configs => models/config}/__init__.py (100%)
 rename src/ptbench/{configs/models => models/config}/alexnet.py (82%)
 rename src/ptbench/{configs/models => models/config}/alexnet_pretrained.py (82%)
 rename src/ptbench/{configs/models => models/config}/densenet.py (81%)
 rename src/ptbench/{configs/models => models/config}/densenet_pretrained.py (81%)
 rename src/ptbench/{configs/models => models/config}/densenet_rs.py (86%)
 rename src/ptbench/{configs/models => models/config}/logistic_regression.py (91%)
 rename src/ptbench/{configs/models => models/config}/pasa.py (87%)
 rename src/ptbench/{configs/models => models/config}/signs_to_tb.py (93%)

diff --git a/src/ptbench/configs/models/__init__.py b/src/ptbench/configs/models/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ptbench/configs/__init__.py b/src/ptbench/models/config/__init__.py
similarity index 100%
rename from src/ptbench/configs/__init__.py
rename to src/ptbench/models/config/__init__.py
diff --git a/src/ptbench/configs/models/alexnet.py b/src/ptbench/models/config/alexnet.py
similarity index 82%
rename from src/ptbench/configs/models/alexnet.py
rename to src/ptbench/models/config/alexnet.py
index 8de265c5..7dddc4c7 100644
--- a/src/ptbench/configs/models/alexnet.py
+++ b/src/ptbench/models/config/alexnet.py
@@ -6,8 +6,8 @@
 from torch.nn import BCEWithLogitsLoss
 from torch.optim import SGD
 
-from ...data.augmentations import ElasticDeformation
-from ...models.alexnet import Alexnet
+from ptbench.data.augmentations import ElasticDeformation
+from ptbench.models.alexnet import Alexnet
 
 model = Alexnet(
     train_loss=BCEWithLogitsLoss(),
diff --git a/src/ptbench/configs/models/alexnet_pretrained.py b/src/ptbench/models/config/alexnet_pretrained.py
similarity index 82%
rename from src/ptbench/configs/models/alexnet_pretrained.py
rename to src/ptbench/models/config/alexnet_pretrained.py
index b6db6c59..fb9ae5b5 100644
--- a/src/ptbench/configs/models/alexnet_pretrained.py
+++ b/src/ptbench/models/config/alexnet_pretrained.py
@@ -6,8 +6,8 @@
 from torch.nn import BCEWithLogitsLoss
 from torch.optim import SGD
 
-from ...data.augmentations import ElasticDeformation
-from ...models.alexnet import Alexnet
+from ptbench.data.augmentations import ElasticDeformation
+from ptbench.models.alexnet import Alexnet
 
 model = Alexnet(
     train_loss=BCEWithLogitsLoss(),
diff --git a/src/ptbench/configs/models/densenet.py b/src/ptbench/models/config/densenet.py
similarity index 81%
rename from src/ptbench/configs/models/densenet.py
rename to src/ptbench/models/config/densenet.py
index cce44a25..3cece962 100644
--- a/src/ptbench/configs/models/densenet.py
+++ b/src/ptbench/models/config/densenet.py
@@ -6,8 +6,8 @@
 from torch.nn import BCEWithLogitsLoss
 from torch.optim import Adam
 
-from ...data.augmentations import ElasticDeformation
-from ...models.densenet import Densenet
+from ptbench.data.augmentations import ElasticDeformation
+from ptbench.models.densenet import Densenet
 
 model = Densenet(
     train_loss=BCEWithLogitsLoss(),
diff --git a/src/ptbench/configs/models/densenet_pretrained.py b/src/ptbench/models/config/densenet_pretrained.py
similarity index 81%
rename from src/ptbench/configs/models/densenet_pretrained.py
rename to src/ptbench/models/config/densenet_pretrained.py
index 9e32807e..949b1e9e 100644
--- a/src/ptbench/configs/models/densenet_pretrained.py
+++ b/src/ptbench/models/config/densenet_pretrained.py
@@ -6,8 +6,8 @@
 from torch.nn import BCEWithLogitsLoss
 from torch.optim import Adam
 
-from ...data.augmentations import ElasticDeformation
-from ...models.densenet import Densenet
+from ptbench.data.augmentations import ElasticDeformation
+from ptbench.models.densenet import Densenet
 
 model = Densenet(
     train_loss=BCEWithLogitsLoss(),
diff --git a/src/ptbench/configs/models/densenet_rs.py b/src/ptbench/models/config/densenet_rs.py
similarity index 86%
rename from src/ptbench/configs/models/densenet_rs.py
rename to src/ptbench/models/config/densenet_rs.py
index 18b93f0a..57d23f43 100644
--- a/src/ptbench/configs/models/densenet_rs.py
+++ b/src/ptbench/models/config/densenet_rs.py
@@ -10,8 +10,8 @@ CXR-14 label format (ie. 14 outputs).
 from torch.nn import BCEWithLogitsLoss
 from torch.optim import Adam
 
-from ...data.augmentations import ElasticDeformation
-from ...models.densenet import Densenet
+from ptbench.data.augmentations import ElasticDeformation
+from ptbench.models.densenet import Densenet
 
 model = Densenet(
     train_loss=BCEWithLogitsLoss(),
diff --git a/src/ptbench/configs/models/logistic_regression.py b/src/ptbench/models/config/logistic_regression.py
similarity index 91%
rename from src/ptbench/configs/models/logistic_regression.py
rename to src/ptbench/models/config/logistic_regression.py
index dab855aa..49678bcb 100644
--- a/src/ptbench/configs/models/logistic_regression.py
+++ b/src/ptbench/models/config/logistic_regression.py
@@ -9,7 +9,7 @@ predicting tuberculosis presence in output.
 from torch import empty
 from torch.nn import BCEWithLogitsLoss
 
-from ...models.logistic_regression import LogisticRegression
+from ptbench.models.logistic_regression import LogisticRegression
 
 # config
 optimizer_configs = {"lr": 1e-2}
diff --git a/src/ptbench/configs/models/pasa.py b/src/ptbench/models/config/pasa.py
similarity index 87%
rename from src/ptbench/configs/models/pasa.py
rename to src/ptbench/models/config/pasa.py
index 22e664a2..12775592 100644
--- a/src/ptbench/configs/models/pasa.py
+++ b/src/ptbench/models/config/pasa.py
@@ -13,8 +13,8 @@ Reference: [PASA-2019]_
 from torch.nn import BCEWithLogitsLoss
 from torch.optim import Adam
 
-from ...data.augmentations import ElasticDeformation
-from ...models.pasa import Pasa
+from ptbench.data.augmentations import ElasticDeformation
+from ptbench.models.pasa import Pasa
 
 model = Pasa(
     train_loss=BCEWithLogitsLoss(),
diff --git a/src/ptbench/configs/models/signs_to_tb.py b/src/ptbench/models/config/signs_to_tb.py
similarity index 93%
rename from src/ptbench/configs/models/signs_to_tb.py
rename to src/ptbench/models/config/signs_to_tb.py
index acec64f3..21bc79e2 100644
--- a/src/ptbench/configs/models/signs_to_tb.py
+++ b/src/ptbench/models/config/signs_to_tb.py
@@ -10,7 +10,7 @@ predicting tuberculosis presence in output.
 from torch import empty
 from torch.nn import BCEWithLogitsLoss
 
-from ...models.signs_to_tb import SignsToTB
+from ptbench.models.signs_to_tb import SignsToTB
 
 # config
 optimizer_configs = {"lr": 1e-2}
-- 
GitLab