Merge pull request #40 from marcpinet/fix-layer-loading

fix: new layers in config loading
marcpinet · May 17, 2024 · 7b24e76 · 7b24e76
2 parents bf1c510 + 490f34a
commit 7b24e76
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/neuralnetlib/layers.py b/neuralnetlib/layers.py
@@ -32,6 +32,8 @@ def from_config(config: dict) -> 'Layer':
             return Conv2D.from_config(config)
         elif config['name'] == 'MaxPooling2D':
             return MaxPooling2D.from_config(config)
+        elif config['name'] == 'AveragePooling2D':
+            return AveragePooling2D.from_config(config)
         elif config['name'] == 'Flatten':
             return Flatten.from_config(config)
         elif config['name'] == 'Dropout':
@@ -40,10 +42,14 @@ def from_config(config: dict) -> 'Layer':
             return Conv1D.from_config(config)
         elif config['name'] == 'MaxPooling1D':
             return MaxPooling1D.from_config(config)
+        elif config['name'] == 'AveragePooling1D':
+            return AveragePooling1D.from_config(config)
         elif config['name'] == 'Embedding':
             return Embedding.from_config(config)
         elif config['name'] == 'BatchNormalization':
             return BatchNormalization.from_config(config)
+        elif config['name'] == 'Permute':
+            return Permute.from_config(config)
         else:
             raise ValueError(f'Invalid layer name: {config["name"]}')
 

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='neuralnetlib',
-    version='2.5.0',
+    version='2.5.1',
     author='Marc Pinet',
     description='A simple convolutional neural network library with only numpy as dependency',
     long_description=open('README.md', encoding="utf-8").read(),