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

Replace the internal Fibonacci heap with a 4-ary priority queue #374

Merged
merged 11 commits into from
Jan 12, 2023

Conversation

Jake-Moss
Copy link
Contributor

This PR provides up to a 3.5x performance increase on the various models tested.
It also changes the default behaviour of memory_only mode to default to True, enables the NPY_NO_DEPRECATED_API and NPY_1_7_API_VERSION macros for Unix builds, and restores the language_level to 3 for Cython.

The heap implementation were written by @djfrancesco and has the MIT license preserved as a header in the pq_4ary_heap.pyx file.

Jake-Moss and others added 3 commits January 10, 2023 16:02
Replaces the current heap implementation with one written by François
Pacull.

Change the Dijkstra's implementation to make use of this new heap.
Originally written by François Pacull.

Co-authored-by: djfrancesco <pacullfrancois@gmail.com>
Co-authored-by: chrisobi02 <chrisgobrien02@gmail.com>
Opt for pandas testing over manual assertions.

New reference files are required because the new heap finds equivalent
but different paths.
@pedrocamargo
Copy link
Contributor

For reference. Image created by @chrisobi02
MicrosoftTeams-image

@pedrocamargo
Copy link
Contributor

Congrats to @Jake-Moss , @chrisobi02 & @djfrancesco for the amazing work that went into this PR!!!

@pedrocamargo pedrocamargo merged commit 7c2beb6 into AequilibraE:develop Jan 12, 2023
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.

4 participants