Replace old dense layer everywhere

NNPDF · Jan 11, 2024 · e0fc2e1 · e0fc2e1
1 parent c23a59f
commit e0fc2e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/n3fit/src/n3fit/backends/keras_backend/base_layers.py b/n3fit/src/n3fit/backends/keras_backend/base_layers.py
@@ -122,7 +122,7 @@ def apply_dense(xinput):
 
 
 layers = {
-    "multi_dense": (
+    "dense": (
         MultiDense,
         {
             "input_shape": (1,),
@@ -134,16 +134,6 @@ def apply_dense(xinput):
             "replica_input": True,
         },
     ),
-    "dense": (
-        Dense,
-        {
-            "input_shape": (1,),
-            "kernel_initializer": "glorot_normal",
-            "units": 5,
-            "activation": "sigmoid",
-            "kernel_regularizer": None,
-        },
-    ),
     "dense_per_flavour": (
         dense_per_flavour,
         {

diff --git a/n3fit/src/n3fit/checks.py b/n3fit/src/n3fit/checks.py
@@ -111,7 +111,7 @@ def check_initializer(initializer):
 def check_layer_type_implemented(parameters):
     """Checks whether the layer_type is implemented"""
     layer_type = parameters.get("layer_type")
-    implemented_types = ["dense", "multi_dense", "dense_per_flavour"]
+    implemented_types = ["dense", "dense_per_flavour"]
     if layer_type not in implemented_types:
         raise CheckError(
             f"Layer type {layer_type} not implemented, must be one of {implemented_types}"
@@ -427,10 +427,9 @@ def check_fiatlux_pdfs_id(replicas, fiatlux):
                 f"Cannot generate a photon replica with id larger than the number of replicas of the PDFs set {luxset.name}:\nreplica id={max_id}, replicas of {luxset.name} = {pdfs_ids}"
             )
 
+
 @make_argcheck
 def check_multireplica_qed(replicas, fiatlux):
     if fiatlux is not None:
         if len(replicas) > 1:
-            raise CheckError(
-                "At the moment, running a multireplica QED fits is not allowed."
-            )
+            raise CheckError("At the moment, running a multireplica QED fits is not allowed.")
diff --git a/n3fit/src/n3fit/model_gen.py b/n3fit/src/n3fit/model_gen.py
@@ -741,7 +741,7 @@ def initializer_generator(seed, i_layer):
     # list_of_pdf_layers[d][r] is the layer at depth d for replica r
     list_of_pdf_layers = []
     for i_layer, (nodes_out, activation) in enumerate(zip(nodes_list, activations)):
-        if layer_type == "multi_dense":
+        if layer_type == "dense":
             layers = base_layer_selector(
                 layer_type,
                 replica_seeds=replica_seeds,
@@ -777,7 +777,7 @@ def initializer_generator(seed, i_layer):
         list_of_pdf_layers[-1] = [lambda x: concat(layer(x)) for layer in list_of_pdf_layers[-1]]
 
     # Apply all layers to the input to create the models
-    if layer_type == "multi_dense":
+    if layer_type == "dense":
         pdfs = x_input
         for layer in list_of_pdf_layers:
             pdfs = layer(pdfs)