Update callbacks and tests (#482)
--------- Co-authored-by: giovanni <giovanni.canali98@yahoo.it>
This commit is contained in:
committed by
Nicola Demo
parent
6ae301622b
commit
632934f9cc
@@ -37,12 +37,13 @@ class LinearWeightUpdate(Callback):
|
||||
check_consistency(self.initial_value, (float, int), subclass=False)
|
||||
check_consistency(self.target_value, (float, int), subclass=False)
|
||||
|
||||
def on_train_start(self, trainer, solver):
|
||||
def on_train_start(self, trainer, pl_module):
|
||||
"""
|
||||
Initialize the weight of the condition to the specified `initial_value`.
|
||||
|
||||
:param Trainer trainer: a pina:class:`Trainer` instance.
|
||||
:param SolverInterface solver: a pina:class:`SolverInterface` instance.
|
||||
:param Trainer trainer: A :class:`~pina.trainer.Trainer` instance.
|
||||
:param SolverInterface pl_module: A
|
||||
:class:`~pina.solver.solver.SolverInterface` instance.
|
||||
"""
|
||||
# Check that the target epoch is valid
|
||||
if not 0 < self.target_epoch <= trainer.max_epochs:
|
||||
@@ -52,7 +53,7 @@ class LinearWeightUpdate(Callback):
|
||||
)
|
||||
|
||||
# Check that the condition is a problem condition
|
||||
if self.condition_name not in solver.problem.conditions:
|
||||
if self.condition_name not in pl_module.problem.conditions:
|
||||
raise ValueError(
|
||||
f"`{self.condition_name}` must be a problem condition."
|
||||
)
|
||||
@@ -66,20 +67,21 @@ class LinearWeightUpdate(Callback):
|
||||
)
|
||||
|
||||
# Check that the weighting schema is ScalarWeighting
|
||||
if not isinstance(solver.weighting, ScalarWeighting):
|
||||
if not isinstance(pl_module.weighting, ScalarWeighting):
|
||||
raise ValueError("The weighting schema must be ScalarWeighting.")
|
||||
|
||||
# Initialize the weight of the condition
|
||||
solver.weighting.weights[self.condition_name] = self.initial_value
|
||||
pl_module.weighting.weights[self.condition_name] = self.initial_value
|
||||
|
||||
def on_train_epoch_start(self, trainer, solver):
|
||||
def on_train_epoch_start(self, trainer, pl_module):
|
||||
"""
|
||||
Adjust at each epoch the weight of the condition.
|
||||
|
||||
:param Trainer trainer: a pina:class:`Trainer` instance.
|
||||
:param SolverInterface solver: a pina:class:`SolverInterface` instance.
|
||||
:param Trainer trainer: A :class:`~pina.trainer.Trainer` instance.
|
||||
:param SolverInterface pl_module: A
|
||||
:class:`~pina.solver.solver.SolverInterface` instance.
|
||||
"""
|
||||
if 0 < trainer.current_epoch <= self.target_epoch:
|
||||
solver.weighting.weights[self.condition_name] += (
|
||||
pl_module.weighting.weights[self.condition_name] += (
|
||||
self.target_value - self.initial_value
|
||||
) / (self.target_epoch - 1)
|
||||
|
||||
Reference in New Issue
Block a user