homa 0.0.18__tar.gz → 0.1.1__tar.gz

{homa-0.0.18 → homa-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homa
-Version: 0.0.18
+Version: 0.1.1
 Summary: A curated list of machine learning and deep learning helpers.
 Author-email: Taha Shieenavaz <tahashieenavaz@gmail.com>
 Requires-Python: >=3.7

{homa-0.0.18 → homa-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "homa"
-version = "0.0.18"
+version = "0.1.1"
 description = "A curated list of machine learning and deep learning helpers."
 authors = [
   { name="Taha Shieenavaz", email="tahashieenavaz@gmail.com" },

{homa-0.0.18 → homa-0.1.1}/src/homa/vision/Resnet.py

@@ -1,18 +1,12 @@
 import torch
 from .modules import ResnetModule
 from .Model import Model
+from .concerns import Trainable
 
 
-class Resnet(Model):
+class Resnet(Model, Trainable):
     def __init__(self, num_classes: int, lr: float):
         super().__init__()
         self.network = ResnetModule(num_classes)
-        self.optimizer = torch.optim.SGD(self.network.parameters(), lr=lr, momentum=0.9)
         self.criterion = torch.nn.CrossEntropyLoss()
-
-    def train(self, x: torch.Tensor, y: torch.Tensor):
-        self.network.train()
-        self.optimizer.zero_grad()
-        loss = self.criterion(x, y)
-        loss.backward()
-        self.optimizer.step()
+        self.optimizer = torch.optim.SGD(self.network.parameters(), lr=lr, momentum=0.9)

homa-0.1.1/src/homa/vision/concerns/Trainable.py

@@ -0,0 +1,26 @@
+from torch import Tensor
+from torch.utils.data.dataloader import DataLoader
+from ...device import get_device
+
+
+class Trainable:
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    def train(self, x: Tensor | DataLoader, y: Tensor | None = None):
+        if y is None and isinstance(x, DataLoader):
+            self.train_dataloader(x)
+            return
+        self.train_tensors(x, y)
+
+    def train_tensors(self, x: Tensor, y: Tensor):
+        self.network.train()
+        self.optimizer.zero_grad()
+        loss = self.criterion(y, self.network(x).float())
+        loss.backward()
+        self.optimizer.step()
+
+    def train_dataloader(self, dataloader: DataLoader):
+        for x, y in dataloader:
+            x, y = x.to(get_device()), y.to(get_device())
+            self.train_tensors(x, y)

homa-0.1.1/src/homa/vision/concerns/__init__.py

@@ -0,0 +1 @@
+from .Trainable import Trainable

{homa-0.0.18 → homa-0.1.1}/src/homa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homa
-Version: 0.0.18
+Version: 0.1.1
 Summary: A curated list of machine learning and deep learning helpers.
 Author-email: Taha Shieenavaz <tahashieenavaz@gmail.com>
 Requires-Python: >=3.7

{homa-0.0.18 → homa-0.1.1}/src/homa.egg-info/SOURCES.txt

@@ -47,6 +47,8 @@ src/homa/vision/Resnet.py
 src/homa/vision/StochasticResnet.py
 src/homa/vision/__init__.py
 src/homa/vision/utils.py
+src/homa/vision/concerns/Trainable.py
+src/homa/vision/concerns/__init__.py
 src/homa/vision/modules/ResnetModule.py
 src/homa/vision/modules/StochasticResnetModule.py
 src/homa/vision/modules/__init__.py

{homa-0.0.18 → homa-0.1.1}/tests/test_ensemble.py

@@ -1,6 +1,6 @@
 import pytest
 from homa.ensemble import Ensemble
-from homa.models import Resnet
+from homa.vision import Resnet
 
 
 @pytest.fixture

{homa-0.0.18 → homa-0.1.1}/tests/test_resnet.py

@@ -1,7 +1,7 @@
 import pytest
 import torch
-from homa.models import Resnet, Model
-from homa.models.modules import ResnetModule
+from homa.vision import Resnet, Model
+from homa.vision.modules import ResnetModule
 
 
 @pytest.fixture

{homa-0.0.18 → homa-0.1.1}/tests/test_stochastic_resnet.py

@@ -1,7 +1,7 @@
 import pytest
 import torch
-from homa.models import StochasticResnet, Model
-from homa.models.modules import ResnetModule
+from homa.vision import StochasticResnet, Model
+from homa.vision.modules import ResnetModule
 
 
 @pytest.fixture