Remove need for _template.yaml by evagroenendijk · Pull Request #223 · NNPDF/pineko

evagroenendijk · 2025-05-23T15:26:39Z

Remove the need for _template.yaml as in issue #202

evagroenendijk · 2025-06-19T10:12:06Z

https://github.com/NNPDF/pineko/blob/f4097f29dec964e8b2c17818b502575ffa3444f0/tests/test_evolve.py#L55C1-L55C43

@scarlehoff Could I maybe just remove this test? I could make it check that the theory cards' Q0 is the same as the default one, but to me it seems a bit superfluous

scarlehoff · 2025-06-19T10:14:18Z

Sure, shuffling around the _template and the operators might change which tests are needed.

felixhekhorn

some quick things I noticed last week

Co-authored-by: Felix Hekhorn <felixhekhorn@users.noreply.github.com>

…_template

evagroenendijk · 2026-05-20T07:37:35Z

@felixhekhorn The regression benchmark comparing convolved predictions failed, but the maximal relative difference is 0.03497747. Would you say it's close enough?

…exact

scarlehoff · 2026-05-25T09:51:43Z

Let me know when I should try to test this again!

Btw, perhaps it would be good to rebase on top of master (or merge the changes from master)?

evagroenendijk · 2026-05-25T15:07:23Z

@scarlehoff Yes thanks, I implemented the changes you suggested and made the necessary adjustment, let me know if you agree! Sorry, I took the day off on Friday so I just finished it today

scarlehoff · 2026-05-26T11:54:14Z

Thanks, this now works for me in a folder with no template and

It would be great if @kamillaurent could check explicitly that the fktables he computed didn't change. The best course of action is to select to datasets (one hadronic, one DIS, they can be quite small so that it goes faster), ideally from a theory with scale variations, and check that the results of the fktables ran with this branch are identical to the previous ones.

…_template

scarlehoff · 2026-06-01T11:18:00Z

@kamillaurent did you have a change to test this?

kamillaurent · 2026-06-01T11:26:35Z

@scarlehoff no, because I saw there was movement on the PR. Also I am working on PR #247 and I thought it would be easier to test this after merging the previous one (so I apply the changes on top of it and I test if everything is consistent).

If for some reason PR #247 can't be merged in the short term, I will test this one without waiting for the other to be merged.

scarlehoff · 2026-06-01T11:34:49Z

@evagroenendijk is this one final?

@kamillaurent I'm actually unsure what the best course of action is, because these two have conflicting changes. If you confirm that #247 is now final, I will merge that one and, if @evagroenendijk confirms this one is also final, we can merge master into this branch (I favour rebase but it would require too much manual work) and then you test that

(but it is important that you test with an exact commit that is available the repo)

kamillaurent · 2026-06-01T11:40:31Z

I confirm that #247 is final, if you have no other change request.

felixhekhorn

I dislike the fact that ipd=4 is now defined in several places, but for the sake of getting this PR done I will ignore it here for the moment ...

felixhekhorn · 2026-06-01T12:50:15Z

-@click.option(
-    "--ipd", default=4, show_default=True, help="interpolation polynomial degree"
-)
-@click.option("--iil", default=True, show_default=True, help="interpolation is log")


why did you remove the options from the ekos command?

I removed them from the fonll command because Juan Cruz mentioned that these options are not there for fonll (that there is only the option for n_cores)

right, I forgot the above comment ... well then I'm not sure I agree, but for the sake of merging this ASAP we can leave as is and see if this generates problems (which it won't, I think, we never change these settings)

I think there was a bit of miscommunication there ^^U

I meant there was no theory card option in the fonll command.

@felixhekhorn if we never change these settings then I would remove them also from the operator card command in the not-fonll runs.

@felixhekhorn if we never change these settings then I would remove them also from the operator card command in the not-fonll runs.

I have never seen them being changed in real life ... for the sake of simplifying we can remove them also in the file-based CLI (either in this PR or in a separate one)

…1 in the operator card Co-authored-by: Felix Hekhorn <felixhekhorn@users.noreply.github.com>

evagroenendijk · 2026-06-03T08:50:32Z

@evagroenendijk is this one final?

@kamillaurent I'm actually unsure what the best course of action is, because these two have conflicting changes. If you confirm that #247 is now final, I will merge that one and, if @evagroenendijk confirms this one is also final, we can merge master into this branch (I favour rebase but it would require too much manual work) and then you test that

(but it is important that you test with an exact commit that is available the repo)

@scarlehoff up to me this is final and can be reviewed!

felixhekhorn

The _template.ci.yaml needs to be also removed from the server after merging

Changes have been applied.

scarlehoff · 2026-06-03T11:25:18Z

@kamillaurent please perform the discussed test and then we can merge!

evagroenendijk added 2 commits May 23, 2025 17:18

Introduction of template.py to contain constants and xgrid

dd2cb06

Introduction of template.py to contain constants and xgrid

51eb28b

evagroenendijk self-assigned this May 23, 2025

evagroenendijk linked an issue May 23, 2025 that may be closed by this pull request

Remove operator_cards (and _template.yaml) #202

Open

felixhekhorn added the enhancement New feature or request label May 26, 2025

Removal of need of _template.yaml

756be45

evagroenendijk added 4 commits June 19, 2025 12:18

Remove test that checks q0 from theory card & _template.py

ed25c7d

Remove unnecessary stuff from template.py

b0350dc

Resolve conflicts with master

44d784a

Forgot to add template.py

22d9ac2

felixhekhorn requested changes Apr 14, 2026

View reviewed changes

Comment thread src/pineko/template.py Outdated

Comment thread src/pineko/template.py Outdated

evagroenendijk and others added 12 commits April 14, 2026 15:23

Remove eko version from template.py

5f7394b

Co-authored-by: Felix Hekhorn <felixhekhorn@users.noreply.github.com>

changes needed for merge with main

7c973d2

change ev_op_iterations

f560b91

Co-authored-by: Felix Hekhorn <felixhekhorn@users.noreply.github.com>

Adjusted function in cli and changed last thing in evolve.py

5b931b6

Merge branch 'remove_template' of github.com:NNPDF/pineko into remove…

a2973ab

…_template

Change ValueError of evolution method

53b193b

Adjust evolve benchmark

d8332f9

Change ValueError into warning

4c9ee46

Change error into warning and remove unnecessary import

7b06030

Add missing keys to template

b714df0

fix formatting of scripts and change debug settings to false

8e23b88

Last changes to pass last test, had forgotten some keys in template.py

3664fa2

scarlehoff self-requested a review May 19, 2026 12:34

scarlehoff marked this pull request as ready for review May 19, 2026 12:35

felixhekhorn requested changes May 19, 2026

View reviewed changes

Comment thread benchmarks/bench_regression.py Outdated

Comment thread src/pineko/opcard_template.py

Comment thread src/pineko/evolve.py Outdated

new regression data

89304e2

felixhekhorn requested changes May 21, 2026

View reviewed changes

Comment thread src/pineko/evolve.py Outdated

evagroenendijk added 2 commits May 21, 2026 17:12

Set inversion method to expanded for truncated and exact for iterate-…

37242b3

…exact

Remove time_like and polarized keys from operator card

7a3167c

felixhekhorn reviewed May 22, 2026

View reviewed changes

Comment thread src/pineko/evolve.py Outdated

Comment thread src/pineko/evolve.py Outdated

Comment thread src/pineko/evolve.py Outdated

evagroenendijk added 5 commits May 25, 2026 12:30

Add early exit if ModEv or IterEv are not set in theory card

b7ba5e1

Remove NEEDED_FILES

9240191

Fix mistake in scaffold.py

ad4ceda

Merge branch 'main' into remove_template

979e5b6

Changes from pre-commit

4dd2298

evagroenendijk requested a review from scarlehoff May 25, 2026 15:06

felixhekhorn reviewed May 26, 2026

View reviewed changes

Comment thread src/pineko/evolve.py Outdated

Apply suggestion from @felixhekhorn

9fc1570

evagroenendijk added 2 commits May 27, 2026 14:25

Add cli options to fonll commands

5fc8b6b

Merge branch 'remove_template' of github.com:NNPDF/pineko into remove…

d45f340

…_template

scarlehoff reviewed May 28, 2026

View reviewed changes

Comment thread src/pineko/cli/theory_.py Outdated

evagroenendijk added 2 commits May 28, 2026 14:47

Remove ipd and iil from fonll ekos command

515c806

Remove some unnecessary keys

dd06d83

felixhekhorn requested changes Jun 1, 2026

View reviewed changes

Apply suggestion from @felixhekhorn to let n_cores be set to default …

406fe39

…1 in the operator card Co-authored-by: Felix Hekhorn <felixhekhorn@users.noreply.github.com>

felixhekhorn approved these changes Jun 3, 2026

View reviewed changes

Conversation

evagroenendijk commented May 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

evagroenendijk commented Jun 19, 2025

Uh oh!

scarlehoff commented Jun 19, 2025

Uh oh!

felixhekhorn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

evagroenendijk commented May 20, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

scarlehoff commented May 25, 2026

Uh oh!

evagroenendijk commented May 25, 2026

Uh oh!

Uh oh!

scarlehoff commented May 26, 2026

Uh oh!

Uh oh!

scarlehoff commented Jun 1, 2026

Uh oh!

kamillaurent commented Jun 1, 2026

Uh oh!

scarlehoff commented Jun 1, 2026

Uh oh!

kamillaurent commented Jun 1, 2026

Uh oh!

felixhekhorn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

felixhekhorn Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

evagroenendijk Jun 3, 2026

Choose a reason for hiding this comment

Uh oh!

felixhekhorn Jun 3, 2026

Choose a reason for hiding this comment

Uh oh!

scarlehoff Jun 3, 2026

Choose a reason for hiding this comment

Uh oh!

felixhekhorn Jun 3, 2026

Choose a reason for hiding this comment

Uh oh!

evagroenendijk commented Jun 3, 2026

Uh oh!

felixhekhorn left a comment

Choose a reason for hiding this comment

Uh oh!

scarlehoff commented Jun 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

evagroenendijk commented May 23, 2025 •

edited

Loading