-
Notifications
You must be signed in to change notification settings - Fork 14
Multi dense logistics #1818
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
Merged
Merged
Multi dense logistics #1818
Changes from all commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
433ab62
Join replicas into single MetaModel
APJansen f44a96b
Next step in joining replicas, in model_generation
APJansen 97d3e5d
Next step in joining replicas, in stopping, added MetaModel methods t…
APJansen a145d11
Next step in joining replicas, split back into separate replicas afte…
APJansen 0c0ee66
Rewrite hyperoptimization penalties in terms of single pdf_model
APJansen b871ec6
Make hyperopt losses dependent on multi-replica PDF, moving the conve…
APJansen 8316562
Merge branch 'master' into multi-dense-logistics
APJansen 3cbc9e2
Rewrite weight loading to multi-replica pdf
APJansen c80ec48
Remove loop over pdf_models when registering photon
APJansen ca65c95
Fix saturation penalty to give loss per replica, fix test
APJansen d20968d
Fix test_vpinterface by splitting pdf into single replicas in the test
APJansen dbd1fb6
Change individual replica PDF from Lambda layer to MetaModel (tempora…
APJansen c63f331
Fix getting of add photon layer
APJansen 4b84d1c
range(replicas) -> replicas
APJansen a39d792
load weights using replica indices starting from 0 rather than the va…
APJansen ee43aab
Another fix...
APJansen ebdbac6
Move joining of replicas back further to directly after creation of N…
APJansen 6254018
Add default 1 for replicas in msr
APJansen e69926d
Fix msr test, adding missing replica dimensions
APJansen 08ea3e5
Rewrite photon layer to work on all replicas
APJansen f03fd68
concatenate -> stack
APJansen 01d9f0f
Reshape photon integrals tensor
APJansen 1e2b50d
Fix loading of weights from file
APJansen b919773
PDF_0 -> PDFs in registering photon
APJansen 60b97f3
Temporary fix for loading of replica other than 0
APJansen d5d88a8
Stack photon replicas
APJansen 590cebc
Adapt photon test to new structure
APJansen e03255a
Fix splitting to single replicas
APJansen 0354097
Add wrapper function to attach single replica models
APJansen 78c973f
Fix bug replacing replica numbers in weight names
APJansen 060274b
Cleanup
APJansen 105da0f
Fix tests
APJansen f4c9b3a
replicas=[1] instead of [0] for photon?
APJansen 47c250e
Remove reference to pdf_models
APJansen d70698b
Fix bug with get_replica_weights passing a reference rather than the …
APJansen 8fd6615
Fix issue where Keras recognised single replica models as layers of m…
APJansen aa2d228
Fix issue with weight names
APJansen a84559f
Fix issue with running multiple replicas in sequence.
APJansen a1c5a0e
Fix test, update argument parallel_models->num_replicas
APJansen 27701f4
Fix bug with subtract_one
APJansen 515f7a7
Add test of split_replicas
APJansen 97eb8c9
remove unused variable
APJansen 261cabb
remove unused argument
APJansen d34554c
Remove unused arguments
APJansen 94222e6
Pass on out argument
APJansen 12f9939
Use a single replica generator rather than a fixed list
APJansen a28da06
Define NN and preprocessing_factor as constants
APJansen 2ea4878
Simplify input generation in msr test
APJansen 552bc97
Remove unused photon attributes
APJansen f0359d7
Revert "Remove unused photon attributes"
APJansen 9d7c493
Add exception in case photons and multiple replicas are combined
APJansen dcf9684
Merge branch 'master' into multi-dense-logistics
APJansen ab219a6
Rename NN, preprocessing prefixes
APJansen 8cb24e9
Add error if no generator set
APJansen 50d77f5
Add comments
APJansen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.