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

Exa couplings2 #1806

Merged
merged 26 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4a281f4
Implement exact running for alpha_em in photon module
niclaurenti Aug 16, 2023
3a5faed
Add tests
niclaurenti Aug 17, 2023
1d388e6
Interpolate alphaem exa running
niclaurenti Aug 17, 2023
fe10087
Add docstring to rge function and move block in __init__
niclaurenti Aug 17, 2023
dfd53a9
Use numpy interpolator instead of scipy
niclaurenti Sep 15, 2023
171d8c7
Implement exact running for alpha_em in photon module
niclaurenti Aug 16, 2023
61ffa98
Add tests
niclaurenti Aug 17, 2023
9f76745
Interpolate alphaem exa running
niclaurenti Aug 17, 2023
119a5f8
Add docstring to rge function and move block in __init__
niclaurenti Aug 17, 2023
e87c62e
Use numpy interpolator instead of scipy
niclaurenti Sep 15, 2023
327c285
Merge branch 'exa_couplings' of github.com:NNPDF/nnpdf into exa_coupl…
niclaurenti Sep 15, 2023
8363da9
Fix test_fit
niclaurenti Sep 18, 2023
ea43b4e
Update docstrings
niclaurenti Sep 18, 2023
0bf5054
Run black
niclaurenti Sep 18, 2023
c09dc46
Fix bug and restructure __init__ in Alpha
niclaurenti Sep 18, 2023
7d00748
Change number of interpolation points 100 -> 200
niclaurenti Sep 19, 2023
14cd5b3
Fix test_fit
niclaurenti Sep 19, 2023
5e36769
Switch off betaQCD and beta_mix
niclaurenti Sep 20, 2023
8bbee31
Add threshold points to q interpolation vector
niclaurenti Sep 20, 2023
2a2851d
Merge branch 'exa_couplings2' of github.com:NNPDF/nnpdf into exa_coup…
niclaurenti Sep 21, 2023
5c7e2b3
Use decoupled running in EKO for the tests
niclaurenti Sep 21, 2023
998043f
Restore beta terms put to zero and comment out from rge
niclaurenti Sep 21, 2023
0e62fa3
fix test_compute
niclaurenti Sep 21, 2023
d2ecc69
Test only alpha_em
niclaurenti Sep 21, 2023
33ab571
Remove alphas part
niclaurenti Sep 21, 2023
d27b70a
Uncomment tests that were accidentally pushed
niclaurenti Oct 5, 2023
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
52 changes: 26 additions & 26 deletions n3fit/src/n3fit/tests/regressions/quickcard_qed_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{
"fl": "v3",
"smallx": 0.3061824142932892,
"largex": 2.624323606491089,
"largex": 2.6243233680725098,
"trainable": true
},
{
Expand Down Expand Up @@ -51,45 +51,45 @@
],
"stop_epoch": 1100,
"best_epoch": 1099,
"erf_tr": 31.486101150512695,
"erf_vl": 28.4218692779541,
"chi2": 19.611825942993164,
"erf_tr": 31.485458374023438,
"erf_vl": 28.42206382751465,
"chi2": 19.611541748046875,
"pos_state": "POS_VETO",
"arc_lengths": [
1.035533162554303,
1.1953713068471692,
1.0881025884095246,
1.3414978876721764,
1.0839843290638607
1.0355329887612117,
1.1953571748772314,
1.0881027600170494,
1.3415071846048732,
1.0839843463545356
],
"integrability": [
0.002653829054906187,
0.002653829054905521,
0.0002567724250169823,
3.2896786332130423,
0.003927801561079747
0.0026538235688319256,
0.00265382356883348,
0.00025677830853820804,
3.28967034816742,
0.003927802317778006
],
"timing": {
"walltime": {
"Total": 58.37841296195984,
"Total": 53.125245571136475,
"start": 0.0,
"replica_set": 0.3208029270172119,
"replica_fitted": 58.37802076339722,
"replica_set_to_replica_fitted": 58.057217836380005
"replica_set": 0.30568861961364746,
"replica_fitted": 53.12488603591919,
"replica_set_to_replica_fitted": 52.81919741630554
},
"cputime": {
"Total": 61.517351913999995,
"Total": 53.733357951,
"start": 0.0,
"replica_set": 2.813359167999998,
"replica_fitted": 61.516948647,
"replica_set_to_replica_fitted": 58.703589479
"replica_set": 0.30389858000000025,
"replica_fitted": 53.732994062,
"replica_set_to_replica_fitted": 53.429095482
}
},
"version": {
"keras": "2.11.0",
"tensorflow": "2.11.0, mkl=False",
"numpy": "1.22.4",
"nnpdf": "4.0.6.846+g0a926fdf1",
"validphys": "4.0.6.846+g0a926fdf1"
"numpy": "1.24.3",
"nnpdf": "4.0.6.1115+g7d007487f-dev",
"validphys": "4.0.6.1115+g7d007487f-dev"
}
}
}
64 changes: 32 additions & 32 deletions n3fit/src/n3fit/tests/regressions/quickcard_qed_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
"preprocessing": [
{
"fl": "sng",
"smallx": 1.1090763807296753,
"smallx": 1.1090757846832275,
"largex": 2.683891534805298,
"trainable": true
},
{
"fl": "g",
"smallx": 0.9399998784065247,
"largex": 1.6250606775283813,
"largex": 1.6250457763671875,
"trainable": true
},
{
"fl": "v",
"smallx": 0.7499998211860657,
"largex": 1.7267229557037354,
"largex": 1.7267194986343384,
"trainable": true
},
{
"fl": "v3",
"smallx": 0.21201331913471222,
"largex": 1.3532426357269287,
"smallx": 0.21195323765277863,
"largex": 1.353239893913269,
"trainable": true
},
{
"fl": "v8",
"smallx": 0.7599998712539673,
"largex": 2.390087127685547,
"largex": 2.3900835514068604,
"trainable": true
},
{
Expand All @@ -44,52 +44,52 @@
},
{
"fl": "cp",
"smallx": 0.24638080596923828,
"smallx": 0.2463812381029129,
"largex": 2.7976953983306885,
"trainable": true
}
],
"stop_epoch": 1100,
"best_epoch": 1099,
"erf_tr": 3.5809452533721924,
"erf_vl": 3.6826603412628174,
"chi2": 2.141340732574463,
"erf_tr": 3.5810189247131348,
"erf_vl": 3.6826956272125244,
"chi2": 2.1413865089416504,
"pos_state": "POS_VETO",
"arc_lengths": [
1.3194883264768875,
1.1995146017416334,
1.054266019685804,
5.074692492247958,
1.0689068380364566
1.3194896414570378,
1.199593900463531,
1.0542665627449714,
5.075661329523936,
1.0689046403003977
],
"integrability": [
0.02917606895789332,
0.029176068957894374,
0.0003924771135637162,
12.764093160629272,
0.02982003148645135
0.02917601913213702,
0.029176019132136632,
0.00039221921542709204,
12.764094114303589,
0.02982073510065708
],
"timing": {
"walltime": {
"Total": 57.77593541145325,
"Total": 51.37196373939514,
"start": 0.0,
"replica_set": 0.31868839263916016,
"replica_fitted": 57.77560114860535,
"replica_set_to_replica_fitted": 57.45691275596619
"replica_set": 0.28058624267578125,
"replica_fitted": 51.371232748031616,
"replica_set_to_replica_fitted": 51.090646505355835
},
"cputime": {
"Total": 60.771742980000006,
"Total": 51.978278505,
"start": 0.0,
"replica_set": 2.6913169609999983,
"replica_fitted": 60.771408723,
"replica_set_to_replica_fitted": 58.080091762
"replica_set": 0.2790865369999995,
"replica_fitted": 51.97755204999999,
"replica_set_to_replica_fitted": 51.698465512999995
}
},
"version": {
"keras": "2.11.0",
"tensorflow": "2.11.0, mkl=False",
"numpy": "1.22.4",
"nnpdf": "4.0.6.846+g0a926fdf1",
"validphys": "4.0.6.846+g0a926fdf1"
"numpy": "1.24.3",
"nnpdf": "4.0.6.1115+g7d007487f-dev",
"validphys": "4.0.6.1115+g7d007487f-dev"
}
}
}
Loading