From d9d01581aacee7c11037b526511dec076ebeee1f Mon Sep 17 00:00:00 2001 From: Luke Peters Date: Thu, 17 Aug 2023 16:37:33 +0200 Subject: [PATCH] Fixed tests according to layer generator reworks. Fixed resBlock naming issues --- src/vgsl_model_generator.py | 10 +++++----- tests/test_model_creation.py | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/vgsl_model_generator.py b/src/vgsl_model_generator.py index 4c2fe77a..da27e64e 100644 --- a/src/vgsl_model_generator.py +++ b/src/vgsl_model_generator.py @@ -85,9 +85,9 @@ def init_model_from_string(self, vgsl_spec_string, setattr(self, f"avgpool{index}", self.avgpool_generator(layer)) self.history.append(f"avgpool{index}") elif layer.startswith('RB'): - setattr(self, f"resLrock{index}", - self.resLrock_generator(layer)) - self.history.append(f"resLrock{index}") + setattr(self, f"ResidualBlock{index}", + self.residual_block_generator(layer)) + self.history.append(f"ResidualBlock{index}") elif layer.startswith('D'): setattr(self, f"dropout{index}", self.dropout_generator(layer)) self.history.append(f"dropout{index}") @@ -316,7 +316,7 @@ def lstm_generator(self, layer): "kernel_initializer": self.initializer } - rnn_layer = layers.GRU + rnn_layer = layers.LSTM return rnn_layer(**kwargs) def gru_generator(self, layer): @@ -361,7 +361,7 @@ def bidirectional_generator(self, layer): return layers.Bidirectional(rnn_layer(**rnn_params), merge_mode='concat') - def resLrock_generator(self, layer): + def residual_block_generator(self, layer): """ Create a Residual Block with Conv2D layers and an elu BatchNorm, RB """ diff --git a/tests/test_model_creation.py b/tests/test_model_creation.py index 9dce5240..49d1996d 100644 --- a/tests/test_model_creation.py +++ b/tests/test_model_creation.py @@ -197,7 +197,7 @@ def test_fully_connected_layer(self): self.assertEqual(model.layers[5].activation, activations.softmax) def test_lstm_layer(self): - vgsl_spec_string = "None,64,None,1 Rc Lfxs128 O1s10" + vgsl_spec_string = "None,64,None,1 Rc Lfs128 O1s10" model_generator = self.VGSLModelGenerator(vgsl_spec_string) model = model_generator.build() self.assertIsInstance(model.layers[2], layers.LSTM) @@ -208,7 +208,7 @@ def test_lstm_layer(self): self.assertEqual(model.layers[2].return_sequences, True) # Check backwards LSTM with return_sequences - vgsl_spec_string = "None,64,None,1 Rc Lrx128 O1s10" + vgsl_spec_string = "None,64,None,1 Rc Lr128 O1s10" model_generator = self.VGSLModelGenerator(vgsl_spec_string) model = model_generator.build() @@ -216,7 +216,7 @@ def test_lstm_layer(self): self.assertEqual(model.layers[2].return_sequences, False) def test_gru_layer(self): - vgsl_spec_string = "None,64,None,1 Rc Gfxs128 O1s10" + vgsl_spec_string = "None,64,None,1 Rc Gfs128 O1s10" model_generator = self.VGSLModelGenerator(vgsl_spec_string) model = model_generator.build() self.assertIsInstance(model.layers[2], layers.GRU) @@ -227,7 +227,7 @@ def test_gru_layer(self): self.assertEqual(model.layers[2].return_sequences, True) # Check backwards GRU with return_sequences - vgsl_spec_string = "None,64,None,1 Rc Grx128 O1s10" + vgsl_spec_string = "None,64,None,1 Rc Gr128 O1s10" model_generator = self.VGSLModelGenerator(vgsl_spec_string) model = model_generator.build() @@ -235,14 +235,14 @@ def test_gru_layer(self): self.assertEqual(model.layers[2].return_sequences, False) def test_bidirectional_layer(self): - vgsl_spec_string = "None,64,None,1 Rc Bgxs128 O1s10" + vgsl_spec_string = "None,64,None,1 Rc Bgs128 O1s10" model_generator = self.VGSLModelGenerator(vgsl_spec_string) model = model_generator.build() self.assertIsInstance(model.layers[2], layers.Bidirectional) self.assertIsInstance(model.layers[2].layer, layers.GRU) self.assertEqual(model.layers[2].layer.units, 128) - vgsl_spec_string = "None,64,None,1 Rc Blxs128 O1s10" + vgsl_spec_string = "None,64,None,1 Rc Bls128 O1s10" model_generator = self.VGSLModelGenerator(vgsl_spec_string) model = model_generator.build() self.assertIsInstance(model.layers[2], layers.Bidirectional)