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.

Sign up for GitHub

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

Update feature scaling #2165

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Update feature scaling #2165

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d18e3e
add also [1] to selected_poinst + include enpoint if 1
RoyStegeman May 29, 2024
f934deb
fix photon computation with feature scaling
RoyStegeman Sep 30, 2024
1bf9136
Automatically regenerated regressions from PR 2165, branch update_fs.
Oct 16, 2024
e64c35f
trigger ci test
RoyStegeman Oct 16, 2024
ad1c1e0
implement review comments
RoyStegeman Oct 16, 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
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/central_16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 10.90460753440857,
"Total": 12.018421173095703,
"start": 0.0,
"replica_set": 0.22848939895629883,
"replica_fitted": 10.904474258422852,
"replica_set_to_replica_fitted": 10.675984859466553
"replica_set": 0.23227167129516602,
"replica_fitted": 12.018356561660767,
"replica_set_to_replica_fitted": 11.7860848903656
},
"cputime": {
"Total": 12.365805662,
"Total": 13.647957485,
"start": 0.0,
"replica_set": 0.22668013299999945,
"replica_fitted": 12.365671202000001,
"replica_set_to_replica_fitted": 12.138991069000003
"replica_set": 0.23026263799999924,
"replica_fitted": 13.647891120999997,
"replica_set_to_replica_fitted": 13.417628482999998
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/diagonal_45.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 10.154094696044922,
"Total": 10.89296817779541,
"start": 0.0,
"replica_set": 0.22886013984680176,
"replica_fitted": 10.154032945632935,
"replica_set_to_replica_fitted": 9.925172805786133
"replica_set": 0.2278742790222168,
"replica_fitted": 10.892873764038086,
"replica_set_to_replica_fitted": 10.66499948501587
},
"cputime": {
"Total": 11.552391722,
"Total": 12.396652105999998,
"start": 0.0,
"replica_set": 0.22704437600000027,
"replica_fitted": 11.552328112999998,
"replica_set_to_replica_fitted": 11.325283737
"replica_set": 0.227109338,
"replica_fitted": 12.396556207,
"replica_set_to_replica_fitted": 12.169446869000001
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
1,168 changes: 584 additions & 584 deletions extra_tests/regression_fits/feature_scaling_81.exportgrid
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions extra_tests/regression_fits/feature_scaling_81.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,45 +51,45 @@
],
"stop_epoch": 1100,
"best_epoch": 1099,
"erf_tr": 2.6529221534729004,
"erf_vl": 2.1242189407348633,
"chi2": 1.4108729362487793,
"erf_tr": 2.803447723388672,
"erf_vl": 2.2027039527893066,
"chi2": 1.5391007661819458,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so the mapping has changed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes slightly, I think it's because now the x=1 is usually included in the scaled xgrid where before it was not

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and why is it needed? Its contribution should be 0.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because previously x=1 was not in the fktable xgrids so I could just use the largest x-grid point as the last step in the grid before x=1. With pineappl x=1 is there and it should remain at 1.

Before this change the x=1 in pineappl would be the last step/interval before 1 after scaling.

"pos_state": "POS_VETO",
"arc_lengths": [
1.9705476983138794,
1.512302243077699,
1.260815752013667,
1.1146985688924977,
2.925545376397096
1.9466023456684678,
1.3799482754266563,
1.2471559596177706,
1.1163689372359673,
2.615530925864889
],
"integrability": [
0.0038688021886626456,
0.0038688021886626456,
2.285109604843738e-05,
0.05472337594255805,
0.006996966199948718
0.003927234502043547,
0.0039272345020434085,
2.453492459170148e-05,
0.055360530037432854,
0.006458622578065065
],
"timing": {
"walltime": {
"Total": 10.640647411346436,
"Total": 11.31751823425293,
"start": 0.0,
"replica_set": 0.2341294288635254,
"replica_fitted": 10.64057731628418,
"replica_set_to_replica_fitted": 10.406447887420654
"replica_set": 0.23138642311096191,
"replica_fitted": 11.317461729049683,
"replica_set_to_replica_fitted": 11.08607530593872
},
"cputime": {
"Total": 11.966201521000002,
"Total": 12.811329942,
"start": 0.0,
"replica_set": 0.2321575600000001,
"replica_fitted": 11.966130038000003,
"replica_set_to_replica_fitted": 11.733972478000002
"replica_set": 0.2290858440000001,
"replica_fitted": 12.811271753,
"replica_set_to_replica_fitted": 12.582185909
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/flavour_29.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 4.325552940368652,
"Total": 4.7116029262542725,
"start": 0.0,
"replica_set": 0.22845125198364258,
"replica_fitted": 4.325416326522827,
"replica_set_to_replica_fitted": 4.096965074539185
"replica_set": 0.22231054306030273,
"replica_fitted": 4.711346387863159,
"replica_set_to_replica_fitted": 4.4890358448028564
},
"cputime": {
"Total": 4.471941011,
"Total": 4.862365402999999,
"start": 0.0,
"replica_set": 0.226811251,
"replica_fitted": 4.471802753,
"replica_set_to_replica_fitted": 4.244991502
"replica_set": 0.2213146479999999,
"replica_fitted": 4.862106009999999,
"replica_set_to_replica_fitted": 4.640791361999999
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/multi_dense_316.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 10.78720498085022,
"Total": 11.636826753616333,
"start": 0.0,
"replica_set": 0.23145174980163574,
"replica_fitted": 10.787103652954102,
"replica_set_to_replica_fitted": 10.555651903152466
"replica_set": 0.22696971893310547,
"replica_fitted": 11.63676381111145,
"replica_set_to_replica_fitted": 11.409794092178345
},
"cputime": {
"Total": 12.270467773000002,
"Total": 13.214493326,
"start": 0.0,
"replica_set": 0.22953441400000063,
"replica_fitted": 12.270364611,
"replica_set_to_replica_fitted": 12.040830196999998
"replica_set": 0.22588198299999984,
"replica_fitted": 13.214427934,
"replica_set_to_replica_fitted": 12.988545951
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_csr_613.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,25 @@
],
"timing": {
"walltime": {
"Total": 9.047945737838745,
"Total": 9.675678253173828,
"start": 0.0,
"replica_set": 0.23447799682617188,
"replica_fitted": 9.04781460762024,
"replica_set_to_replica_fitted": 8.813336610794067
"replica_set": 0.23419880867004395,
"replica_fitted": 9.675537109375,
"replica_set_to_replica_fitted": 9.441338300704956
},
"cputime": {
"Total": 10.033265355,
"Total": 10.798555852999998,
"start": 0.0,
"replica_set": 0.2326763569999999,
"replica_fitted": 10.033132898,
"replica_set_to_replica_fitted": 9.800456540999999
"replica_set": 0.23191265599999955,
"replica_fitted": 10.798412807,
"replica_set_to_replica_fitted": 10.566500151
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_lagrange_27.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 15.22148847579956,
"Total": 15.686562776565552,
"start": 0.0,
"replica_set": 0.23516511917114258,
"replica_fitted": 15.221322059631348,
"replica_set_to_replica_fitted": 14.986156940460205
"replica_set": 0.22611141204833984,
"replica_fitted": 15.686427593231201,
"replica_set_to_replica_fitted": 15.460316181182861
},
"cputime": {
"Total": 16.402484346999998,
"Total": 17.064158211,
"start": 0.0,
"replica_set": 0.23330889300000024,
"replica_fitted": 16.402316713999998,
"replica_set_to_replica_fitted": 16.169007820999997
"replica_set": 0.22520821400000024,
"replica_fitted": 17.064021315999998,
"replica_set_to_replica_fitted": 16.838813102
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_msr_92.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 20.706217765808105,
"Total": 21.57416319847107,
"start": 0.0,
"replica_set": 0.23932576179504395,
"replica_fitted": 20.70611071586609,
"replica_set_to_replica_fitted": 20.466784954071045
"replica_set": 0.2312939167022705,
"replica_fitted": 21.574037075042725,
"replica_set_to_replica_fitted": 21.342743158340454
},
"cputime": {
"Total": 22.302579570000002,
"Total": 23.208116806,
"start": 0.0,
"replica_set": 0.23773320799999986,
"replica_fitted": 22.302470446,
"replica_set_to_replica_fitted": 22.064737238
"replica_set": 0.22919140999999943,
"replica_fitted": 23.207989188,
"replica_set_to_replica_fitted": 22.978797778
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
22 changes: 11 additions & 11 deletions extra_tests/regression_fits/no_sumrules_18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 17.095475435256958,
"Total": 17.569430351257324,
"start": 0.0,
"replica_set": 0.24184823036193848,
"replica_fitted": 17.095387935638428,
"replica_set_to_replica_fitted": 16.85353970527649
"replica_set": 0.23427820205688477,
"replica_fitted": 17.569316625595093,
"replica_set_to_replica_fitted": 17.335038423538208
},
"cputime": {
"Total": 18.510476551,
"Total": 19.022983414,
"start": 0.0,
"replica_set": 0.2397011959999995,
"replica_fitted": 18.510387164999997,
"replica_set_to_replica_fitted": 18.270685969
"replica_set": 0.23228657200000047,
"replica_fitted": 19.022868079,
"replica_set_to_replica_fitted": 18.790581507
}
},
"version": {
"keras": "3.4.1",
"keras": "3.6.0",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1210.dev0+d36bcce78",
"validphys": "4.0.9.post1210.dev0+d36bcce78"
"nnpdf": "4.0.9.post1366.dev0+f934deb20",
"validphys": "4.0.9.post1366.dev0+f934deb20"
}
}
Loading