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

WIP Merging #1914

Merged
merged 66 commits into from
Jan 24, 2024
Merged

WIP Merging #1914

merged 66 commits into from
Jan 24, 2024

Commits on Jan 24, 2024

  1. change the concurrency group of tests.yaml

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    836c30e View commit details
    Browse the repository at this point in the history

  2. add first attempt to a python-only installation

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e900776 View commit details
    Browse the repository at this point in the history

  3. hide fiatlux import

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1f21782 View commit details
    Browse the repository at this point in the history

  4. delay the deprecation

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    49c430e View commit details
    Browse the repository at this point in the history

  5. try modifying cmake with my eyes closed

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    759104d View commit details
    Browse the repository at this point in the history

  6. add poetry to host

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    62a75b0 View commit details
    Browse the repository at this point in the history

  7. remove complicated and costly versioning mechanisms :D

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ccf9b3c View commit details
    Browse the repository at this point in the history

  8. dont use cmake to install python

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    78a9cda View commit details
    Browse the repository at this point in the history

  9. dont ignore _version while installing

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    c19f25c View commit details
    Browse the repository at this point in the history

  10. set the version of poetry dynamic etc

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0bc3529 View commit details
    Browse the repository at this point in the history

  11. remove the setup.py for vp and n3fit

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    b853766 View commit details
    Browse the repository at this point in the history

  12. put back the python install within cmake

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    add03e6 View commit details
    Browse the repository at this point in the history

  13. remove version tuple

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    88d2e1b View commit details
    Browse the repository at this point in the history

  14. specify the commit of reportengine

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    59a81a4 View commit details
    Browse the repository at this point in the history

  15. Update validphys2/src/validphys/nnprofile.yaml 

    Co-authored-by: Roy Stegeman <roystegeman@live.nl>
    @scarlehoff @RoyStegeman
    scarlehoff and RoyStegeman committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    7862423 View commit details
    Browse the repository at this point in the history

  16. update references in the docs to nnpdfcpp and share

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    5d0bfda View commit details
    Browse the repository at this point in the history

  17. add a mention to the fact that the share folder has been moved

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1dc8a80 View commit details
    Browse the repository at this point in the history

  18. Update pyproject.toml 

    Co-authored-by: Roy Stegeman <roystegeman@live.nl>
    @scarlehoff @RoyStegeman
    scarlehoff and RoyStegeman committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    609aa60 View commit details
    Browse the repository at this point in the history

  19. Update pyproject.toml 

    Co-authored-by: Roy Stegeman <roystegeman@live.nl>
    @scarlehoff @RoyStegeman
    scarlehoff and RoyStegeman committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    5a6c4a5 View commit details
    Browse the repository at this point in the history

  20. Update CMakeLists.txt 

    Co-authored-by: Roy Stegeman <roystegeman@live.nl>
    @scarlehoff @RoyStegeman
    scarlehoff and RoyStegeman committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a570ed6 View commit details
    Browse the repository at this point in the history

  21. error out if path not found

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e38f736 View commit details
    Browse the repository at this point in the history

  22. change the nnprofile defaults and definitions

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    667c9e4 View commit details
    Browse the repository at this point in the history

  23. add example nnprofile and expanduser paths

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    b36f5e9 View commit details
    Browse the repository at this point in the history

  24. update documentation on nnprofile

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    d64d665 View commit details
    Browse the repository at this point in the history

  25. add checks for all special nnprofile cases _and_ vp-get

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a1fc6f8 View commit details
    Browse the repository at this point in the history

  26. promote nnpdf_dir to module-level constant

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    b109688 View commit details
    Browse the repository at this point in the history

  27. Apply suggestions from code review 

    Co-authored-by: Roy Stegeman <roystegeman@live.nl>
    @scarlehoff @RoyStegeman
    scarlehoff and RoyStegeman committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    d17fadd View commit details
    Browse the repository at this point in the history

  28. consider the case of an empty profile

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    96e5666 View commit details
    Browse the repository at this point in the history

  29. remove nnpdfcpp

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    b42b4dd View commit details
    Browse the repository at this point in the history

  30. remove more seemingly unused stuff

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    cc21ee6 View commit details
    Browse the repository at this point in the history

  31. restore config.h

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    8d21e90 View commit details
    Browse the repository at this point in the history

  32. dont even try to use cmake in macos

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    20b4d35 View commit details
    Browse the repository at this point in the history

  33. recover curio

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6a65863 View commit details
    Browse the repository at this point in the history

  34. update docs

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    750ac25 View commit details
    Browse the repository at this point in the history

  35. add test for the python installation

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e131863 View commit details
    Browse the repository at this point in the history

  36. Move replica loop into generate_nn function

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    7190917 View commit details
    Browse the repository at this point in the history

  37. Simplify handling of dropout

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a9b2de9 View commit details
    Browse the repository at this point in the history

  38. Factor out layer_generator in generate_dense_network

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    92dd33a View commit details
    Browse the repository at this point in the history

  39. Refactor dense_per_flavor_network

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a3fe282 View commit details
    Browse the repository at this point in the history

  40. Move setting of last nodes to generate_nn

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6ef0758 View commit details
    Browse the repository at this point in the history

  41. Add constant arguments

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    15f75f5 View commit details
    Browse the repository at this point in the history

  42. Add constant arguments

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a82d6ad View commit details
    Browse the repository at this point in the history

  43. Move dropout to generate_nn

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e399537 View commit details
    Browse the repository at this point in the history

  44. Move concatenation of per_flavor layers into generate_nn

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ce8ebb1 View commit details
    Browse the repository at this point in the history

  45. Make the two layer generators almost equal

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    f765cc2 View commit details
    Browse the repository at this point in the history

  46. remove separate dense and dense_per_flavor functions

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0098a02 View commit details
    Browse the repository at this point in the history

  47. Add documentation.

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    b76d3fd View commit details
    Browse the repository at this point in the history

  48. Simplify per_flavor layer concatenation

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    cd8ee50 View commit details
    Browse the repository at this point in the history

  49. Reverse order of loops over replicas and layers

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e1b9b8a View commit details
    Browse the repository at this point in the history

  50. Fixes for dropout

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    5925966 View commit details
    Browse the repository at this point in the history

  51. Fixes for per_flavour

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    d1136dc View commit details
    Browse the repository at this point in the history

  52. Fix issue with copying over nodes for per_flavour layer

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    06448f6 View commit details
    Browse the repository at this point in the history

  53. Fix seeds in per_flavour layer

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    50e5027 View commit details
    Browse the repository at this point in the history

  54. Add error for combination of dropout with per_flavour layers

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    d0d6dc7 View commit details
    Browse the repository at this point in the history

  55. Add basis_size argument to per_flavour layer

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e49c830 View commit details
    Browse the repository at this point in the history

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

    …nerate_dense and generate_dense_per_flavour
    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    eab342e View commit details
    Browse the repository at this point in the history

  57. Allow for nodes to be a tuple

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    29b753b View commit details
    Browse the repository at this point in the history

  58. Move dropout, per_flavour check to checks

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ed186ef View commit details
    Browse the repository at this point in the history

  59. Clarify layer type check 

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

  60. Clarify naming in nn_generator

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    9c2566a View commit details
    Browse the repository at this point in the history

  61. Remove initializer_name argument

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6d306f7 View commit details
    Browse the repository at this point in the history

  62. clarify comment 

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

  63. Add comment on shared layers

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    eb7f49e View commit details
    Browse the repository at this point in the history

  64. Rewrite comprehension over replica seeds

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    b5fffdd View commit details
    Browse the repository at this point in the history

  65. Add check on layer type

    @APJansen @scarlehoff
    APJansen authored and scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    fc2cb9f View commit details
    Browse the repository at this point in the history

  66. add a helpful message for people who installed last before 4.0.8

    @scarlehoff
    scarlehoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    8cb04b3 View commit details
    Browse the repository at this point in the history