Added option for more efficient graph matching matrix operations #1046
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
bdpedigo
changed the title
bdpedigo
approved these changes
Jul 31, 2023
|
@bkj just a reminder about the CLA bot, I think everything else is good to go! |
|
How to accept CLA? https://github.com/microsoft/graspologic/blob/dev/CONTRIBUTING.md says the CLA-bot will comment, but not seeing that |
|
@microsoft-github-policy-service agree |
bdpedigo
added a commit
that referenced
this pull request
Sep 29, 2023
* Added Python 3.11 (#1039) * add python 3.11 * fix numba dep warning * add release note entry (#1040) * Updated heatmap (#750) * test pytest ini * add binary_heatmap, updates to tutorial notebook * test plotting * re-add pytest.ini * Update plot.py Fix a few bugs * add new tests * Update setup.cfg * remove binary_heatmap * mpl version req back to normal * remove binary_heatmap import * black * formatting fix --------- Co-authored-by: Benjamin Pedigo <benjamindpedigo@gmail.com> * Fixed bugs in type specifications from Numpy 1.25 release (#1047) * attempted fix for matrix type erroring * fix spec of csr_array * add a random seed * remove isspmatrix * fix a type check * black * Added option for more efficient graph matching matrix operations (#1046) * more efficient graph matching matrix operations * fix formatting * remove an unused import (unrelated) * expose fast kwarg to user, docs * run black formatter * add typehint * fix mypy --------- Co-authored-by: bkj <ben@jataware.com> Co-authored-by: bdpedigo <benjamindpedigo@gmail.com> * Added an `ax` argument for `screeplot` * Add ax argument to screeplot (now returns None) * add a return value for screeplot() * Refactored for best practices * Fixed Matplotlib 3.8 compatibility issues (#1049) * specify angle as kwarg * try removing some maybe unnecessary code? * fight with mypy * black * fix sorts * try switch to explain * fix intersphinx * other instances of wrong tutorial intersphinx * 3.3.0 release prep (#1050) * add release notes * bump version --------- Co-authored-by: Alex Loftus <alexloftus2004@gmail.com> Co-authored-by: Ben Johnson <bkj.322@gmail.com> Co-authored-by: bkj <ben@jataware.com> Co-authored-by: Prajwal Agrawal <61898798+kidkoder432@users.noreply.github.com>
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.
Reference Issues/PRs
N/A
What does this implement/fix? Briefly explain your changes.
Changed internal
match/solver.pycode to:trace(X @ Y)more efficientlyAny other comments?
The modified implementation definitely avoids unnecessary computation. Benchmarking this algorithm is hard (very data dependent) so YMMV, but these changes give a 1.5-2x speedup for the settings that I tested.
Additional Information