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

Add t0theoryid for the correlated replicas method (CRM) #2177

Merged
merged 15 commits into from
Nov 1, 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
1 change: 1 addition & 0 deletions .github/workflows/redo_regressions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
shell: bash -l {0}
run: |
git config user.name "Redo regressions bot"
git config user.email "<>"
git add extra_tests/regression_fits/*
git status
git commit -m "Automatically regenerated regressions from PR ${{ github.event.number }}, branch ${{ github.event.pull_request.head.ref }}."
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#For some reason the resolver decides to use an old version of numpy
#without this
numpy:
- 1.24
- 1.26

pin_run_as_build:
lhapdf: x.x.x
1 change: 1 addition & 0 deletions extra_tests/regression_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"no_csr": 613,
"polarized_evol": 34,
"multi_dense": 316,
"t0theoryid": 100,
}


Expand Down
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/central_16.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 12.018421173095703,
"Total": 11.461867332458496,
"start": 0.0,
"replica_set": 0.23227167129516602,
"replica_fitted": 12.018356561660767,
"replica_set_to_replica_fitted": 11.7860848903656
"replica_set": 0.22239995002746582,
"replica_fitted": 11.46180772781372,
"replica_set_to_replica_fitted": 11.239407777786255
},
"cputime": {
"Total": 13.647957485,
"Total": 13.093227772000002,
"start": 0.0,
"replica_set": 0.23026263799999924,
"replica_fitted": 13.647891120999997,
"replica_set_to_replica_fitted": 13.417628482999998
"replica_set": 0.22140489500000005,
"replica_fitted": 13.093166188000001,
"replica_set_to_replica_fitted": 12.871761293
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/diagonal_45.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 10.89296817779541,
"Total": 10.632083654403687,
"start": 0.0,
"replica_set": 0.2278742790222168,
"replica_fitted": 10.892873764038086,
"replica_set_to_replica_fitted": 10.66499948501587
"replica_set": 0.24991393089294434,
"replica_fitted": 10.63199520111084,
"replica_set_to_replica_fitted": 10.382081270217896
},
"cputime": {
"Total": 12.396652105999998,
"Total": 12.098074116,
"start": 0.0,
"replica_set": 0.227109338,
"replica_fitted": 12.396556207,
"replica_set_to_replica_fitted": 12.169446869000001
"replica_set": 0.24743486699999995,
"replica_fitted": 12.097983746999997,
"replica_set_to_replica_fitted": 11.850548879999998
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/feature_scaling_81.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 11.31751823425293,
"Total": 11.171345472335815,
"start": 0.0,
"replica_set": 0.23138642311096191,
"replica_fitted": 11.317461729049683,
"replica_set_to_replica_fitted": 11.08607530593872
"replica_set": 0.2302110195159912,
"replica_fitted": 11.171200513839722,
"replica_set_to_replica_fitted": 10.94098949432373
},
"cputime": {
"Total": 12.811329942,
"Total": 12.607453065000001,
"start": 0.0,
"replica_set": 0.2290858440000001,
"replica_fitted": 12.811271753,
"replica_set_to_replica_fitted": 12.582185909
"replica_set": 0.22927526099999973,
"replica_fitted": 12.607306401999999,
"replica_set_to_replica_fitted": 12.378031141
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/flavour_29.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 4.7116029262542725,
"Total": 4.690255403518677,
"start": 0.0,
"replica_set": 0.22231054306030273,
"replica_fitted": 4.711346387863159,
"replica_set_to_replica_fitted": 4.4890358448028564
"replica_set": 0.23582863807678223,
"replica_fitted": 4.690072774887085,
"replica_set_to_replica_fitted": 4.454244136810303
},
"cputime": {
"Total": 4.862365402999999,
"Total": 4.831552295,
"start": 0.0,
"replica_set": 0.2213146479999999,
"replica_fitted": 4.862106009999999,
"replica_set_to_replica_fitted": 4.640791361999999
"replica_set": 0.2345493980000004,
"replica_fitted": 4.831367581,
"replica_set_to_replica_fitted": 4.596818183
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/multi_dense_316.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 11.636826753616333,
"Total": 11.391953229904175,
"start": 0.0,
"replica_set": 0.22696971893310547,
"replica_fitted": 11.63676381111145,
"replica_set_to_replica_fitted": 11.409794092178345
"replica_set": 0.22628402709960938,
"replica_fitted": 11.391895294189453,
"replica_set_to_replica_fitted": 11.165611267089844
},
"cputime": {
"Total": 13.214493326,
"Total": 13.023389705,
"start": 0.0,
"replica_set": 0.22588198299999984,
"replica_fitted": 13.214427934,
"replica_set_to_replica_fitted": 12.988545951
"replica_set": 0.2253089749999999,
"replica_fitted": 13.023330024,
"replica_set_to_replica_fitted": 12.798021048999999
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_csr_613.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,25 @@
],
"timing": {
"walltime": {
"Total": 9.675678253173828,
"Total": 9.481953382492065,
"start": 0.0,
"replica_set": 0.23419880867004395,
"replica_fitted": 9.675537109375,
"replica_set_to_replica_fitted": 9.441338300704956
"replica_set": 0.22993159294128418,
"replica_fitted": 9.481811761856079,
"replica_set_to_replica_fitted": 9.251880168914795
},
"cputime": {
"Total": 10.798555852999998,
"Total": 10.565282932000002,
"start": 0.0,
"replica_set": 0.23191265599999955,
"replica_fitted": 10.798412807,
"replica_set_to_replica_fitted": 10.566500151
"replica_set": 0.22892762300000058,
"replica_fitted": 10.565139715,
"replica_set_to_replica_fitted": 10.336212092
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_lagrange_27.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 15.686562776565552,
"Total": 15.563487768173218,
"start": 0.0,
"replica_set": 0.22611141204833984,
"replica_fitted": 15.686427593231201,
"replica_set_to_replica_fitted": 15.460316181182861
"replica_set": 0.23473668098449707,
"replica_fitted": 15.563342332839966,
"replica_set_to_replica_fitted": 15.328605651855469
},
"cputime": {
"Total": 17.064158211,
"Total": 16.861277111,
"start": 0.0,
"replica_set": 0.22520821400000024,
"replica_fitted": 17.064021315999998,
"replica_set_to_replica_fitted": 16.838813102
"replica_set": 0.232657691,
"replica_fitted": 16.861129706,
"replica_set_to_replica_fitted": 16.628472015
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_msr_92.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 21.57416319847107,
"Total": 21.4597225189209,
"start": 0.0,
"replica_set": 0.2312939167022705,
"replica_fitted": 21.574037075042725,
"replica_set_to_replica_fitted": 21.342743158340454
"replica_set": 0.23497629165649414,
"replica_fitted": 21.459640741348267,
"replica_set_to_replica_fitted": 21.224664449691772
},
"cputime": {
"Total": 23.208116806,
"Total": 23.170773932000003,
"start": 0.0,
"replica_set": 0.22919140999999943,
"replica_fitted": 23.207989188,
"replica_set_to_replica_fitted": 22.978797778
"replica_set": 0.23272350500000005,
"replica_fitted": 23.170689936000002,
"replica_set_to_replica_fitted": 22.937966431
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_sumrules_18.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 17.569430351257324,
"Total": 17.269383192062378,
"start": 0.0,
"replica_set": 0.23427820205688477,
"replica_fitted": 17.569316625595093,
"replica_set_to_replica_fitted": 17.335038423538208
"replica_set": 0.23167967796325684,
"replica_fitted": 17.269216537475586,
"replica_set_to_replica_fitted": 17.03753685951233
},
"cputime": {
"Total": 19.022983414,
"Total": 18.788655262,
"start": 0.0,
"replica_set": 0.23228657200000047,
"replica_fitted": 19.022868079,
"replica_set_to_replica_fitted": 18.790581507
"replica_set": 0.23061819099999958,
"replica_fitted": 18.788486498,
"replica_set_to_replica_fitted": 18.557868307
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_vsr_54.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 11.739926099777222,
"Total": 11.414241790771484,
"start": 0.0,
"replica_set": 0.22898173332214355,
"replica_fitted": 11.739850759506226,
"replica_set_to_replica_fitted": 11.510869026184082
"replica_set": 0.22046661376953125,
"replica_fitted": 11.414183139801025,
"replica_set_to_replica_fitted": 11.193716526031494
},
"cputime": {
"Total": 13.339112153000002,
"Total": 13.054506966,
"start": 0.0,
"replica_set": 0.22787525900000016,
"replica_fitted": 13.339034288,
"replica_set_to_replica_fitted": 13.111159029
"replica_set": 0.21948998699999933,
"replica_fitted": 13.054446142999998,
"replica_set_to_replica_fitted": 12.834956155999999
}
},
"version": {
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"tensorflow": "2.18.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
"nnpdf": "4.0.9.post1608.dev0+77c3343e3",
"validphys": "4.0.9.post1608.dev0+77c3343e3"
}
}
Loading
Loading