[refactor] move rbm.model → model.model

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

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",

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",

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",

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",

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"]

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

src/model/model.py

@@ -1,10 +1,10 @@
 import os
 from abc import ABC, abstractmethod
 
-from .entity import Entity
+from rbm.entity import Entity
-from .train import train
+from rbm.train import train
-from .matrix import Mat, np
+from rbm.matrix import Mat, np
-from .status import Status
+from rbm.status import Status
 
 class Model(ABC):
 	known_classes = [Entity]

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
 

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
 

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

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

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

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

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"

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
 

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