From f3d79bf8bdda0d7a4b09cc354f538dd75e898bb2 Mon Sep 17 00:00:00 2001
From: Aron <aronpjansen@gmail.com>
Date: Wed, 21 Feb 2024 17:37:32 +0100
Subject: [PATCH] Uniformize naming of layers in NN

---
 n3fit/src/n3fit/backends/keras_backend/base_layers.py |  2 ++
 n3fit/src/n3fit/model_gen.py                          | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/n3fit/src/n3fit/backends/keras_backend/base_layers.py b/n3fit/src/n3fit/backends/keras_backend/base_layers.py
index 6f5044ea0c..da2d095742 100644
--- a/n3fit/src/n3fit/backends/keras_backend/base_layers.py
+++ b/n3fit/src/n3fit/backends/keras_backend/base_layers.py
@@ -197,6 +197,8 @@ def base_layer_selector(layer_name, **kwargs):
             value = custom_activations.get(value, value)
         if key in layer_args.keys():
             layer_args[key] = value
+        if key == "name":
+            layer_args[key] = value
 
     return layer_class(**layer_args)
 
diff --git a/n3fit/src/n3fit/model_gen.py b/n3fit/src/n3fit/model_gen.py
index 2cf5f9a462..7e7adc7d8e 100644
--- a/n3fit/src/n3fit/model_gen.py
+++ b/n3fit/src/n3fit/model_gen.py
@@ -73,7 +73,9 @@ def _generate_loss(self, mask=None):
         if self.invcovmat is not None:
             if self.rotation:
                 # If we have a matrix diagonal only, padd with 0s and hope it's not too heavy on memory
-                invcovmat_matrix = np.eye(self.invcovmat.shape[-1]) * self.invcovmat[..., np.newaxis]
+                invcovmat_matrix = (
+                    np.eye(self.invcovmat.shape[-1]) * self.invcovmat[..., np.newaxis]
+                )
                 if self.covmat is not None:
                     covmat_matrix = np.eye(self.covmat.shape[-1]) * self.covmat[..., np.newaxis]
                 else:
@@ -82,11 +84,7 @@ def _generate_loss(self, mask=None):
                 covmat_matrix = self.covmat
                 invcovmat_matrix = self.invcovmat
             loss = losses.LossInvcovmat(
-                invcovmat_matrix,
-                self.data,
-                mask,
-                covmat=covmat_matrix,
-                name=self.name
+                invcovmat_matrix, self.data, mask, covmat=covmat_matrix, name=self.name
             )
         elif self.positivity:
             loss = losses.LossPositivity(name=self.name, c=self.multiplier)
@@ -759,6 +757,7 @@ def layer_generator(i_layer, nodes_out, activation):
                 activation=activation,
                 is_first_layer=(i_layer == 0),
                 regularizer=reg,
+                name=f"multi_dense_{i_layer}",
             )
 
     else: