Skip to content

gh-102578: Optimise setting and deleting mutable attributes on non-dataclass subclasses of frozen dataclasses - #102573

Merged
ericvsmith merged 15 commits into
python:mainfrom
XuehaiPan:dataclasses-lookup
Mar 11, 2023
Merged

gh-102578: Optimise setting and deleting mutable attributes on non-dataclass subclasses of frozen dataclasses#102573
ericvsmith merged 15 commits into
python:mainfrom
XuehaiPan:dataclasses-lookup

Conversation

@XuehaiPan

@XuehaiPanXuehaiPan commented Mar 10, 2023

Copy link
Copy Markdown
Contributor

Creating dataclasses with argument frozen=True will automatically generate methods __setattr__ and __delattr__ in _frozen_get_del_attr.

This PR changes tuple-based lookup to set-based lookup. Reduce the time complexity from $O(n)$ to $O(1)$.

In [1]: # tuple-basedIn [2]: %timeit'a'in ('a', 'b', 'c', 'd', 'e', 'f', 'g')
9.91ns ± 0.0982nsperloop (mean ± std. dev. of7runs, 100,000,000loopseach)
In [3]: %timeit'd'in ('a', 'b', 'c', 'd', 'e', 'f', 'g')
33.2ns ± 0.701nsperloop (mean ± std. dev. of7runs, 10,000,000loopseach)
In [4]: %timeit'g'in ('a', 'b', 'c', 'd', 'e', 'f', 'g')
56.4ns ± 0.818nsperloop (mean ± std. dev. of7runs, 10,000,000loopseach)
In [5]: # set-basedIn [6]: %timeit'a'in {'a', 'b', 'c', 'd', 'e', 'f', 'g'}
11.3ns ± 0.0723nsperloop (mean ± std. dev. of7runs, 100,000,000loopseach)
In [7]: %timeit'd'in {'a', 'b', 'c', 'd', 'e', 'f', 'g'}
11ns ± 0.106nsperloop (mean ± std. dev. of7runs, 100,000,000loopseach)
In [8]: %timeit'g'in {'a', 'b', 'c', 'd', 'e', 'f', 'g'}
11.1ns ± 0.126nsperloop (mean ± std. dev. of7runs, 100,000,000loopseach)

A tiny benchmark script:

fromcontextlibimportsuppressfromdataclassesimportFrozenInstanceError, dataclass@dataclass(frozen=True)classFoo2:
a: intb: intfoo2=Foo2(1, 2)
defbench2(inst):
withsuppress(FrozenInstanceError):
inst.a=0withsuppress(FrozenInstanceError):
inst.b=0@dataclass(frozen=True)classFoo7:
a: intb: intc: intd: inte: intf: intg: intfoo7=Foo7(1, 2, 3, 4, 5, 6, 7)
defbench7(inst):
withsuppress(FrozenInstanceError):
inst.a=0withsuppress(FrozenInstanceError):
inst.b=0withsuppress(FrozenInstanceError):
inst.c=0withsuppress(FrozenInstanceError):
inst.d=0withsuppress(FrozenInstanceError):
inst.e=0withsuppress(FrozenInstanceError):
inst.f=0withsuppress(FrozenInstanceError):
inst.g=0classBar(Foo7):
def__init__(self, a, b, c, d, e, f, g):
super().__init__(a, b, c, d, e, f, g)
self.baz=0defbench(inst):
inst.baz=1

Result:

set-based lookup:

In [2]: %timeitbench2(foo2)
1.08µs ± 28.1nsperloop (mean ± std. dev. of7runs, 1,000,000loopseach)
In [3]: %timeitbench7(foo7)
3.81µs ± 20.3nsperloop (mean ± std. dev. of7runs, 100,000loopseach)
In [4]: %timeitbench(bar)
249ns ± 6.31nsperloop (mean ± std. dev. of7runs, 1,000,000loopseach)

tuple-based lookup (original):

In [2]: %timeitbench2(foo2)
1.15µs ± 10.9nsperloop (mean ± std. dev. of7runs, 1,000,000loopseach)
In [3]: %timeitbench7(foo7)
3.97µs ± 15.7nsperloop (mean ± std. dev. of7runs, 100,000loopseach)
In [4]: %timeitbench(bar)
269ns ± 4.09nsperloop (mean ± std. dev. of7runs, 1,000,000loopseach)

The set-based is constantly faster than the old approach. And the theoretical time complexity is also smaller ($O(1)$ vs. $O(n)$).

Resolves#102578

@bedevere-bot

Copy link
Copy Markdown

Most changes to Python require a NEWS entry.

Please add it using the blurb_it web app or the blurb command-line tool.

@ghost

ghost commented Mar 10, 2023

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed

@XuehaiPanXuehaiPan changed the title Use set-based name lookup rather than tuples for frozen dataclassesgh-102573: Use set-based name lookup rather than tuples for frozen dataclassesMar 10, 2023
Comment threadLib/dataclasses.py Outdated
Comment threadMisc/NEWS.d/next/Library/2023-03-10-10-10-00.gh-issue-102573.GQ7sV6.rst Outdated
@AlexWaygood

AlexWaygood commented Mar 10, 2023

Copy link
Copy Markdown
Member

The issue-number CI check is failing because gh-102573 does not yet exist as a GitHub issue :)

You should create an issue to describe the change you're proposing here, and then link to it in the title of this PR.

@XuehaiPanXuehaiPan changed the title gh-102573: Use set-based name lookup rather than tuples for frozen dataclassesgh-102578: Use set-based name lookup rather than tuples for frozen dataclassesMar 10, 2023
@XuehaiPan

Copy link
Copy Markdown
ContributorAuthor

Opened a linked issue and added some benchmark results.

Comment threadMisc/NEWS.d/next/Library/2023-03-10-13-21-16.gh-issue-102578.-gujoI.rst Outdated
Comment threadMisc/NEWS.d/next/Library/2023-03-10-13-21-16.gh-issue-102578.-gujoI.rst Outdated
XuehaiPanand others added 2 commits March 10, 2023 22:08
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@AlexWaygoodAlexWaygood added performance Performance or resource usage stdlib Standard Library Python modules in the Lib/ directory labels Mar 10, 2023
@AlexWaygood

Copy link
Copy Markdown
Member

Looks like the CLA check has started failing with the latest commit -- if you're using two email address, you may have to sign it with both email addresses, unfortunately :(

@XuehaiPan

Copy link
Copy Markdown
ContributorAuthor

Seems that the CLA check has passed now.

@AlexWaygoodAlexWaygood left a comment

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.

Looks great to me. I verified the speedup by running this benchmark locally (which is a little different to the one you posted in your issue and the one you posted in this PR).

Benchmark:
importdataclassesimportstringimporttimeFoo=dataclasses.make_dataclass(
"Foo",
[(letter, int) forletterinstring.ascii_lowercase],
frozen=True
)
classBar(Foo): ...
instance=Bar(*range(26))
t0=time.perf_counter()
for_inrange(10_000_000):
instance.foo=1delinstance.fooprint(f"{time.perf_counter() -t0:.2f}")

The result of this benchmark is 15.15 seconds on main on my machine (--pgo non-debug build), but 6.44 seconds with this patch applied.

I'll wait for a thumbs-up from @ericvsmith, @carljm, or another core dev before merging, but this has my approval -- thanks!

@AlexWaygoodAlexWaygood changed the title gh-102578: Use set-based name lookup rather than tuples for frozen dataclassesgh-102578: Optimise setting and deleting mutable attributes on non-dataclass subclasses of frozen dataclassesMar 10, 2023
Comment threadLib/dataclasses.py Outdated
else:
# Special case for the zero-length tuple.
# Special case for the zero-length set.
# Use the empty tuple singleton to avoid unnecessary `set` construction

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.

Not that it matters much, but the zero length case could just avoid the or name in ... test entirely. Maybe fields_str should become fields_test, and then set it to or name in {<<generated set literal>>} or set it to an empty string if there are no fields. Then change the generated code to f'if type(self) is cls {fields_test}:' Although that doesn't read very well. Maybe tweak fields_test to be something else.

This could be part of a different PR, or include it here. But in any event I'm not positive that the zero length case actually has a test. We should make sure it does for this PR.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

But in any event I'm not positive that the zero length case actually has a test. We should make sure it does for this PR.

Added a small test for empty frozen dataclass.

Comment threadLib/dataclasses.py Outdated

@carljmcarljm left a comment

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.

Code changes LGTM. A couple comments on the new test.

Comment threadLib/test/test_dataclasses.py Outdated
Comment threadLib/test/test_dataclasses.py
@bedevere-bot

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

And if you don't make the requested changes, you will be put in the comfy chair!

@XuehaiPan

Copy link
Copy Markdown
ContributorAuthor

I have made the requested changes; please review again

@bedevere-bot

Copy link
Copy Markdown

Thanks for making the requested changes!

@carljm, @AlexWaygood: please review the changes made to this pull request.

Comment threadLib/test/test_dataclasses.py Outdated

@carljmcarljm left a comment

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.

Looks good to me; thanks for the perf improvement!

@AlexWaygoodAlexWaygood left a comment

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.

Looks great!

@ericvsmith
ericvsmith merged commit ee6f841 into python:mainMar 11, 2023
@XuehaiPan
XuehaiPan deleted the dataclasses-lookup branch March 11, 2023 04:44
iritkatriel pushed a commit to iritkatriel/cpython that referenced this pull request Mar 12, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

performancePerformance or resource usagestdlibStandard Library Python modules in the Lib/ directory

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Enhancement] Speed up setting and deleting mutable attributes on non-dataclass subclasses of frozen dataclasses

6 participants

@XuehaiPan@bedevere-bot@AlexWaygood@carljm@ericvsmith@TeamSpen210