Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fk refactor #1936

Merged
merged 8 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fitbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
env:
N3FIT_MAXNREP: 20 # total number of replicas to fit
POSTFIT_NREP: 16 # requested replicas for postfit
REFERENCE_SET: NNBOT-344e6f1a9-2024-03-03 # reference set for exact results
REFERENCE_SET: NNBOT-c07b1a1ce-2024-03-05 # reference set for exact results
STABLE_REFERENCE_SET: NNBOT-c0f99b7b3-2024-02-28 # reference set for last tag
CONDA_PY: 310
PYTHONHASHSEED: "0"
Expand Down
1,122 changes: 561 additions & 561 deletions extra_tests/regression_fits/central_16.exportgrid

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions extra_tests/regression_fits/central_16.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,44 +51,44 @@
],
"stop_epoch": 1100,
"best_epoch": 1099,
"erf_tr": 2.670098304748535,
"erf_vl": 2.5964081287384033,
"chi2": 2.1027894020080566,
"erf_tr": 2.6700987815856934,
"erf_vl": 2.59641170501709,
"chi2": 2.1027891635894775,
"pos_state": "POS_VETO",
"arc_lengths": [
1.320814433685272,
1.4723886173965648,
1.1834960676986725,
1.0011427382272051,
1.196111193543841
1.3208143656549156,
1.472386624241041,
1.1834960751912273,
1.0011427080899755,
1.1961098579708074
],
"integrability": [
0.0009203124209320734,
0.0009203124209312685,
4.8332128016359555e-05,
0.4625752046704281,
0.006963436899239506
0.0009203131994600378,
0.0009203131994588443,
4.8332214418467245e-05,
0.4625756889581669,
0.006963423278646852
],
"timing": {
"walltime": {
"Total": 20.31281852722168,
"Total": 19.864250659942627,
"start": 0.0,
"replica_set": 0.3751709461212158,
"replica_fitted": 20.312676191329956,
"replica_set_to_replica_fitted": 19.93750524520874
"replica_set": 0.26352787017822266,
"replica_fitted": 19.864111185073853,
"replica_set_to_replica_fitted": 19.60058331489563
},
"cputime": {
"Total": 22.5239155,
"Total": 22.015899042999997,
"start": 0.0,
"replica_set": 0.6928624999999995,
"replica_fitted": 22.5237716,
"replica_set_to_replica_fitted": 21.8309091
"replica_set": 0.5629123569999992,
"replica_fitted": 22.01575814,
"replica_set_to_replica_fitted": 21.452845783
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post370.dev0+cca5aa397",
"validphys": "4.0.8.post370.dev0+cca5aa397"
"numpy": "1.26.4",
"nnpdf": "4.0.9.post86.dev0+f5530d5f0",
"validphys": "4.0.9.post86.dev0+f5530d5f0"
}
}
1,144 changes: 572 additions & 572 deletions extra_tests/regression_fits/diagonal_45.exportgrid

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions extra_tests/regression_fits/diagonal_45.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,44 +51,44 @@
],
"stop_epoch": 1100,
"best_epoch": 1099,
"erf_tr": 3.3770642280578613,
"erf_vl": 3.2323102951049805,
"chi2": 2.2297263145446777,
"erf_tr": 3.3770618438720703,
"erf_vl": 3.232316493988037,
"chi2": 2.2297229766845703,
"pos_state": "POS_VETO",
"arc_lengths": [
1.3182265509206665,
1.5444147441704428,
1.1791074624024902,
1.0015316549599111,
1.2179114648035199
1.3182292012466061,
1.5444194914498721,
1.1791065502932838,
1.0015317433438784,
1.2178967581747389
],
"integrability": [
0.0008988639456246617,
0.0008988639456223302,
4.7246536836742514e-05,
0.4626150503754609,
0.007050594722385117
0.0008988658992190035,
0.0008988658992169496,
4.724666814504008e-05,
0.4626179784536357,
0.007050464337224671
],
"timing": {
"walltime": {
"Total": 18.68031120300293,
"Total": 18.32338809967041,
"start": 0.0,
"replica_set": 0.3836376667022705,
"replica_fitted": 18.68022608757019,
"replica_set_to_replica_fitted": 18.29658842086792
"replica_set": 0.2960944175720215,
"replica_fitted": 18.323251724243164,
"replica_set_to_replica_fitted": 18.027157306671143
},
"cputime": {
"Total": 20.9634741,
"Total": 20.373533403,
"start": 0.0,
"replica_set": 0.7020474999999999,
"replica_fitted": 20.9633876,
"replica_set_to_replica_fitted": 20.2613401
"replica_set": 0.6116645140000001,
"replica_fitted": 20.373394633,
"replica_set_to_replica_fitted": 19.761730119
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post370.dev0+cca5aa397",
"validphys": "4.0.8.post370.dev0+cca5aa397"
"numpy": "1.26.4",
"nnpdf": "4.0.9.post86.dev0+f5530d5f0",
"validphys": "4.0.9.post86.dev0+f5530d5f0"
}
}
28 changes: 14 additions & 14 deletions extra_tests/regression_fits/feature_scaling_81.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
],
"stop_epoch": 1100,
"best_epoch": 1099,
"erf_tr": 2.4909772872924805,
"erf_vl": 2.056650400161743,
"chi2": 1.410895824432373,
"erf_tr": 2.490978479385376,
"erf_vl": 2.056649684906006,
"chi2": 1.4108959436416626,
"pos_state": "POS_VETO",
"arc_lengths": [
1.970557910248621,
Expand All @@ -71,24 +71,24 @@
],
"timing": {
"walltime": {
"Total": 19.536267280578613,
"Total": 18.8630473613739,
"start": 0.0,
"replica_set": 0.3791346549987793,
"replica_fitted": 19.536109924316406,
"replica_set_to_replica_fitted": 19.156975269317627
"replica_set": 0.39873695373535156,
"replica_fitted": 18.862903118133545,
"replica_set_to_replica_fitted": 18.464166164398193
},
"cputime": {
"Total": 21.5764867,
"Total": 20.546169369999998,
"start": 0.0,
"replica_set": 0.6966388000000006,
"replica_fitted": 21.576328399999998,
"replica_set_to_replica_fitted": 20.8796896
"replica_set": 0.7153101849999999,
"replica_fitted": 20.546022876,
"replica_set_to_replica_fitted": 19.830712691
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post370.dev0+cca5aa397",
"validphys": "4.0.8.post370.dev0+cca5aa397"
"numpy": "1.26.4",
"nnpdf": "4.0.9.post86.dev0+f5530d5f0",
"validphys": "4.0.9.post86.dev0+f5530d5f0"
}
}
42 changes: 21 additions & 21 deletions extra_tests/regression_fits/flavour_29.exportgrid
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ pdfgrid:
- [0.0, 0.0, -0.14895430207252502, 0.24588581919670105, 0.3680756986141205, 0.10286284238100052,
-1.6412948369979858, 0.16512326896190643, 0.4689398407936096, 0.244236558675766,
-0.14895425736904144, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.15229448676109314, 0.24562668800354004, 0.37209367752075195, 0.10177300125360489,
-1.5791362524032593, 0.16366635262966156, 0.4733951985836029, 0.24422094225883484,
-0.15229453146457672, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.15229447185993195, 0.24562674760818481, 0.37209370732307434, 0.10177303850650787,
-1.5791362524032593, 0.16366641223430634, 0.4733952283859253, 0.24422100186347961,
-0.15229450166225433, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.15574216842651367, 0.24535757303237915, 0.37624379992485046, 0.10064376890659332,
-1.515177845954895, 0.1621570885181427, 0.47799140214920044, 0.24419888854026794,
-0.15574213862419128, 0.0, 0.0, 0.0]
Expand Down Expand Up @@ -153,11 +153,11 @@ pdfgrid:
- [0.0, 0.0, -0.25425276160240173, 0.2364824414253235, 0.4980448782444, 0.07307767868041992,
0.21004416048526764, 0.12294769287109375, 0.6101816296577454, 0.2408454716205597,
-0.2542527914047241, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.2609139382839203, 0.23570077121257782, 0.5066717863082886, 0.07188010215759277,
0.3206326365470886, 0.12086828798055649, 0.6193326711654663, 0.24034471809864044,
- [0.0, 0.0, -0.2609139382839203, 0.23570077121257782, 0.5066717863082886, 0.07188008725643158,
0.3206326365470886, 0.1208682730793953, 0.6193326711654663, 0.24034471809864044,
-0.2609139680862427, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.2677140533924103, 0.234847292304039, 0.5155699253082275, 0.07077653706073761,
0.43332526087760925, 0.1188407689332962, 0.6287373900413513, 0.23976650834083557,
- [0.0, 0.0, -0.2677140533924103, 0.234847292304039, 0.5155699253082275, 0.07077652961015701,
0.43332526087760925, 0.1188407614827156, 0.6287373900413513, 0.23976650834083557,
-0.2677140533924103, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.27462679147720337, 0.2339085042476654, 0.524726927280426, 0.06978268921375275,
0.5479415655136108, 0.11687824130058289, 0.6383780837059021, 0.23909516632556915,
Expand All @@ -177,8 +177,8 @@ pdfgrid:
- [0.0, 0.0, -0.3092227876186371, 0.22725816071033478, 0.5732590556144714, 0.06697443127632141,
1.1380325555801392, 0.10848188400268555, 0.6886995434761047, 0.23356397449970245,
-0.3092227876186371, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.3156188428401947, 0.2253558486700058, 0.5830909609794617, 0.06692209094762802,
1.255548119544983, 0.10715459287166595, 0.6986900568008423, 0.23181524872779846,
- [0.0, 0.0, -0.3156188428401947, 0.225355863571167, 0.5830909609794617, 0.06692209094762802,
1.255548119544983, 0.10715459287166595, 0.6986900568008423, 0.23181523382663727,
-0.3156188428401947, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.32159385085105896, 0.22319084405899048, 0.5927444100379944, 0.06704737991094589,
1.370976209640503, 0.10595400631427765, 0.7084061503410339, 0.22976996004581451,
Expand All @@ -192,8 +192,8 @@ pdfgrid:
- [0.0, 0.0, -0.33569902181625366, 0.21482810378074646, 0.6193123459815979, 0.06837309151887894,
1.6935606002807617, 0.10304156690835953, 0.7344648241996765, 0.22152163088321686,
-0.3356989622116089, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.33871889114379883, 0.21134881675243378, 0.62690669298172, 0.06905965507030487,
1.789278507232666, 0.10225197672843933, 0.7416241765022278, 0.21798916161060333,
- [0.0, 0.0, -0.33871889114379883, 0.21134883165359497, 0.6269066333770752, 0.06905965507030487,
1.789278507232666, 0.10225197672843933, 0.741624116897583, 0.21798917651176453,
-0.33871889114379883, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.34073489904403687, 0.20751141011714935, 0.6336542963981628, 0.06981994956731796,
1.8772753477096558, 0.10151956230401993, 0.7477944493293762, 0.2140510380268097,
Expand Down Expand Up @@ -315,11 +315,11 @@ pdfgrid:
- [0.0, 0.0, -0.08735264092683792, 0.033624690026044846, 0.3773176074028015, 0.04446864128112793,
0.9675965309143066, 0.04508081451058388, 0.42720267176628113, 0.030822429805994034,
-0.08735264092683792, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.0824020653963089, 0.031500332057476044, 0.36699178814888, 0.043024979531764984,
0.9228903651237488, 0.04344649612903595, 0.4153457283973694, 0.02866179868578911,
- [0.0, 0.0, -0.0824020653963089, 0.03150033950805664, 0.36699178814888, 0.04302497208118439,
0.9228903651237488, 0.04344648867845535, 0.4153457283973694, 0.028661807999014854,
-0.08240208029747009, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.07766158133745193, 0.029486380517482758, 0.3567582666873932, 0.041593313217163086,
0.8793783783912659, 0.04183930531144142, 0.40360790491104126, 0.026620378717780113,
- [0.0, 0.0, -0.07766158133745193, 0.029486387968063354, 0.3567582666873932, 0.04159330949187279,
0.8793783783912659, 0.04183930158615112, 0.40360790491104126, 0.02662038616836071,
-0.07766158133745193, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.07312697917222977, 0.027578741312026978, 0.34662488102912903, 0.040175627917051315,
0.8370882868766785, 0.04026041179895401, 0.3919968903064728, 0.024693578481674194,
Expand Down Expand Up @@ -363,9 +363,9 @@ pdfgrid:
- [0.0, 0.0, -0.030635468661785126, 0.010702569968998432, 0.22663074731826782, 0.023699302226305008,
0.40207329392433167, 0.022679267451167107, 0.2552758455276489, 0.008126295171678066,
-0.030635468661785126, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.02844409830868244, 0.009889423847198486, 0.21844594180583954, 0.022617347538471222,
0.3771832585334778, 0.02156856842339039, 0.24599450826644897, 0.007366136647760868,
-0.02844410203397274, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.02844409830868244, 0.009889432229101658, 0.21844594180583954, 0.022617358714342117,
0.3771832585334778, 0.021568574011325836, 0.24599450826644897, 0.007366144564002752,
-0.02844409830868244, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.02637934312224388, 0.00912958849221468, 0.21042375266551971, 0.021564824506640434,
0.3534272015094757, 0.02049296349287033, 0.23690243065357208, 0.006661758758127689,
-0.02637934312224388, 0.0, 0.0, 0.0]
Expand Down Expand Up @@ -522,9 +522,9 @@ pdfgrid:
- [0.0, 0.0, -2.928620233433321e-05, 4.5309374399948865e-05, 0.006419737357646227,
0.00022756221005693078, 0.0007320509757846594, 0.0001349138474324718, 0.007175615523010492,
-5.0080634537152946e-05, -2.9286195058375597e-05, 0.0, 0.0, 0.0]
- [0.0, 0.0, -2.2459134925156832e-05, 3.9259066397789866e-05, 0.005591817665845156,
0.00019066604727413505, 0.0005718927131965756, 0.00010924947127932683, 0.006249779369682074,
-4.378743324195966e-05, -2.2459140382125042e-05, 0.0, 0.0, 0.0]
- [0.0, 0.0, -2.2459134925156832e-05, 3.9259328332263976e-05, 0.005591817665845156,
0.00019066590175498277, 0.0005718927131965756, 0.000109249354864005, 0.006249779369682074,
-4.378720041131601e-05, -2.2459140382125042e-05, 0.0, 0.0, 0.0]
- [0.0, 0.0, -1.7001650121528655e-05, 3.3831860491773114e-05, 0.0048376163467764854,
0.0001584526035003364, 0.0004413191054482013, 8.740081830183044e-05, 0.005406470969319344,
-3.7972240534145385e-05, -1.7001650121528655e-05, 0.0, 0.0, 0.0]
Expand Down
34 changes: 17 additions & 17 deletions extra_tests/regression_fits/flavour_29.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
],
"stop_epoch": 207,
"best_epoch": 95,
"erf_tr": 5.085601806640625,
"erf_vl": 5.384598255157471,
"chi2": 3.895918846130371,
"erf_tr": 5.085601329803467,
"erf_vl": 5.38459587097168,
"chi2": 3.895916700363159,
"pos_state": "POS_PASS",
"arc_lengths": [
1.1046911095057348,
1.1046911082279192,
1.2122842009645642,
0.9906464918872098,
0.99064649188045,
0.990491641076893,
0.9907081134568303
0.9907081134354656
],
"integrability": [
0.4676428288221359,
Expand All @@ -71,24 +71,24 @@
],
"timing": {
"walltime": {
"Total": 8.146902084350586,
"Total": 7.447087287902832,
"start": 0.0,
"replica_set": 0.40320706367492676,
"replica_fitted": 8.146768808364868,
"replica_set_to_replica_fitted": 7.743561744689941
"replica_set": 0.41586947441101074,
"replica_fitted": 7.446886301040649,
"replica_set_to_replica_fitted": 7.031016826629639
},
"cputime": {
"Total": 8.8086016,
"Total": 8.007859389,
"start": 0.0,
"replica_set": 0.7212256000000004,
"replica_fitted": 8.8084668,
"replica_set_to_replica_fitted": 8.0872412
"replica_set": 0.7283489909999998,
"replica_fitted": 8.007656770999999,
"replica_set_to_replica_fitted": 7.279307779999999
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post370.dev0+cca5aa397",
"validphys": "4.0.8.post370.dev0+cca5aa397"
"numpy": "1.26.4",
"nnpdf": "4.0.9.post86.dev0+f5530d5f0",
"validphys": "4.0.9.post86.dev0+f5530d5f0"
}
}
Loading