Skip to content

Revert the default for parallel fits to a single model per replica #2127

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

Merged
scarlehoff merged 4 commits into from
Jul 24, 2024
Merged

Revert the default for parallel fits to a single model per replica #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45e4d20
add a multidense layer type, make a model-per-replica default
scarlehoff Jul 15, 2024
101e846
update regression tests to use single dense
scarlehoff Jul 16, 2024
f2c8c13
Automatically regenerated regressions from PR 2127, branch revert_mul…
Jul 17, 2024
c695d27
set the seed explicitly as an int
scarlehoff Jul 17, 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
2 changes: 1 addition & 1 deletion extra_tests/regression_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"no_lagrange": 27,
"no_csr": 613,
"polarized_evol": 34,
"single_dense": 316,
"multi_dense": 316,
}


Expand Down
20 changes: 10 additions & 10 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": 11.068717002868652,
"Total": 10.047237396240234,
"start": 0.0,
"replica_set": 0.23674464225769043,
"replica_fitted": 11.06860899925232,
"replica_set_to_replica_fitted": 10.831864356994629
"replica_set": 0.210205078125,
"replica_fitted": 10.047173023223877,
"replica_set_to_replica_fitted": 9.836967945098877
},
"cputime": {
"Total": 12.634108122999999,
"Total": 11.469310126,
"start": 0.0,
"replica_set": 0.23454409999999992,
"replica_fitted": 12.633997697,
"replica_set_to_replica_fitted": 12.399453597
"replica_set": 0.2088275399999997,
"replica_fitted": 11.469243942000002,
"replica_set_to_replica_fitted": 11.260416402
}
},
"version": {
"keras": "3.4.1",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1053.dev0+e72ce3cc8",
"validphys": "4.0.9.post1053.dev0+e72ce3cc8"
"nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
"validphys": "4.0.9.post1058.dev0+0a1b331ae"
}
}
20 changes: 10 additions & 10 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": 11.215790271759033,
"Total": 9.477155923843384,
"start": 0.0,
"replica_set": 0.23657774925231934,
"replica_fitted": 11.215726852416992,
"replica_set_to_replica_fitted": 10.979149103164673
"replica_set": 0.21604132652282715,
"replica_fitted": 9.477098941802979,
"replica_set_to_replica_fitted": 9.261057615280151
},
"cputime": {
"Total": 12.762100954,
"Total": 10.790387835,
"start": 0.0,
"replica_set": 0.23547829999999959,
"replica_fitted": 12.762035623000001,
"replica_set_to_replica_fitted": 12.526557323000002
"replica_set": 0.21436629899999993,
"replica_fitted": 10.790329496999998,
"replica_set_to_replica_fitted": 10.575963198
}
},
"version": {
"keras": "3.4.1",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1053.dev0+e72ce3cc8",
"validphys": "4.0.9.post1053.dev0+e72ce3cc8"
"nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
"validphys": "4.0.9.post1058.dev0+0a1b331ae"
}
}
20 changes: 10 additions & 10 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 @@ -71,25 +71,25 @@
],
"timing": {
"walltime": {
"Total": 11.622541427612305,
"Total": 9.83653473854065,
"start": 0.0,
"replica_set": 0.23537468910217285,
"replica_fitted": 11.62245488166809,
"replica_set_to_replica_fitted": 11.387080192565918
"replica_set": 0.22139739990234375,
"replica_fitted": 9.836406946182251,
"replica_set_to_replica_fitted": 9.615009546279907
},
"cputime": {
"Total": 13.069087044,
"Total": 11.082168318,
"start": 0.0,
"replica_set": 0.2290513789999995,
"replica_fitted": 13.068997967000001,
"replica_set_to_replica_fitted": 12.839946588000002
"replica_set": 0.2204650259999994,
"replica_fitted": 11.082038816,
"replica_set_to_replica_fitted": 10.861573790000001
}
},
"version": {
"keras": "3.4.1",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1053.dev0+e72ce3cc8",
"validphys": "4.0.9.post1053.dev0+e72ce3cc8"
"nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
"validphys": "4.0.9.post1058.dev0+0a1b331ae"
}
}
1,160 changes: 580 additions & 580 deletions extra_tests/regression_fits/flavour_29.exportgrid
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 25 additions & 25 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 @@ -49,47 +49,47 @@
"trainable": false
}
],
"stop_epoch": 181,
"best_epoch": 69,
"erf_tr": 4.977453231811523,
"erf_vl": 5.5623860359191895,
"chi2": 3.8969779014587402,
"stop_epoch": 141,
"best_epoch": 29,
"erf_tr": 4.978306293487549,
"erf_vl": 5.562335014343262,
"chi2": 3.8961379528045654,
"pos_state": "POS_PASS",
"arc_lengths": [
1.1047281768455546,
1.2121895138128305,
0.9906464943638001,
0.9904916210719534,
0.9907080933270742
1.1046950323223816,
1.2122357294523425,
0.9906464880057816,
0.9904916575857023,
0.9907080733680326
],
"integrability": [
0.46764490008354204,
0.4676449000835418,
0.08091166429221643,
0.10038149356842034,
0.5176680088043213
0.46764521300792666,
0.46764521300792683,
0.0809073969721795,
0.10018515586853038,
0.5176685005426407
],
"timing": {
"walltime": {
"Total": 4.9544456005096436,
"Total": 4.027747869491577,
"start": 0.0,
"replica_set": 0.24539613723754883,
"replica_fitted": 4.954279899597168,
"replica_set_to_replica_fitted": 4.708883762359619
"replica_set": 0.21877336502075195,
"replica_fitted": 4.027618646621704,
"replica_set_to_replica_fitted": 3.808845281600952
},
"cputime": {
"Total": 5.150289656,
"Total": 4.170468237,
"start": 0.0,
"replica_set": 0.23985466799999955,
"replica_fitted": 5.150120960999999,
"replica_set_to_replica_fitted": 4.910266292999999
"replica_set": 0.2169810080000003,
"replica_fitted": 4.170337463000001,
"replica_set_to_replica_fitted": 3.9533564550000007
}
},
"version": {
"keras": "3.4.1",
"tensorflow": "2.17.0, mkl=False",
"numpy": "1.26.4",
"nnpdf": "4.0.9.post1053.dev0+e72ce3cc8",
"validphys": "4.0.9.post1053.dev0+e72ce3cc8"
"nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
"validphys": "4.0.9.post1058.dev0+0a1b331ae"
}
}
Binary file renamed ...s/regression_fits/single_dense.weights.h5 → ...ts/regression_fits/multi_dense.weights.h5
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions extra_tests/regression_fits/single_dense.yml → extra_tests/regression_fits/multi_dense.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ nnseed: 2
mcseed: 1

# checks both that can be loaded and saved
save: "single_dense.weights.h5"
load: "single_dense.weights.h5"
save: "multi_dense.weights.h5"
load: "multi_dense.weights.h5"

parameters: # This defines the parameter dictionary that is passed to the Model Trainer
nodes_per_layer: [15, 10, 8]
Expand All @@ -50,7 +50,7 @@ parameters: # This defines the parameter dictionary that is passed to the Model
multiplier: 1.05
initial: 1.5
stopping_patience: 0.10 # percentage of the number of epochs
layer_type: 'single_dense'
layer_type: 'multidense'
dropout: 0.0
threshold_chi2: 10.0

Expand Down
Loading