-
Notifications
You must be signed in to change notification settings - Fork 139
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
Add dijkstra all_pairs functions #278
Merged
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
This commit adds 2 new api functions all_pairs_dijkstra_shortest_paths() and all_pairs_dijkstra_path_lengths(). These two functions are similar to the existing dijkstra functions but they differ in that it will return dictionaries over all nodes in the graph instead of just for a single user provided node. Additionally these functions are multihreaded and the level of parallelism can be controlled by the appropriate environment variables. Fixes Qiskit#271
Pull Request Test Coverage Report for Build 865105436
💛 - Coveralls |
nahumsa
reviewed
Mar 20, 2021
nahumsa
approved these changes
Mar 20, 2021
This commit expands the test coverage to cover gaps that existed in the earlier testing. This increased test coverage found some bugs when empty graphs or graphs without edges were passed into the new functions, those bugs have been fixed.
I ran some benchmarks last night on this: import time
import retworkx as rx
import networkx as nx
rx_graph = rx.directed_gnp_random_graph(5000, .9)
nx_graph = nx.DiGraph(list(rx_graph.edge_list()))
start = time.time()
rx.digraph_all_pairs_dijkstra_shortest_paths(rx_graph, lambda _: 1)
stop = time.time()
print("retworkx: %s" % str(stop - start))
nx_start = time.time()
# Need to cast as a dict because networkx returns an iterator
dict(nx.all_pairs_dijkstra_path(nx_graph))
nx_stop = time.time()
print("networkx: %s" % str(nx_stop - nx_start))
|
nahumsa
reviewed
Mar 23, 2021
This commit pivots the all pair path lengths function to use a custom return type that removes the overhead of python dict creation.
This commit pivots the all pair path lengths function to use a custom return type that removes the overhead of python dict creation.
nahumsa
reviewed
May 26, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great implementation overall. Using AllPairsPathLenghtMapping
and AllPairsPathMapping
makes it a clean implementation. Just had a few questions regarding the docs.
nahumsa
reviewed
May 26, 2021
Co-authored-by: Nahum Rosa Cruz Sa <49600259+nahumsa@users.noreply.github.com>
nahumsa
approved these changes
May 26, 2021
Merged
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.
This commit adds 2 new api functions all_pairs_dijkstra_shortest_paths()
and all_pairs_dijkstra_path_lengths(). These two functions are similar
to the existing dijkstra functions but they differ in that it will
return dictionaries over all nodes in the graph instead of just for a
single user provided node. Additionally these functions are multihreaded
and the level of parallelism can be controlled by the appropriate
environment variables.
Fixes #271