Skip to content
Snippets Groups Projects
Commit 33a2d164 authored by leufen1's avatar leufen1
Browse files

corrected activation

parent bae9ec83
Branches
Tags
7 merge requests!319add all changes of dev into release v1.4.0 branch,!318Resolve "release v1.4.0",!283Merge latest develop into falcos issue,!264Merge develop into felix_issue287_tech-wrf-datahandler-should-inherit-from-singlestationdatahandler,!259Draft: Resolve "WRF-Datahandler should inherit from SingleStationDatahandler",!258Lukas issue284 feat create fcn model class,!255Resolve "create FCN model class"
Pipeline #61143 failed
__author__ = "Lukas Leufen" __author__ = "Lukas Leufen"
__date__ = '2021-02-' __date__ = '2021-02-'
from functools import reduce from functools import reduce, partial
from mlair.model_modules import AbstractModelClass from mlair.model_modules import AbstractModelClass
from mlair.helpers import select_from_dict from mlair.helpers import select_from_dict
...@@ -62,8 +62,8 @@ class FCN(AbstractModelClass): ...@@ -62,8 +62,8 @@ class FCN(AbstractModelClass):
on the window_lead_time parameter. on the window_lead_time parameter.
""" """
_activation = {"relu": keras.layers.ReLU(), "tanh": keras.layers.Activation("tanh"), _activation = {"relu": keras.layers.ReLU, "tanh": partial(keras.layers.Activation, "tanh"),
"sigmoid": keras.layers.Activation("sigmoid")} "sigmoid": partial(keras.layers.Activation, "sigmoid")}
_optimizer = {"adam": keras.optimizers.adam, "sgd": keras.optimizers.SGD} _optimizer = {"adam": keras.optimizers.adam, "sgd": keras.optimizers.SGD}
_requirements = ["lr", "beta_1", "beta_2", "epsilon", "decay", "amsgrad", "momentum", "nesterov"] _requirements = ["lr", "beta_1", "beta_2", "epsilon", "decay", "amsgrad", "momentum", "nesterov"]
...@@ -125,9 +125,9 @@ class FCN(AbstractModelClass): ...@@ -125,9 +125,9 @@ class FCN(AbstractModelClass):
n_layer, n_hidden = self.layer_configuration n_layer, n_hidden = self.layer_configuration
for layer in range(n_layer): for layer in range(n_layer):
x_in = keras.layers.Dense(n_hidden)(x_in) x_in = keras.layers.Dense(n_hidden)(x_in)
x_in = self.activation(x_in) x_in = self.activation()(x_in)
x_in = keras.layers.Dense(self._output_shape)(x_in) x_in = keras.layers.Dense(self._output_shape)(x_in)
out = self.activation(x_in) out = self.activation()(x_in)
self.model = keras.Model(inputs=x_input, outputs=[out]) self.model = keras.Model(inputs=x_input, outputs=[out])
def set_compile_options(self): def set_compile_options(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment