Hashable Rules by comane · Pull Request #2076 · NNPDF/nnpdf

comane · 2024-05-10T14:43:02Z

Rules (for cuts) are made to tuple instead of list.
This makes them hashable and allows eg them to contained within a TupleComp object

scarlehoff

Thanks for this, could you also remove frozenargs from the conda recipe / pyproject? It should not be needed anymore

(I think this closes #2027 ^^)

comane · 2024-05-13T10:02:00Z

Thanks for this, could you also remove frozenargs from the conda recipe / pyproject? It should not be needed anymore

I am not sure I understand, do you mean frozendict? Because that one is actually still needed

scarlehoff · 2024-05-13T10:17:37Z

Because that one is actually still needed

I thought it was only needed by the filter rules?

scarlehoff · 2024-05-14T09:25:19Z

        self.defaults = defaults
        self.theory_params = theory_parameters
-        ns = {*self.numpy_functions, *self.defaults, *self.variables, "idat", "central_value"}
+        ns = {*self.numpy_functions, *self.defaults.to_dict().keys(), *self.variables, "idat", "central_value"}


Suggested change

ns = {*self.numpy_functions, *self.defaults.to_dict().keys(), *self.variables, "idat", "central_value"}

ns = {*self.numpy_functions, *self.defaults.to_dict(), *self.variables, "idat", "central_value"}

Not that it makes a difference though.

github-actions · 2024-05-15T09:30:24Z

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

Fit Name: NNBOT-fe0eb833d-2024-05-15
Fit Report wrt master: https://vp.nnpdf.science/bu1VEqmmS6irXVJpqdoeTw==
Fit Report wrt latest stable reference: https://vp.nnpdf.science/bfGSwN03SP6b87K0LJMN_Q==
Fit Data: https://data.nnpdf.science/fits/NNBOT-fe0eb833d-2024-05-15.tar.gz

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

github-actions · 2024-05-17T09:51:10Z

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

Fit Name: NNBOT-5a41b02b9-2024-05-17
Fit Report wrt master: https://vp.nnpdf.science/oDGya_qRRxelIE2ASC3DWw==
Fit Report wrt latest stable reference: https://vp.nnpdf.science/Mv7SFT-HTxa-z_OwCFlOKQ==
Fit Data: https://data.nnpdf.science/fits/NNBOT-5a41b02b9-2024-05-17.tar.gz

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

…e dict

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>

…anywhere

…ml file

scarlehoff

Thanks for this, I think this is already finished :)

Just some small comments for parse_filter_defaults.

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>

scarlehoff

Seems ok. I've done a few tests and I haven't seen anything obviously wrong.

RoyStegeman · 2024-05-21T16:15:01Z

+
+
+@dataclasses.dataclass(frozen=True)
+class AddedFilterRule(FilterRule):


What is the purpose of this class?

comane requested a review from scarlehoff May 10, 2024 14:43

comane added the Refactoring label May 12, 2024

comane requested a review from Radonirinaunimi May 12, 2024 14:35

comane mentioned this pull request May 12, 2024

Positivity cuts #2059

Merged

scarlehoff reviewed May 13, 2024

View reviewed changes

Comment thread validphys2/src/validphys/config.py Outdated

Comment thread validphys2/src/validphys/config.py Outdated

Comment thread validphys2/src/validphys/config.py Outdated

Comment thread validphys2/src/validphys/config.py Outdated

comane force-pushed the hashable_rules branch from 2ff4b15 to 2af322f Compare May 13, 2024 09:59

scarlehoff reviewed May 14, 2024

View reviewed changes

Comment thread validphys2/src/validphys/filters.py Outdated

scarlehoff reviewed May 14, 2024

View reviewed changes

Comment thread validphys2/src/validphys/filters.py Outdated

scarlehoff added the run-fit-bot Starts fit bot from a PR. label May 15, 2024

comane force-pushed the hashable_rules branch from 4905ed9 to d9a9475 Compare May 16, 2024 17:36

comane added the enhancement New feature or request label May 17, 2024

scarlehoff removed the run-fit-bot Starts fit bot from a PR. label May 17, 2024

comane and others added 13 commits May 18, 2024 13:58

rules are tuple instead of list -> makes them hashable

fb3bd05

return empty tuple instead of None -> None is not iterable

df6a42b

added FilterDefaults frozen dataclass

82cd476

filter defaults returns FilterDefaults dataclass instead of unhashabl…

90f04da

…e dict

make inputs to produce_rules hashable types. no need for freeze args

a9b7e1c

import validphys.filters at top of module

a600a3f

parse_filter_rules returns tuple of frozendicts

a256b45

check_default_filter_rules returns tuple

ad75add

applied review changes

9d08c61

Introduced FilterRule and AddedFilterRule objects

0c085e0

removed frozendict import in config

2d022aa

applied comments of review

fd9024f

Update validphys2/src/validphys/config.py

4bf928d

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>

comane and others added 9 commits May 18, 2024 13:58

Update validphys2/src/validphys/config.py

d9e3c18

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>

Rule accepts both FilterRule objects as well as Mappings

d542c7d

Update validphys2/src/validphys/filters.py

7da9282

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>

to_dict method of DefaultFilters also takes default None values

610a142

restored previous behaviour of produce_defaults function

214a75a

removed freeze args from get_cuts_for_dataset as args are now hashable

bbfe2c9

removed freeze_args and make_hashable functions as they are not used …

8858d30

…anywhere

removed frozendict dependency from pyproject and conda-recipe/meta.ya…

feae109

…ml file

pass rules as tuple in test

3d7f319

comane force-pushed the hashable_rules branch from 0444884 to 3d7f319 Compare May 18, 2024 12:59

scarlehoff reviewed May 20, 2024

View reviewed changes

Comment thread validphys2/src/validphys/config.py Outdated

Comment thread validphys2/src/validphys/config.py Outdated

scarlehoff mentioned this pull request May 20, 2024

To Do for 4.0.10 #1854

Closed

33 tasks

comane and others added 3 commits May 20, 2024 18:27

Update validphys2/src/validphys/config.py

c2b5659

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>

Update validphys2/src/validphys/config.py

fac5218

Co-authored-by: Juan M. Cruz-Martinez <juacrumar@lairen.eu>

Merge branch 'master' into hashable_rules

3fd9ec5

scarlehoff approved these changes May 21, 2024

View reviewed changes

scarlehoff merged commit d725786 into master May 21, 2024

scarlehoff deleted the hashable_rules branch May 21, 2024 10:24

RoyStegeman reviewed May 21, 2024

View reviewed changes

scarlehoff mentioned this pull request May 22, 2024

Remove the need for frozendict #2027

Closed

	ns = {self.numpy_functions, self.defaults.to_dict().keys(), *self.variables, "idat", "central_value"}
	ns = {self.numpy_functions, self.defaults.to_dict(), *self.variables, "idat", "central_value"}



		@dataclasses.dataclass(frozen=True)
		class AddedFilterRule(FilterRule):

Conversation

comane commented May 10, 2024

Uh oh!

scarlehoff left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

comane commented May 13, 2024

Uh oh!

scarlehoff commented May 13, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

scarlehoff May 14, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented May 15, 2024

Uh oh!

github-actions Bot commented May 17, 2024

Uh oh!

scarlehoff left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

scarlehoff left a comment

Choose a reason for hiding this comment

Uh oh!

RoyStegeman May 21, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants