Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Find potential matches faster #61

Merged
merged 22 commits into from
Oct 26, 2023
Merged

Find potential matches faster #61

merged 22 commits into from
Oct 26, 2023

Conversation

robinmessage
Copy link
Collaborator

Run time for Gola with 18 processes:

real 2m38.122s
user 39m43.770s
sys 0m29.981s

Which is a great improvement.

CPC alignment is off, and I think the matching to k might be slightly broken; I need to test the DRangedTree with the new CPC data to check the relative widths and zero widths are handled correctly.

@patricoferris patricoferris changed the title [DRAFT] Find potential matches faster Find potential matches faster Oct 19, 2023
Copy link
Contributor

@mdales mdales left a comment

Choose a reason for hiding this comment

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

I did a review pass, looks good, just a few things I'd like to see changed before we merge, most "we could do this" comments could become issues if you think they're right Robin.

I must confess that whilst I did get the general idea of DRangedTree works externally, I didn't review the implementation in detail, rather how it was used.

methods/matching/find_potential_matches_fast.py Outdated Show resolved Hide resolved
methods/matching/find_potential_matches_fast.py Outdated Show resolved Hide resolved
methods/matching/find_potential_matches_fast.py Outdated Show resolved Hide resolved
methods/matching/find_potential_matches_fast.py Outdated Show resolved Hide resolved
methods/matching/find_potential_matches_fast.py Outdated Show resolved Hide resolved
methods/matching/find_potential_matches_fast.py Outdated Show resolved Hide resolved
methods/utils/dranged_tree.py Outdated Show resolved Hide resolved
methods/utils/dranged_tree.py Outdated Show resolved Hide resolved
@@ -0,0 +1,401 @@
import argparse
Copy link
Contributor

Choose a reason for hiding this comment

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

This file should replace the old find_potential_matches.py, not sit along side it

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Agree, but holding off until tmf-pipeline is updated to pick this up.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've asked @patricoferris to comment on what he thinks the best plan here is in terms of commit ordering

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the thought, but just go for it, make the change, commit! I can pull arbitrary commits into arbitrary parts of the pipeline, so if I have to do SHA gymnastics to get a hold of the original potential matches codes that's ok (I already do that for other things). I'd rather the merged code have some order to it and the disorder can live in the pipeline should we need that :))

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Agreed, merging once CI agrees.

rerunner.py Outdated Show resolved Hide resolved
Horizontal striping roughly doubled performance, so well worth it
Other changes minor
@robinmessage
Copy link
Collaborator Author

@mdales I think I have fixed everything or made an issue for it, if you wouldn't mind taking another look please?

Copy link
Contributor

@mdales mdales left a comment

Choose a reason for hiding this comment

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

Thanks Robin, LGTM. I'd still rather we replaced the old script rather than had two side by side, so I've asked Patrick to comment about how much that'd break his plans, and if necessary we can make an issue to update things as soon as we can.

@@ -0,0 +1,401 @@
import argparse
Copy link
Contributor

Choose a reason for hiding this comment

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

I've asked @patricoferris to comment on what he thinks the best plan here is in terms of commit ordering

@robinmessage robinmessage merged commit 07a9079 into main Oct 26, 2023
1 check passed
@robinmessage robinmessage deleted the rhm31-cpc-10-faster branch October 26, 2023 16:30
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.

3 participants