Skip to content

Substitution of apfel with eko in evolven3fit #1537

Merged
scarlehoff merged 219 commits into
masterfrom
evolfit_w_eko
Feb 21, 2023
Merged

Substitution of apfel with eko in evolven3fit #1537
scarlehoff merged 219 commits into
masterfrom
evolfit_w_eko

Conversation

@andreab1997
Copy link
Copy Markdown
Contributor

The idea is to have eko perform the evolution (so also avoiding to recompute the operator for each replica). Moreover in this way we will be able to run it automatically at the end of each replica production by n3fit (leaving however the possibility to run the CLI after n3fit).

@andreab1997 andreab1997 requested a review from scarlehoff March 10, 2022 13:04
@andreab1997 andreab1997 self-assigned this Mar 10, 2022
@andreab1997 andreab1997 marked this pull request as draft March 10, 2022 13:31
Comment thread n3fit/src/evolven3fit/evolven3fit_API.py Outdated
Comment thread n3fit/src/evolven3fit/utils.py Outdated
@andreab1997
Copy link
Copy Markdown
Contributor Author

We have a little issue that maybe we want to discuss. Since the function which is actually doing the evolution knows nothing about the number of final replicas (since it is doing the evolution exportgrid wise) we do not have this information to put on the info file (numreplica). What should we do then? Should we give it another argument (num_replicas)? However in that case this means that the CLI and/or the initial runcard must have the information which maybe is not what we want @scarlehoff

@scarlehoff
Copy link
Copy Markdown
Member

scarlehoff commented Mar 11, 2022

We have a little issue that maybe we want to discuss. Since the function which is actually doing the evolution knows nothing about the number of final replicas (since it is doing the evolution exportgrid wise) we do not have this information to put on the info file (numreplica).

The numreplica in the info file should be filled by postfit afterwards so you can just put some dummy value.

Edit: currently evolven3fit does NumMembers: REPLACE_NREP

@scarlehoff
Copy link
Copy Markdown
Member

scarlehoff commented Apr 7, 2022

You can add now eko and banana-hep to conda-recipes/meta.yaml

Also don't modify the current evolven3fit folder since (until we have all ekos for all theories) it will be necessary.

Edit: actually, make sure that (since you are also developing banana-hep and maybe eko) the features that you use for this are part of the packages published and installable with conda

Comment thread conda-recipe/meta.yaml Outdated
@scarlehoff scarlehoff added run-fit-bot Starts fit bot from a PR. and removed run-fit-bot Starts fit bot from a PR. labels Jan 19, 2023
@github-actions
Copy link
Copy Markdown

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
Copy Markdown
Member

Now that the test are passing, I guess this can be merged to master?

Is there any extremely important points that need to be fixed? I would like to have this merged by next week because I totally need this branch for the CMS tutorial in two weeks (if a fit is to be done, I cannot make people wait for one hour to evolve the result... so I have strong reasons to merge it even if it is still not perfect).

@scarlehoff scarlehoff removed the run-fit-bot Starts fit bot from a PR. label Feb 1, 2023
@andreab1997
Copy link
Copy Markdown
Contributor Author

@scarlehoff For me we can merge this if you need it this week.

@scarlehoff
Copy link
Copy Markdown
Member

Yes, for me it is ok. Let's give people until tomorrow during the CM in case anybody wants some (very) specific changes.

Copy link
Copy Markdown
Member

@RoyStegeman RoyStegeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't really review, just two things I noticed as I scrolled through the changes. Given the huge number of commits relative to the changes in this PR, I just wanted to ask if git blame of other files has not been changed somewhere along the way?

Comment thread .gitignore Outdated
Comment on lines +381 to +383
#conda-build
conda_bld/

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want this here? I don't even call my build folders this

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually would also leave the first one! It's .gitignore, I'm fine ignoring anything people find useful.

Comment thread conda-recipe/conda_build_config.yaml Outdated
#without this
numpy:
- 1.19
- 1.21
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still necessary?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know whether it is necessary but I'm not touching conda with a stick in the next three months.

@Zaharid
Copy link
Copy Markdown
Contributor

Zaharid commented Feb 7, 2023

It really doesn't get more specific than

https://github.com/NNPDF/nnpdf/pull/1537/files#r1036915773

@scarlehoff scarlehoff mentioned this pull request Feb 8, 2023
@andreab1997
Copy link
Copy Markdown
Contributor Author

@Zaharid are you ok to merge this now?

Copy link
Copy Markdown
Contributor

@Zaharid Zaharid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not going to keep blocking this but I stand by the claim that the way the LHAPDF grid management works here is deeply flawed and should have been fixed if this project is so urgent. Please open an issue against the library you are using to introduce the interfaces that are clearly needed here, and, upon merging this, another issue in this repo to use the internal apis.

That said, there were several people with other substantive points that it is not clear to me that have been addressed (there are several people with "requested changes" and "comment" status). Indeed it would be good if someone could conduct a proper review and positively approve this.

@alecandido
Copy link
Copy Markdown
Contributor

alecandido commented Feb 16, 2023

Before keep going with reviews and so on, if we are any close to merge, please rebase on master (GitHub is crying for potential conflicts)

Copy link
Copy Markdown
Member

@scarlehoff scarlehoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge this. If nobody stops me explicitly I'll merge it tonight.

If everything explodes we'll live with it.

@scarlehoff scarlehoff merged commit f731e85 into master Feb 21, 2023
@scarlehoff scarlehoff deleted the evolfit_w_eko branch February 21, 2023 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants