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

Conversation

scarlehoff
Copy link
Member

@scarlehoff scarlehoff commented Jan 19, 2024 •
edited
Loading

Dummy branch to merge the latest changes to a single branch and run tests before merging to master.

Reopening this branch with a change in the concurrency rules as I just realized that parallel branches had the same ref

Fitbot for the python part: #1913 (comment)

Rules to merge the other 2 PR: #1913 (comment)

@scarlehoff scarlehoff added destroyingc++ devtools Build, automation and workflow Refactoring escience run-fit-bot Starts fit bot from a PR. labels Jan 19, 2024
@github-actions GitHub Actions
Copy link

Greetings from your nice fit 🤖 !
I have good news for you, I just finished my tasks:

Check the report carefully, and please buy me a ☕ , or better, a GPU 😉!

@scarlehoff
Copy link
Member Author

scarlehoff commented Jan 23, 2024 •
edited
Loading

I'm going to merge this. I want to make sure that anything starting new branches off here.

#1881 and #1799 will be merged to master probably later this week unless problems are found during the review.

Edit: I wonder whether anyone other than @Radonirinaunimi has tested this but the sooner we start using it the sooner we find the possible bugs...

@scarlehoff scarlehoff mentioned this pull request Jan 23, 2024
Merged
3 tasks
scarlehoff and others added 21 commits January 24, 2024 09:50
@scarlehoff
change the concurrency group of tests.yaml
836c30e
@scarlehoff
add first attempt to a python-only installation
e900776
@scarlehoff
hide fiatlux import
1f21782
@scarlehoff
delay the deprecation
49c430e
@scarlehoff
try modifying cmake with my eyes closed
759104d
@scarlehoff
add poetry to host
62a75b0
@scarlehoff
remove complicated and costly versioning mechanisms :D
ccf9b3c
@scarlehoff
dont use cmake to install python
78a9cda
@scarlehoff
dont ignore _version while installing
c19f25c
@scarlehoff
set the version of poetry dynamic etc
0bc3529
@scarlehoff
remove the setup.py for vp and n3fit
b853766
@scarlehoff
put back the python install within cmake
add03e6
@scarlehoff
remove version tuple
88d2e1b
@scarlehoff
specify the commit of reportengine
59a81a4
@scarlehoff @RoyStegeman
Update validphys2/src/validphys/nnprofile.yaml
7862423 
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
@scarlehoff
update references in the docs to nnpdfcpp and share
5d0bfda
@scarlehoff
add a mention to the fact that the share folder has been moved
1dc8a80
@scarlehoff @RoyStegeman
Update pyproject.toml
609aa60 
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
@scarlehoff @RoyStegeman
Update pyproject.toml
5a6c4a5 
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
@scarlehoff @RoyStegeman
Update CMakeLists.txt
a570ed6 
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
@scarlehoff
error out if path not found
e38f736
APJansen and others added 25 commits January 24, 2024 09:50
@APJansen @scarlehoff
Add constant arguments
a82d6ad
@APJansen @scarlehoff
Move dropout to generate_nn
e399537
@APJansen @scarlehoff
Move concatenation of per_flavor layers into generate_nn
ce8ebb1
@APJansen @scarlehoff
Make the two layer generators almost equal
f765cc2
@APJansen @scarlehoff
remove separate dense and dense_per_flavor functions
0098a02
@APJansen @scarlehoff
Add documentation.
b76d3fd
@APJansen @scarlehoff
Simplify per_flavor layer concatenation
cd8ee50
@APJansen @scarlehoff
Reverse order of loops over replicas and layers
e1b9b8a
@APJansen @scarlehoff
Fixes for dropout
5925966
@APJansen @scarlehoff
Fixes for per_flavour
d1136dc
@APJansen @scarlehoff
Fix issue with copying over nodes for per_flavour layer
06448f6
@APJansen @scarlehoff
Fix seeds in per_flavour layer
50e5027
@APJansen @scarlehoff
Add error for combination of dropout with per_flavour layers
d0d6dc7
@APJansen @scarlehoff
Add basis_size argument to per_flavour layer
e49c830
@APJansen @scarlehoff
Fix model_gen tests to use new generate_nn in favor of now removed ge…
eab342e 
…nerate_dense and generate_dense_per_flavour
@APJansen @scarlehoff
Allow for nodes to be a tuple
29b753b
@APJansen @scarlehoff
Move dropout, per_flavour check to checks
ed186ef
@APJansen @scarlehoff
Clarify layer type check
917ab42 
Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>
@APJansen @scarlehoff
Clarify naming in nn_generator
9c2566a
@APJansen @scarlehoff
Remove initializer_name argument
6d306f7
@APJansen @scarlehoff
clarify comment
d73f9f0 
Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>
@APJansen @scarlehoff
Add comment on shared layers
eb7f49e
@APJansen @scarlehoff
Rewrite comprehension over replica seeds
b5fffdd
@APJansen @scarlehoff
Add check on layer type
fc2cb9f
@scarlehoff
add a helpful message for people who installed last before 4.0.8
8cb04b3
@scarlehoff
Copy link
Member Author

force-pushed and rebase before merging to be absolutely sure that no commit sneaks in before the 4.0.8 tag

I know it might not be feasible to do this with all PRs but I really want the history prior to that tag to be completely clean in case we find any bugs and have to understand which fits are affected. As soon as the tests are done I'll merge this to master.

@scarlehoff scarlehoff merged commit af3306a into master Jan 24, 2024
8 checks passed
@scarlehoff scarlehoff deleted the develop_merge_20240119 branch January 24, 2024 09:32
@scarlehoff scarlehoff removed the run-fit-bot Starts fit bot from a PR. label Jan 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@APJansen APJansen Awaiting requested review from APJansen

Assignees
No one assigned
Labels
destroyingc++ devtools Build, automation and workflow escience Refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@scarlehoff @APJansen