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

Jump to bottom

Go from one step being an epoch to one step being a batch #1802

Closed
wants to merge 71 commits into from
Closed

Go from one step being an epoch to one step being a batch #1802

wants to merge 71 commits into from

Commits on Jan 17, 2024

  1. Move replica loop into generate_nn function

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2a49b60 View commit details
    Browse the repository at this point in the history

  2. Simplify handling of dropout

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    9c23fa5 View commit details
    Browse the repository at this point in the history

  3. Factor out layer_generator in generate_dense_network

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    683e354 View commit details
    Browse the repository at this point in the history

  4. Refactor dense_per_flavor_network

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    d02e118 View commit details
    Browse the repository at this point in the history

  5. Move setting of last nodes to generate_nn

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    f907d7f View commit details
    Browse the repository at this point in the history

  6. Add constant arguments

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    aa76bc7 View commit details
    Browse the repository at this point in the history

  7. Add constant arguments

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    1ad7960 View commit details
    Browse the repository at this point in the history

  8. Move dropout to generate_nn

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    7758497 View commit details
    Browse the repository at this point in the history

  9. Move concatenation of per_flavor layers into generate_nn

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2d388d9 View commit details
    Browse the repository at this point in the history

  10. Make the two layer generators almost equal

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    1ef87dc View commit details
    Browse the repository at this point in the history

  11. remove separate dense and dense_per_flavor functions

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    806e2c1 View commit details
    Browse the repository at this point in the history

  12. Add documentation.

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    bdbc3c3 View commit details
    Browse the repository at this point in the history

  13. Simplify per_flavor layer concatenation

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e3f9f0c View commit details
    Browse the repository at this point in the history

  14. Reverse order of loops over replicas and layers

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    3d9070f View commit details
    Browse the repository at this point in the history

  15. Fixes for dropout

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c8300c8 View commit details
    Browse the repository at this point in the history

  16. Fixes for per_flavour

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    0cf23f2 View commit details
    Browse the repository at this point in the history

  17. Fix issue with copying over nodes for per_flavour layer

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    b0a8e3b View commit details
    Browse the repository at this point in the history

  18. Fix seeds in per_flavour layer

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    97d2efe View commit details
    Browse the repository at this point in the history

  19. Add error for combination of dropout with per_flavour layers

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    4c4a2d5 View commit details
    Browse the repository at this point in the history

  20. Add basis_size argument to per_flavour layer

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2287194 View commit details
    Browse the repository at this point in the history

  21. Fix model_gen tests to use new generate_nn in favor of now removed ge… 

    …nerate_dense and generate_dense_per_flavour
    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2f68e3d View commit details
    Browse the repository at this point in the history

  22. Allow for nodes to be a tuple

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    4dd1649 View commit details
    Browse the repository at this point in the history

  23. Move dropout, per_flavour check to checks

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    6bd6466 View commit details
    Browse the repository at this point in the history

  24. Clarify layer type check 

    Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>
    @APJansen @scarlehoff
    APJansen and scarlehoff committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2cd9e52 View commit details
    Browse the repository at this point in the history

  25. Clarify naming in nn_generator

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    1ae1b84 View commit details
    Browse the repository at this point in the history

  26. Remove initializer_name argument

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e7a7cb4 View commit details
    Browse the repository at this point in the history

  27. clarify comment 

    Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>
    @APJansen @scarlehoff
    APJansen and scarlehoff committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    07c1e7d View commit details
    Browse the repository at this point in the history

  28. Add comment on shared layers

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    25b8308 View commit details
    Browse the repository at this point in the history

  29. Rewrite comprehension over replica seeds

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    692014b View commit details
    Browse the repository at this point in the history

  30. Add check on layer type

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    903c75b View commit details
    Browse the repository at this point in the history

  31. Merge prefactors into single layer

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a8fcfd3 View commit details
    Browse the repository at this point in the history

  32. Add replica dimension to preprocessing factor in test

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    661d39a View commit details
    Browse the repository at this point in the history

  33. Update preprocessing layer in vpinterface

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    6641253 View commit details
    Browse the repository at this point in the history

  34. Remove assigning of weight slices

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    633a5c4 View commit details
    Browse the repository at this point in the history

  35. Simplify loading weights from file

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    019fd56 View commit details
    Browse the repository at this point in the history

  36. Update regression data

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    3c7607e View commit details
    Browse the repository at this point in the history

  37. Always return a single NNs model for all replicas, adjust weight gett… 

    …ing and setting accordingly
    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    6d8d6b2 View commit details
    Browse the repository at this point in the history

  38. Revert "Update regression data" 

    This reverts commit 6f79368.
    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    4e18e92 View commit details
    Browse the repository at this point in the history

  39. Change structure of regression weights

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    47d5cab View commit details
    Browse the repository at this point in the history

  40. Remove now unused postfix

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e3ef5f0 View commit details
    Browse the repository at this point in the history

  41. Update regression weights

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    3ddf629 View commit details
    Browse the repository at this point in the history

  42. Give explicit shape to scatter_to_one

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    023a8d2 View commit details
    Browse the repository at this point in the history

  43. Update developing weights structure

    @APJansen
    APJansen committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    25de95c View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. fix prefix typo

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    2240560 View commit details
    Browse the repository at this point in the history

  2. add double ticks

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    e38f359 View commit details
    Browse the repository at this point in the history

  3. rename layer name constants

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a40c216 View commit details
    Browse the repository at this point in the history

  4. use constants defined in metamodel.py for layer names

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c095381 View commit details
    Browse the repository at this point in the history

  5. Explain need for is_stacked_single_replicas

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    115e30c View commit details
    Browse the repository at this point in the history

  6. shorten line

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    8f4a596 View commit details
    Browse the repository at this point in the history

  7. fix constant loading

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    3568bbb View commit details
    Browse the repository at this point in the history

  8. Simplify get_replica_weights

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    7de2b59 View commit details
    Browse the repository at this point in the history

  9. NNs -> all_NNs

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    3fba42f View commit details
    Browse the repository at this point in the history

  10. Clarify get_layer_replica_weights 

    Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>
    @APJansen @scarlehoff
    APJansen and scarlehoff committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a1c46ec View commit details
    Browse the repository at this point in the history

  11. Clarify set_layer_replica_weights

    @APJansen
    APJansen committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    3557ee6 View commit details
    Browse the repository at this point in the history

  12. Remove comment about python 3.11 

    Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>
    @APJansen @scarlehoff
    APJansen and scarlehoff committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    2001e63 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Merge prefactors into single layer

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    be29387 View commit details
    Browse the repository at this point in the history

  2. Add MultiDense layer

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    92d21a3 View commit details
    Browse the repository at this point in the history

  3. Add MultiDense layer improvements

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    efcfc6a View commit details
    Browse the repository at this point in the history

  4. Recreate initializer per replica to make sure seed is properly set

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    0e3dd2c View commit details
    Browse the repository at this point in the history

  5. Add tolerences to test

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    4e81bf6 View commit details
    Browse the repository at this point in the history

  6. Add multi_dense path in generate_nn

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    08a3a18 View commit details
    Browse the repository at this point in the history

  7. Add MultiDropout

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    a84d8ac View commit details
    Browse the repository at this point in the history

  8. Replace old dense layer everywhere

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    ef336e1 View commit details
    Browse the repository at this point in the history

  9. Remove MultiDropout, not necessary

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    737ed2b View commit details
    Browse the repository at this point in the history

  10. Update developing weights structure

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    a5c6b11 View commit details
    Browse the repository at this point in the history

  11. Remove MultiDropout once more

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    93a5636 View commit details
    Browse the repository at this point in the history

  12. Fix naming inconsistency wrt parallel-prefactor

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    c07a49b View commit details
    Browse the repository at this point in the history

  13. Merge prefactors into single layer

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    c77add6 View commit details
    Browse the repository at this point in the history

  14. Add MultiDense layer improvements

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    304b400 View commit details
    Browse the repository at this point in the history

  15. Replace old dense layer everywhere

    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    a658304 View commit details
    Browse the repository at this point in the history

  16. Avoid TensorFlow overhead by making one step a batch rather than an 

    epoch.

Avoids memory overhead by only combining up to 100 steps into one epoch,
and not changing anything when using only 1 replica (i.e. on CPU).
    @APJansen
    APJansen committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    0fa674d View commit details
    Browse the repository at this point in the history