From 08f23a1c2e1f17b6aec9391087f52c19654e4feb Mon Sep 17 00:00:00 2001 From: juacrumar Date: Fri, 26 May 2023 22:05:27 +0200 Subject: [PATCH] update regression tests --- .../src/n3fit/tests/regressions/quickcard.yml | 4 +- .../n3fit/tests/regressions/quickcard_1.json | 82 +++++++++---------- .../n3fit/tests/regressions/quickcard_2.json | 80 +++++++++--------- 3 files changed, 83 insertions(+), 83 deletions(-) diff --git a/n3fit/src/n3fit/tests/regressions/quickcard.yml b/n3fit/src/n3fit/tests/regressions/quickcard.yml index b241b8ddde..0d5538778b 100644 --- a/n3fit/src/n3fit/tests/regressions/quickcard.yml +++ b/n3fit/src/n3fit/tests/regressions/quickcard.yml @@ -52,11 +52,11 @@ parameters: # This defines the parameter dictionary that is passed to the Model optimizer_name: 'RMSprop' learning_rate: 0.00001 clipnorm: 1.0 - epochs: 1000 + epochs: 1100 positivity: multiplier: 1.05 initial: 1.5 - stopping_patience: 0.30 # percentage of the number of epochs + stopping_patience: 0.10 # percentage of the number of epochs layer_type: 'dense' dropout: 0.0 threshold_chi2: 10.0 diff --git a/n3fit/src/n3fit/tests/regressions/quickcard_1.json b/n3fit/src/n3fit/tests/regressions/quickcard_1.json index 7abec23de4..e1ab150b66 100644 --- a/n3fit/src/n3fit/tests/regressions/quickcard_1.json +++ b/n3fit/src/n3fit/tests/regressions/quickcard_1.json @@ -2,94 +2,94 @@ "preprocessing": [ { "fl": "sng", - "smallx": 1.1317780017852783, - "largex": 2.635816812515259, + "smallx": 1.1307647228240967, + "largex": 2.6348154544830322, "trainable": true }, { "fl": "g", - "smallx": 1.1843736171722412, - "largex": 1.5618072748184204, + "smallx": 1.1853630542755127, + "largex": 1.5627975463867188, "trainable": true }, { "fl": "v", "smallx": 0.5399999022483826, - "largex": 2.0055015087127686, + "largex": 2.004500150680542, "trainable": true }, { "fl": "v3", - "smallx": 0.30511540174484253, - "largex": 2.623253583908081, + "smallx": 0.3061078190803528, + "largex": 2.6242549419403076, "trainable": true }, { "fl": "v8", - "smallx": 0.5784729719161987, - "largex": 2.1212551593780518, + "smallx": 0.5774596929550171, + "largex": 2.120253801345825, "trainable": true }, { "fl": "t3", - "smallx": 1.3452119827270508, - "largex": 1.7576805353164673, + "smallx": 1.3441987037658691, + "largex": 1.7566683292388916, "trainable": true }, { "fl": "t8", - "smallx": 1.0487886667251587, - "largex": 1.9449496269226074, + "smallx": 1.047775387763977, + "largex": 1.945939064025879, "trainable": true }, { "fl": "cp", - "smallx": 0.741088330745697, - "largex": 3.4628548622131348, + "smallx": 0.7400740385055542, + "largex": 3.461853504180908, "trainable": true } ], - "stop_epoch": 1000, - "best_epoch": 999, - "erf_tr": 31.90971565246582, - "erf_vl": 29.347829818725586, - "chi2": 20.596195220947266, + "stop_epoch": 1100, + "best_epoch": 1099, + "erf_tr": 31.587974548339844, + "erf_vl": 29.09645652770996, + "chi2": 20.467185974121094, "pos_state": "POS_VETO", "arc_lengths": [ - 1.0344419604975799, - 1.199249640484144, - 1.0880527116547254, - 1.3247058914025585, - 1.08332657756542 + 1.0353434175487572, + 1.1966792723668909, + 1.0884899669278114, + 1.3288290197461279, + 1.0839435375255841 ], "integrability": [ - 0.002648560388475274, - 0.0026485603884783826, - 0.00023979029810894392, - 3.264821648597718, - 0.003986286144939122 + 0.002641671162566972, + 0.002641671162561421, + 0.0002462610455011838, + 3.1516795754432665, + 0.003926577570384282 ], "timing": { "walltime": { - "Total": 37.674946308135986, + "Total": 17.712170839309692, "start": 0.0, - "replica_set": 0.2974090576171875, - "replica_fitted": 37.674692153930664, - "replica_set_to_replica_fitted": 37.37728309631348 + "replica_set": 0.1738264560699463, + "replica_fitted": 17.712095260620117, + "replica_set_to_replica_fitted": 17.53826880455017 }, "cputime": { - "Total": 95.89040509899999, + "Total": 18.391021507999998, "start": 0.0, - "replica_set": 4.001058462, - "replica_fitted": 95.890103173, - "replica_set_to_replica_fitted": 91.889044711 + "replica_set": 0.173584666, + "replica_fitted": 18.390944242, + "replica_set_to_replica_fitted": 18.217359576 } }, "version": { "keras": "2.11.0", - "tensorflow": "2.11.0, mkl=True", + "tensorflow": "2.11.0, mkl=False", "numpy": "1.24.3", - "nnpdf": "4.0.6.743+g88e22f616-dev", - "validphys": "4.0.6.743+g88e22f616-dev" + "nnpdf": "4.0.6.744+ga791d281e-dev", + "validphys": "4.0.6.744+ga791d281e-dev" } } \ No newline at end of file diff --git a/n3fit/src/n3fit/tests/regressions/quickcard_2.json b/n3fit/src/n3fit/tests/regressions/quickcard_2.json index 6a47fa1d00..d59c97a5f5 100644 --- a/n3fit/src/n3fit/tests/regressions/quickcard_2.json +++ b/n3fit/src/n3fit/tests/regressions/quickcard_2.json @@ -2,94 +2,94 @@ "preprocessing": [ { "fl": "sng", - "smallx": 1.1098793745040894, - "largex": 2.6941299438476562, + "smallx": 1.1108688116073608, + "largex": 2.6956193447113037, "trainable": true }, { "fl": "g", "smallx": 0.9399998784065247, - "largex": 1.6224415302276611, + "largex": 1.621421217918396, "trainable": true }, { "fl": "v", "smallx": 0.7499998211860657, - "largex": 1.7198402881622314, + "largex": 1.7185953855514526, "trainable": true }, { "fl": "v3", - "smallx": 0.21582084894180298, - "largex": 1.3583420515060425, + "smallx": 0.215017169713974, + "largex": 1.3573191165924072, "trainable": true }, { "fl": "v8", - "smallx": 0.754185676574707, - "largex": 2.3908095359802246, + "smallx": 0.7532474994659424, + "largex": 2.389765977859497, "trainable": true }, { "fl": "t3", - "smallx": 1.422916054725647, - "largex": 2.2746129035949707, + "smallx": 1.4219000339508057, + "largex": 2.273611545562744, "trainable": true }, { "fl": "t8", - "smallx": 1.0396350622177124, - "largex": 1.7541793584823608, + "smallx": 1.0386217832565308, + "largex": 1.7531665563583374, "trainable": true }, { "fl": "cp", - "smallx": 0.23247937858104706, - "largex": 2.796694040298462, + "smallx": 0.23516468703746796, + "largex": 2.7976953983306885, "trainable": true } ], - "stop_epoch": 1000, - "best_epoch": 999, - "erf_tr": 5.0740556716918945, - "erf_vl": 5.817448139190674, - "chi2": 3.645888328552246, + "stop_epoch": 1100, + "best_epoch": 1099, + "erf_tr": 4.962428092956543, + "erf_vl": 5.63330078125, + "chi2": 3.5181877613067627, "pos_state": "POS_VETO", "arc_lengths": [ - 1.3231644321499851, - 1.1029587701870078, - 1.0539481882370751, - 4.728937647007949, - 1.063644108706556 + 1.324828406611252, + 1.1113330992990824, + 1.0539862831681286, + 4.888539270923742, + 1.067708667365969 ], "integrability": [ - 0.02915892237797213, - 0.02915892237797324, - 0.00037147028888229183, - 13.060984134674072, - 0.029583527240902782 + 0.029175871051850266, + 0.02917587105184627, + 0.0003802012824946077, + 12.767466306686401, + 0.029576309956610758 ], "timing": { "walltime": { - "Total": 36.70934009552002, + "Total": 17.551416397094727, "start": 0.0, - "replica_set": 0.2568092346191406, - "replica_fitted": 36.70907497406006, - "replica_set_to_replica_fitted": 36.45226573944092 + "replica_set": 0.17304396629333496, + "replica_fitted": 17.551299571990967, + "replica_set_to_replica_fitted": 17.378255605697632 }, "cputime": { - "Total": 96.177467606, + "Total": 18.186233694000002, "start": 0.0, - "replica_set": 4.545300222999998, - "replica_fitted": 96.17717635, - "replica_set_to_replica_fitted": 91.631876127 + "replica_set": 0.17282558100000145, + "replica_fitted": 18.186119053, + "replica_set_to_replica_fitted": 18.013293472 } }, "version": { "keras": "2.11.0", - "tensorflow": "2.11.0, mkl=True", + "tensorflow": "2.11.0, mkl=False", "numpy": "1.24.3", - "nnpdf": "4.0.6.743+g88e22f616-dev", - "validphys": "4.0.6.743+g88e22f616-dev" + "nnpdf": "4.0.6.744+ga791d281e-dev", + "validphys": "4.0.6.744+ga791d281e-dev" } } \ No newline at end of file