diff --git a/src/lava/lib/optimization/solvers/generic/annealing/process.py b/src/lava/lib/optimization/solvers/generic/annealing/process.py index 3b95310e..a843d760 100644 --- a/src/lava/lib/optimization/solvers/generic/annealing/process.py +++ b/src/lava/lib/optimization/solvers/generic/annealing/process.py @@ -49,8 +49,8 @@ def __init__( min_temperature: ty.Union[int, npty.NDArray], delta_temperature: ty.Union[int, npty.NDArray], steps_per_temperature: ty.Union[int, npty.NDArray], - exp_temperature: ty.Union[int, npty.NDArray] = None, - annealing_schedule: str = 'linear', + exp_temperature: ty.Union[int, npty.NDArray], + annealing_schedule: str, shape: ty.Tuple[int, ...] = (1,), ): diff --git a/src/lava/lib/optimization/solvers/generic/hierarchical_processes.py b/src/lava/lib/optimization/solvers/generic/hierarchical_processes.py index 669606c4..523d3619 100644 --- a/src/lava/lib/optimization/solvers/generic/hierarchical_processes.py +++ b/src/lava/lib/optimization/solvers/generic/hierarchical_processes.py @@ -406,8 +406,6 @@ def __init__( self.added_input = InPort(shape=shape) self.messages = OutPort(shape=shape) self.local_cost = OutPort(shape=shape) - #DELETE THIS AGAIN - print("WRONG MODEL2") self.integration = Var(shape=shape, init=0) self.temperature = Var(shape=shape, init=temperature) self.refract = Var(shape=shape, init=refract) diff --git a/src/lava/lib/optimization/solvers/generic/nebm/process.py b/src/lava/lib/optimization/solvers/generic/nebm/process.py index 78f542bf..8665a756 100644 --- a/src/lava/lib/optimization/solvers/generic/nebm/process.py +++ b/src/lava/lib/optimization/solvers/generic/nebm/process.py @@ -49,8 +49,6 @@ def __init__( self.spk_hist = Var( shape=shape, init=(np.zeros(shape=shape) + init_value).astype(int) ) - #DELETE THIS AGAIN - print("WRONG MODEL1") self.temperature = Var(shape=shape, init=int(temperature)) self.refract = Var(shape=shape, init=refract) self.refract_counter = Var(shape=shape, init=refract_counter) diff --git a/src/lava/lib/optimization/solvers/generic/solver.py b/src/lava/lib/optimization/solvers/generic/solver.py index e5824f27..1c7bab81 100644 --- a/src/lava/lib/optimization/solvers/generic/solver.py +++ b/src/lava/lib/optimization/solvers/generic/solver.py @@ -469,7 +469,7 @@ def _get_run_config( NEBMSimulatedAnnealingAbstract: NEBMSimulatedAnnealingAbstractModel, NEBMSimulatedAnnealing: NEBMSimulatedAnnealingNcModel, - Annealing:AnnealingNcModel, + Annealing: AnnealingNcModel, CostIntegrator: CostIntegratorNcModel, ProportionalIntegralNeuronsPIPGeq: NcL2ModelPI, ProjectedGradientNeuronsPIPGeq: NcL2ModelPG, diff --git a/src/lava/lib/optimization/solvers/generic/sub_process_models.py b/src/lava/lib/optimization/solvers/generic/sub_process_models.py index f17e823e..b6480c37 100644 --- a/src/lava/lib/optimization/solvers/generic/sub_process_models.py +++ b/src/lava/lib/optimization/solvers/generic/sub_process_models.py @@ -251,8 +251,6 @@ def __init__(self, proc): if neuron_model == "nebm": temperature = proc.hyperparameters.get("temperature", 1) refract = proc.hyperparameters.get("refract", 0) - # DELETE THIS AGAIN - print("WRONG MODEL3") refract_counter = proc.hyperparameters.get("refract_counter", 0) init_value = proc.hyperparameters.get( "init_value", np.zeros(shape, dtype=int) @@ -430,8 +428,6 @@ def __init__(self, proc): shape = proc.proc_params.get("shape", (1,)) temperature = proc.proc_params.get("temperature", (1,)) refract = proc.proc_params.get("refract", (1,)) - #DELETE THIS AGAIN - print("WRONG MODEL4") refract_counter = proc.proc_params.get("refract_counter", (0,)) init_value = proc.proc_params.get("init_value", np.zeros(shape)) init_state = proc.proc_params.get("init_state", np.zeros(shape))