tokens: speed up duplication of Tokens objects #5325
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oliver-sanders
force-pushed
the
tokens-duplicate
branch
from
3803e91
to
2219798
Compare
8 tasks
MetRonnie
reviewed
Jan 24, 2023
Co-authored-by: Ronnie Dutta <61982285 [email protected]>
|
Nice! |
datamel
reviewed
Jan 24, 2023
There was a problem hiding this comment.
In the integration tests, the id is currently a posix path which is breaking them with this change. I'm guessing mypy doesn't check tests.
This diff fixes it:
diff --git a/tests/integration/test_reinstall.py b/tests/integration/test_reinstall.py
index 02be406bc..8b13c5574 100644
--- a/tests/integration/test_reinstall.py
b/tests/integration/test_reinstall.py
@@ -80,7 80,7 @@ def one_run(one_src, test_dir, run_dir):
)
return SimpleNamespace(
path=w_run_dir,
- id=w_run_dir.relative_to(run_dir),
id=str(w_run_dir.relative_to(run_dir)),
)
|
That's a genuine test fail, in if args:
if len(args) > 1:
raise ValueError()
if isinstance(args[0], str):
kwargs = tokenise(args[0], relative)
else:
> kwargs = dict(args[0])
E TypeError: 'PosixPath' object is not iterable
cylc/flow/id.py:113: TypeError |
|
Fix? diff --git a/tests/integration/test_reinstall.py b/tests/integration/test_reinstall.py
index 02be406bc..8b13c5574 100644
--- a/tests/integration/test_reinstall.py
b/tests/integration/test_reinstall.py
@@ -80,7 80,7 @@ def one_run(one_src, test_dir, run_dir):
)
return SimpleNamespace(
path=w_run_dir,
- id=w_run_dir.relative_to(run_dir),
id=str(w_run_dir.relative_to(run_dir)),
) |
|
Argghhh, @datamel bet me to it!!! (she must have been working late!). Still, same fix suggested - great minds think alike 😁 |
|
Ta for the fix both :) |
|
Added a collective changelog for all three efficiency changes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sometimes we need to duplicate a
Tokensobject.Currently this works by doing
tokenise(detokenise(tokens))which is really inefficient (I should know better, I've moaned about this in the cycler classes before!).This PR switches to using the already parsed values held in the
tokensobject.Using the example from #5315 with
-s TASKS=25 -s CYCLES=1this reduces the time taken byincrement_graph_windowby ~50% after the changes from #5319 and #5321 have been applied.Before (with #5319 & #5321)
After (still with #5319 & #5321)
Check List
CONTRIBUTING.mdand added my name as a Code Contributor.setup.cfgandconda-environment.yml.CHANGES.mdentry included if this is a change that can affect users?.?.xbranch.