Fix Conv1D dimensions. Fix model loading. v2

.gitignore

@@ -49,3 +49,4 @@ sdist/
 target/
 var/
 venv/
+.vscode

keras_resnet/blocks/_1d.py

@@ -6,7 +6,6 @@
 
 This module implements a number of popular one-dimensional residual blocks.
 """
-
 import keras.layers
 import keras.regularizers
 

keras_resnet/layers/_batch_normalization.py

@@ -1,6 +1,4 @@
 import keras
-
-
 class BatchNormalization(keras.layers.BatchNormalization):
     """
     Identical to keras.layers.BatchNormalization, but adds the option to freeze parameters.
@@ -12,11 +10,11 @@ def __init__(self, freeze, *args, **kwargs):
         # set to non-trainable if freeze is true
         self.trainable = not self.freeze
 
-    def call(self, *args, **kwargs):
+    def call(self, inputs, *args, **kwargs):
         # Force test mode if frozen, otherwise use default behaviour (i.e., training=None).
         if self.freeze:
             kwargs['training'] = False
-        return super(BatchNormalization, self).call(*args, **kwargs)
+        return super(BatchNormalization, self).call(inputs, *args, **kwargs)
 
     def get_config(self):
         config = super(BatchNormalization, self).get_config()