- training params are (again) attrubute of Entity
- ditched layout concept
This commit is contained in:
+5
-7
@@ -2,7 +2,7 @@ import os
|
||||
from abc import ABC, abstractmethod
|
||||
|
||||
from .entity import Entity
|
||||
from .train import train, TrainingParams, cd_jens
|
||||
from .train import train
|
||||
from .matrix import Mat, np
|
||||
from .status import Status
|
||||
|
||||
@@ -20,14 +20,12 @@ class Model(ABC):
|
||||
obj_list.append(value)
|
||||
return obj_list
|
||||
|
||||
def train(self, batch: Mat, params: TrainingParams|list[TrainingParams]):
|
||||
def train(self, batch: Mat):
|
||||
entities = self.objects(Entity)
|
||||
if isinstance(params, TrainingParams):
|
||||
params = [params]*len(entities)
|
||||
_batch = np.copy(batch)
|
||||
for entity, param in zip(entities, params):
|
||||
train(entity, _batch, param, Status())
|
||||
_batch = entity.forward(_batch, num_gibbs=param.num_gibbs_samples)
|
||||
for entity in entities:
|
||||
if train(entity, _batch, Status()):
|
||||
_batch = entity.forward(_batch)
|
||||
|
||||
@abstractmethod
|
||||
def forward(self, x: Mat) -> Mat:
|
||||
|
||||
Reference in New Issue
Block a user