From 1954064a54d587a8ec93b20a0429221334ab472a Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Tue, 2 Jun 2026 08:55:16 +0200 Subject: [PATCH] =?UTF-8?q?[refactor]=20move=20rbm.model=20=E2=86=92=20mod?= =?UTF-8?q?el.model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 --- cifar_test.ipynb | 2 +- cifar_test_sub_image.ipynb | 2 +- mnist_test.ipynb | 2 +- mnist_test_sub_image.ipynb | 2 +- pyproject.toml | 2 +- src/label/label.py | 2 +- src/model/__init__.py | 0 src/{rbm => model}/model.py | 8 ++++---- src/tests/test_binary_autoencoder.py | 2 +- src/tests/test_deep_norbs.py | 2 +- src/tests/test_faces_sub_image.py | 2 +- src/tests/test_gaussian_autoencoder.py | 2 +- src/tests/test_learn_encoded_labels.py | 2 +- src/tests/test_learn_norbs_labels.py | 2 +- src/tests/test_linear.py | 2 +- src/tests/test_model.py | 2 +- src/tests/test_norbs.py | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 src/model/__init__.py rename src/{rbm => model}/model.py (91%) diff --git a/cifar_test.ipynb b/cifar_test.ipynb index 9a88b9e..0a682e8 100644 --- a/cifar_test.ipynb +++ b/cifar_test.ipynb @@ -23,7 +23,7 @@ "import torchvision\n", "import torchvision.transforms as transforms\n", "import matplotlib.pyplot as plt\n", - "from rbm.model import Model\n", + "from model.model import Model\n", "from rbm.entity import Entity, EntityParams, TrainingParams\n", "from rbm.matrix import Mat, np, rms_error_accu, sample_gaussian\n", "from compat.torch import Optimizer\n", diff --git a/cifar_test_sub_image.ipynb b/cifar_test_sub_image.ipynb index eb23358..aff3a70 100644 --- a/cifar_test_sub_image.ipynb +++ b/cifar_test_sub_image.ipynb @@ -29,7 +29,7 @@ "import torchvision\n", "import torchvision.transforms as transforms\n", "import matplotlib.pyplot as plt\n", - "from rbm.model import Model\n", + "from model.model import Model\n", "from rbm.entity import Entity, EntityParams, TrainingParams\n", "from rbm.matrix import Mat, np, rms_error_accu, sample_gaussian\n", "from compat.torch import Optimizer\n", diff --git a/mnist_test.ipynb b/mnist_test.ipynb index a4c4487..ef6df20 100644 --- a/mnist_test.ipynb +++ b/mnist_test.ipynb @@ -21,7 +21,7 @@ "import torchvision\n", "import torchvision.transforms as transforms\n", "import matplotlib.pyplot as plt\n", - "from rbm.model import Model\n", + "from model.model import Model\n", "from rbm.entity import Entity, EntityParams, TrainingParams\n", "from rbm.matrix import Mat, np, rms_error_accu\n", "from compat.torch import Optimizer\n", diff --git a/mnist_test_sub_image.ipynb b/mnist_test_sub_image.ipynb index 122a0a0..4f6e83d 100644 --- a/mnist_test_sub_image.ipynb +++ b/mnist_test_sub_image.ipynb @@ -23,7 +23,7 @@ "import torchvision\n", "import torchvision.transforms as transforms\n", "import matplotlib.pyplot as plt\n", - "from rbm.model import Model\n", + "from model.model import Model\n", "from rbm.entity import Entity, EntityParams, TrainingParams\n", "from rbm.matrix import Mat, np, rms_error_accu\n", "from compat.torch import Optimizer\n", diff --git a/pyproject.toml b/pyproject.toml index 2ddd238..9bbab16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,4 +21,4 @@ readme = "README.md" [tool.setuptools] package-dir = {"" = "src"} -packages = ["rbm", "image", "stack", "label", "compat"] +packages = ["rbm", "image", "stack", "label", "compat", "model"] diff --git a/src/label/label.py b/src/label/label.py index 4868924..2c07234 100644 --- a/src/label/label.py +++ b/src/label/label.py @@ -1,5 +1,5 @@ from rbm.matrix import Mat, np -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams import math diff --git a/src/model/__init__.py b/src/model/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/rbm/model.py b/src/model/model.py similarity index 91% rename from src/rbm/model.py rename to src/model/model.py index e8bfd5b..6e43f6d 100644 --- a/src/rbm/model.py +++ b/src/model/model.py @@ -1,10 +1,10 @@ import os from abc import ABC, abstractmethod -from .entity import Entity -from .train import train -from .matrix import Mat, np -from .status import Status +from rbm.entity import Entity +from rbm.train import train +from rbm.matrix import Mat, np +from rbm.status import Status class Model(ABC): known_classes = [Entity] diff --git a/src/tests/test_binary_autoencoder.py b/src/tests/test_binary_autoencoder.py index 079b999..ba16b70 100644 --- a/src/tests/test_binary_autoencoder.py +++ b/src/tests/test_binary_autoencoder.py @@ -1,7 +1,7 @@ import random import matplotlib.pyplot as plt -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams from rbm.matrix import Mat, np diff --git a/src/tests/test_deep_norbs.py b/src/tests/test_deep_norbs.py index ea37de6..ac1596e 100644 --- a/src/tests/test_deep_norbs.py +++ b/src/tests/test_deep_norbs.py @@ -1,7 +1,7 @@ import os import matplotlib.pyplot as plt -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams from rbm.matrix import Mat, np, read_armadillo diff --git a/src/tests/test_faces_sub_image.py b/src/tests/test_faces_sub_image.py index 93e0b2a..bfff181 100644 --- a/src/tests/test_faces_sub_image.py +++ b/src/tests/test_faces_sub_image.py @@ -3,7 +3,7 @@ import numpy import cv2 import matplotlib.pyplot as plt -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams from image.sub_image import SubImageExtract, normalize from rbm.matrix import Mat, np, convert diff --git a/src/tests/test_gaussian_autoencoder.py b/src/tests/test_gaussian_autoencoder.py index 12dc57a..b604f7f 100644 --- a/src/tests/test_gaussian_autoencoder.py +++ b/src/tests/test_gaussian_autoencoder.py @@ -1,7 +1,7 @@ import random import matplotlib.pyplot as plt -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams from image.sub_image import normalize from rbm.matrix import Mat, np diff --git a/src/tests/test_learn_encoded_labels.py b/src/tests/test_learn_encoded_labels.py index 5e6f598..d038460 100644 --- a/src/tests/test_learn_encoded_labels.py +++ b/src/tests/test_learn_encoded_labels.py @@ -1,7 +1,7 @@ import matplotlib.pyplot as plt -from rbm.model import Model +from model.model import Model from label.label import Label from rbm.entity import Entity, EntityParams, TrainingParams from rbm.matrix import Mat, np diff --git a/src/tests/test_learn_norbs_labels.py b/src/tests/test_learn_norbs_labels.py index ac0cc33..173874b 100644 --- a/src/tests/test_learn_norbs_labels.py +++ b/src/tests/test_learn_norbs_labels.py @@ -1,6 +1,6 @@ import os import matplotlib.pyplot as plt -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams from rbm.matrix import Mat, np, read_armadillo from rbm.train import train, Status diff --git a/src/tests/test_linear.py b/src/tests/test_linear.py index 777e3be..5504479 100644 --- a/src/tests/test_linear.py +++ b/src/tests/test_linear.py @@ -1,6 +1,6 @@ from rbm.matrix import Mat, np from rbm.entity import Entity, EntityParams, TrainingParams -from rbm.model import Model +from model.model import Model from image.sub_image import normalize WORK_DIR = "../../results" diff --git a/src/tests/test_model.py b/src/tests/test_model.py index 188a0e4..bb0594d 100644 --- a/src/tests/test_model.py +++ b/src/tests/test_model.py @@ -1,4 +1,4 @@ -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams from rbm.matrix import Mat, np diff --git a/src/tests/test_norbs.py b/src/tests/test_norbs.py index 911c17e..bac1b3e 100644 --- a/src/tests/test_norbs.py +++ b/src/tests/test_norbs.py @@ -1,7 +1,7 @@ import os import matplotlib.pyplot as plt -from rbm.model import Model +from model.model import Model from rbm.entity import Entity, EntityParams, TrainingParams from rbm.matrix import Mat, np, read_armadillo