Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
101056e
Implemented parallel replicas with varying trvl mask layers
goord Jun 22, 2022
90674bd
Added lru caches to speed up validphys multi-replica initalization
goord May 10, 2023
5db86f1
Apply black, isort to modified files
APJansen Jan 10, 2024
c7b1d14
Made isinstance call more elegant
goord Feb 15, 2024
9663a63
Simplify LossInvCovmat for diagonal cases
goord Feb 15, 2024
799c12c
Simplified replica stacking of experimental data in model setup
goord Feb 15, 2024
ba6bb59
Removed axis argument from mask layer and determine output shape at b…
goord Feb 15, 2024
b2edf4b
Return -1 as stop epoch whenever the final epoch object is not create…
goord Feb 15, 2024
06c59ff
Give warning on parallel multi-replica single-point datasets
goord Feb 15, 2024
170c13f
Add default parameters to tr_masks to fix unit tests
goord Feb 16, 2024
36edbdb
Revert change to runcard
APJansen Feb 19, 2024
2bc758b
Generalise import of operations
APJansen Feb 19, 2024
868a9a4
Restore EKO import
APJansen Feb 19, 2024
458469e
Revert "Added lru caches to speed up validphys multi-replica initaliz…
APJansen Feb 19, 2024
916249d
Remove unused index in loop
APJansen Feb 19, 2024
b2ad20e
Refactor list comprehensions
APJansen Feb 19, 2024
b337bf7
Remove unused functools import
APJansen Feb 19, 2024
c2e4935
Fix shape of input and mask in the Mask layer, and adjust test.
APJansen Feb 19, 2024
a8da0db
Simplify einsum call
APJansen Feb 21, 2024
2bbf864
Use enumerate instead of indexing
APJansen Feb 21, 2024
1d91484
Simplify branching on kernel shape (also rename tmp->obs_diff,
APJansen Feb 21, 2024
d994895
be explicit about axis
APJansen Feb 21, 2024
c260f14
Remove check for multiple replicas
APJansen Feb 21, 2024
a4026e1
keys -> items in loop as a value was being used
APJansen Feb 21, 2024
d63115b
Remove deprecated comment
APJansen Feb 21, 2024
49904a3
Clarify branching in loss
APJansen Feb 21, 2024
db24f63
Simplified pos_info and integ_info usage in model_trainer
goord Feb 21, 2024
f6e9bac
Fix bug in losses, incorrectly determining number of replicas
APJansen Feb 21, 2024
66f1068
Made construction of replicas_info more readable
goord Feb 21, 2024
2cd1701
Merge remote-tracking branch 'origin/trvl-mask-layers' into trvl-mask…
goord Feb 21, 2024
bc76939
Simplify replicas_info further
APJansen Feb 22, 2024
44901f0
Automatically regenerated regressions from PR 1788, branch trvl-mask-…
Feb 22, 2024
a7dfc0d
Add comment on flattening
APJansen Feb 22, 2024
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
1,150 changes: 575 additions & 575 deletions extra_tests/regression_fits/central_16.exportgrid

Large diffs are not rendered by default.

46 changes: 23 additions & 23 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.6700053215026855,
"erf_vl": 2.596088409423828,
"chi2": 2.1046974658966064,
"erf_tr": 2.670098304748535,
"erf_vl": 2.5964081287384033,
"chi2": 2.1027894020080566,
"pos_state": "POS_VETO",
"arc_lengths": [
1.3207831327275608,
1.4752541158950256,
1.1834874152294614,
1.0011426742289826,
1.1960979802612568
1.320814433685272,
1.4723886173965648,
1.1834960676986725,
1.0011427382272051,
1.196111193543841
],
"integrability": [
0.0009203169902344266,
0.0009203169902324282,
4.8332353002611406e-05,
0.46257528662681513,
0.006963513907974672
0.0009203124209320734,
0.0009203124209312685,
4.8332128016359555e-05,
0.4625752046704281,
0.006963436899239506
],
"timing": {
"walltime": {
"Total": 18.85464835166931,
"Total": 20.482789754867554,
"start": 0.0,
"replica_set": 0.3591601848602295,
"replica_fitted": 18.854573249816895,
"replica_set_to_replica_fitted": 18.495413064956665
"replica_set": 0.38495421409606934,
"replica_fitted": 20.482685327529907,
"replica_set_to_replica_fitted": 20.097731113433838
},
"cputime": {
"Total": 20.889074,
"Total": 22.8096241,
"start": 0.0,
"replica_set": 0.6770135999999995,
"replica_fitted": 20.888997200000002,
"replica_set_to_replica_fitted": 20.211983600000003
"replica_set": 0.6998853,
"replica_fitted": 22.809518,
"replica_set_to_replica_fitted": 22.1096327
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post297.dev0+234efa01e",
"validphys": "4.0.8.post297.dev0+234efa01e"
"nnpdf": "4.0.8.post339.dev0+bc76939f2",
"validphys": "4.0.8.post339.dev0+bc76939f2"
}
}
1,138 changes: 569 additions & 569 deletions extra_tests/regression_fits/diagonal_45.exportgrid

Large diffs are not rendered by default.

44 changes: 22 additions & 22 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.3770620822906494,
"erf_tr": 3.3770642280578613,
"erf_vl": 3.2323102951049805,
"chi2": 2.229722023010254,
"chi2": 2.2297263145446777,
"pos_state": "POS_VETO",
"arc_lengths": [
1.318226912266057,
1.5444128182135202,
1.179107474257061,
1.0015316669311096,
1.2179101304602167
1.3182265509206665,
1.5444147441704428,
1.1791074624024902,
1.0015316549599111,
1.2179114648035199
],
"integrability": [
0.0008988641238855122,
0.0008988641238834028,
4.724650636855898e-05,
0.46261481940746196,
0.0070505824987761034
0.0008988639456246617,
0.0008988639456223302,
4.7246536836742514e-05,
0.4626150503754609,
0.007050594722385117
],
"timing": {
"walltime": {
"Total": 18.131428241729736,
"Total": 19.21068048477173,
"start": 0.0,
"replica_set": 0.3876476287841797,
"replica_fitted": 18.131293058395386,
"replica_set_to_replica_fitted": 17.743645429611206
"replica_set": 0.3876974582672119,
"replica_fitted": 19.2105815410614,
"replica_set_to_replica_fitted": 18.82288408279419
},
"cputime": {
"Total": 20.1227844,
"Total": 21.2651539,
"start": 0.0,
"replica_set": 0.704001100000001,
"replica_fitted": 20.1226482,
"replica_set_to_replica_fitted": 19.4186471
"replica_set": 0.7038960999999997,
"replica_fitted": 21.265053100000003,
"replica_set_to_replica_fitted": 20.561157
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post297.dev0+234efa01e",
"validphys": "4.0.8.post297.dev0+234efa01e"
"nnpdf": "4.0.8.post339.dev0+bc76939f2",
"validphys": "4.0.8.post339.dev0+bc76939f2"
}
}
20 changes: 10 additions & 10 deletions extra_tests/regression_fits/feature_scaling_81.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,24 +71,24 @@
],
"timing": {
"walltime": {
"Total": 18.211228370666504,
"Total": 19.78455400466919,
"start": 0.0,
"replica_set": 0.39786696434020996,
"replica_fitted": 18.211086988449097,
"replica_set_to_replica_fitted": 17.813220024108887
"replica_set": 0.3843960762023926,
"replica_fitted": 19.78445529937744,
"replica_set_to_replica_fitted": 19.40005922317505
},
"cputime": {
"Total": 20.0817579,
"Total": 21.797165300000003,
"start": 0.0,
"replica_set": 0.7005326000000007,
"replica_fitted": 20.081615399999997,
"replica_set_to_replica_fitted": 19.381082799999998
"replica_set": 0.7009340999999996,
"replica_fitted": 21.797065099999998,
"replica_set_to_replica_fitted": 21.096131
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post297.dev0+234efa01e",
"validphys": "4.0.8.post297.dev0+234efa01e"
"nnpdf": "4.0.8.post339.dev0+bc76939f2",
"validphys": "4.0.8.post339.dev0+bc76939f2"
}
}
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.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.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.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.07188008725643158,
0.3206326365470886, 0.1208682730793953, 0.6193326711654663, 0.24034471809864044,
- [0.0, 0.0, -0.2609139382839203, 0.23570077121257782, 0.5066717863082886, 0.07188010215759277,
0.3206326365470886, 0.12086828798055649, 0.6193326711654663, 0.24034471809864044,
-0.2609139680862427, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.2677140533924103, 0.234847292304039, 0.5155699253082275, 0.07077652961015701,
0.43332526087760925, 0.1188407614827156, 0.6287373900413513, 0.23976650834083557,
- [0.0, 0.0, -0.2677140533924103, 0.234847292304039, 0.5155699253082275, 0.07077653706073761,
0.43332526087760925, 0.1188407689332962, 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.225355863571167, 0.5830909609794617, 0.06692209094762802,
1.255548119544983, 0.10715459287166595, 0.6986900568008423, 0.23181523382663727,
- [0.0, 0.0, -0.3156188428401947, 0.2253558486700058, 0.5830909609794617, 0.06692209094762802,
1.255548119544983, 0.10715459287166595, 0.6986900568008423, 0.23181524872779846,
-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.21134883165359497, 0.6269066333770752, 0.06905965507030487,
1.789278507232666, 0.10225197672843933, 0.741624116897583, 0.21798917651176453,
- [0.0, 0.0, -0.33871889114379883, 0.21134881675243378, 0.62690669298172, 0.06905965507030487,
1.789278507232666, 0.10225197672843933, 0.7416241765022278, 0.21798916161060333,
-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.03150033950805664, 0.36699178814888, 0.04302497208118439,
0.9228903651237488, 0.04344648867845535, 0.4153457283973694, 0.028661807999014854,
- [0.0, 0.0, -0.0824020653963089, 0.031500332057476044, 0.36699178814888, 0.043024979531764984,
0.9228903651237488, 0.04344649612903595, 0.4153457283973694, 0.02866179868578911,
-0.08240208029747009, 0.0, 0.0, 0.0]
- [0.0, 0.0, -0.07766158133745193, 0.029486387968063354, 0.3567582666873932, 0.04159330949187279,
0.8793783783912659, 0.04183930158615112, 0.40360790491104126, 0.02662038616836071,
- [0.0, 0.0, -0.07766158133745193, 0.029486380517482758, 0.3567582666873932, 0.041593313217163086,
0.8793783783912659, 0.04183930531144142, 0.40360790491104126, 0.026620378717780113,
-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.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.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.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.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, -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, -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
26 changes: 13 additions & 13 deletions extra_tests/regression_fits/flavour_29.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
"chi2": 3.895918846130371,
"pos_state": "POS_PASS",
"arc_lengths": [
1.1046911082279192,
1.1046911095057348,
1.2122842009645642,
0.99064649188045,
0.9906464918872098,
0.990491641076893,
0.9907081134354656
0.9907081134568303
],
"integrability": [
0.4676428288221359,
Expand All @@ -71,24 +71,24 @@
],
"timing": {
"walltime": {
"Total": 7.520705223083496,
"Total": 8.190976619720459,
"start": 0.0,
"replica_set": 0.3701026439666748,
"replica_fitted": 7.520532608032227,
"replica_set_to_replica_fitted": 7.150429964065552
"replica_set": 0.39362668991088867,
"replica_fitted": 8.190709829330444,
"replica_set_to_replica_fitted": 7.797083139419556
},
"cputime": {
"Total": 8.128277999999998,
"Total": 8.850825799999999,
"start": 0.0,
"replica_set": 0.6848363999999991,
"replica_fitted": 8.1281039,
"replica_set_to_replica_fitted": 7.443267500000001
"replica_set": 0.7093926999999995,
"replica_fitted": 8.8505578,
"replica_set_to_replica_fitted": 8.141165100000002
}
},
"version": {
"tensorflow": "2.15.0, mkl=??",
"numpy": "1.24.4",
"nnpdf": "4.0.8.post297.dev0+234efa01e",
"validphys": "4.0.8.post297.dev0+234efa01e"
"nnpdf": "4.0.8.post339.dev0+bc76939f2",
"validphys": "4.0.8.post339.dev0+bc76939f2"
}
}
Loading