diff --git a/src/ptbench/configs/models/__init__.py b/src/ptbench/configs/models/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 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 8de265c568da58295a1de7e89c9205a20e90f9e0..7dddc4c795a75254d3bd4770722b55381775347f 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 b6db6c5941aa2d50baf90dc414ea93042c570307..fb9ae5b5a4bfd1208beb08d2f50f4c640dbf7469 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 cce44a25b4a42b35d9998eb0ef156ce0160c5dc3..3cece962081b4cbe5ed03d5ba6c2808a4e5abecc 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 9e32807e5edb9ed4c7637928192bed58231f7848..949b1e9e915bf6154c832403e677c2da9b79cc9f 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 18b93f0a7b029f38769e93558b9380916d46266f..57d23f436e2e55b6aab8c6f2de92748c0d87794b 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 dab855aaee6fa478a2e1210d559a26242ba6cfe7..49678bcb86006b93dbebc29afb4cfb639d114eb5 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 22e664a214bdf563a1d92657c0c52add875c56c1..12775592d5ee183245b36361b97d27b1a698e022 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 acec64f3115d27dc129b3a79a6e59b1d2567e15f..21bc79e23f6b234c4baac442fac61cc17e8c10b6 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}