commit with regression test hopefully passing before regenerating

NNPDF · Jun 6, 2024 · 2a7cd9c · 2a7cd9c
1 parent 7bb80f3
commit 2a7cd9c
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 2 deletions.
diff --git a/extra_tests/regression_fits/diagonal.yml b/extra_tests/regression_fits/diagonal.yml
@@ -34,6 +34,8 @@ mcseed: 1
 diagonal_basis: True
 
 load: "weights.weights.h5"
+sampling:
+  separate_multiplicative: True
 
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]

diff --git a/extra_tests/regression_fits/feature_scaling.yml b/extra_tests/regression_fits/feature_scaling.yml
@@ -34,6 +34,8 @@ mcseed: 1
 
 load: "weights_feature.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/flavour.yml b/extra_tests/regression_fits/flavour.yml
@@ -33,6 +33,8 @@ mcseed: 1
 
 load: "weights_flavour.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/no_csr.yml b/extra_tests/regression_fits/no_csr.yml
@@ -35,6 +35,8 @@ sum_rules: "ALLBUTCSR"
 
 save: "weights_casymm.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 9]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/no_lagrange.yml b/extra_tests/regression_fits/no_lagrange.yml
@@ -35,6 +35,8 @@ mcseed: 1
 
 load: "weights.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/no_msr.yml b/extra_tests/regression_fits/no_msr.yml
@@ -35,6 +35,8 @@ mcseed: 1
 sum_rules: "VSR"
 
 load: "weights.weights.h5"
+sampling:
+  separate_multiplicative: True
 
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]

diff --git a/extra_tests/regression_fits/no_sumrules.yml b/extra_tests/regression_fits/no_sumrules.yml
@@ -36,6 +36,8 @@ sum_rules: False
 
 load: "weights.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/no_vsr.yml b/extra_tests/regression_fits/no_vsr.yml
@@ -36,6 +36,8 @@ sum_rules: "MSR"
 
 load: "weights.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/normal_fit.yml b/extra_tests/regression_fits/normal_fit.yml
@@ -27,6 +27,8 @@ mcseed: 1
 
 save: "normal_fit.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/polarized_evol.yml b/extra_tests/regression_fits/polarized_evol.yml
@@ -32,6 +32,8 @@ mcseed: 746898422
 genrep: true
 
 load: "weights_polevol.weights.h5"
+sampling:
+  separate_multiplicative: True
 
 parameters:
   nodes_per_layer: [25, 20, 4]

diff --git a/extra_tests/regression_fits/single_dense.yml b/extra_tests/regression_fits/single_dense.yml
@@ -37,6 +37,8 @@ mcseed: 1
 save: "single_dense.weights.h5"
 load: "single_dense.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/extra_tests/regression_fits/trainable_prepro.yml b/extra_tests/regression_fits/trainable_prepro.yml
@@ -35,6 +35,8 @@ mcseed: 1
 
 load: "weights.weights.h5"
 
+sampling:
+  separate_multiplicative: True
 parameters: # This defines the parameter dictionary that is passed to the Model Trainer
   nodes_per_layer: [15, 10, 8]
   activation_per_layer: ['sigmoid', 'tanh', 'linear']

diff --git a/validphys2/src/validphys/tests/conftest.py b/validphys2/src/validphys/tests/conftest.py
@@ -76,7 +76,7 @@ def tmp(tmpdir):
 PSEUDODATA_FIT = "pseudodata_test_fit_n3fit_221130"
 
 
-base_config = dict(pdf=PDF, use_cuts='nocuts', dataset_inputs=DATA, theoryid=THEORYID, Q=10)
+base_config = dict(pdf=PDF, use_cuts='nocuts', dataset_inputs=DATA, theoryid=THEORYID, Q=10, separate_multiplicative=True)
 
 
 @pytest.fixture(scope='module')

diff --git a/validphys2/src/validphys/tests/test_overfit_metric.py b/validphys2/src/validphys/tests/test_overfit_metric.py
@@ -17,6 +17,7 @@
     "t0pdfset": {"from_": "datacuts"},
     "pdf": {"from_": "fit"},
     "dataset_inputs": {"from_": "fit"},
+    "separate_multiplicative": True
 }
 
 

diff --git a/validphys2/src/validphys/tests/test_pseudodata.py b/validphys2/src/validphys/tests/test_pseudodata.py
@@ -74,7 +74,7 @@ def test_no_savepseudodata():
 
 def test_read_matches_recreate():
     reads = API.read_fit_pseudodata(fit=PSEUDODATA_FIT)
-    recreates = API.recreate_fit_pseudodata(fit=PSEUDODATA_FIT)
+    recreates = API.recreate_fit_pseudodata(fit=PSEUDODATA_FIT, separate_multiplicative=True)
     for read, recreate in zip(reads, recreates):
         # We ignore the absolute ordering of the dataframes and just check
         # that they contain identical elements.