Merge branch 'lukas_issue419_feat_resnet-model-class' into...

Merge branch 'lukas_issue419_feat_resnet-model-class' into 'lukas_issue421_feat_calc-number-of-samples-only-if-needed-by-model'

enable bn for layers that are not residual blocks

See merge request !477

mlair/model_modules/residual_networks.py

@@ -74,6 +74,12 @@ class BranchedInputResNet(BranchedInputCNN):
             kernel_initializer = self._initializer.get(activation_type, "glorot_uniform")
             layer_opts["kernel_initializer"] = kernel_initializer
             follow_up_layer = activation
+            if self.bn is True and layer_type.lower() != "residual_block":
+                another_layer = keras.layers.BatchNormalization
+                if activation_type in ["relu", "linear", "prelu", "leakyrelu"]:
+                    follow_up_layer = (another_layer, follow_up_layer)
+                else:
+                    follow_up_layer = (follow_up_layer, another_layer)
         regularizer_type = layer_opts.pop("kernel_regularizer", None)
         if regularizer_type is not None:
             layer_opts["kernel_regularizer"] = self._set_regularizer(regularizer_type, **self.kwargs)