ENH: SphericalVoronoi sort faster #19419
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
ilayn
reviewed
Oct 21, 2023
scipy/spatial/_voronoi.pyx
Outdated
| in regions]), | ||
| dtype=np.intp) | ||
| cdef np.ndarray[np.intp_t, ndim=1] sorted_vertices | ||
| sorted_vertices = np.empty(max([len(region) for region |
There was a problem hiding this comment.
you can make a for loop here with
max_len = 0
for k in regions:
max_len = max(max_len, len(k))so that you don't create a temporary list in case region numbers are high. If regions have a particular type it would be faster.
There was a problem hiding this comment.
I went ahead and applied that change. The benchmarks were neutral on it, but I also didn't have a reason not to make it if it helps for larger cases than are covered by the suite.
|
FYI: The CI stage with numpy nightly build will fail - I need to remove a deprecation warning for |
|
Here are two PRs to address warnings/errors present in dev CI stage: |
* avoid a large number of memoryview->ndarray conversions in the `sort_vertices_of_regions` loop * `asv continuous -e -b ".*SphericalVor.*" main treddy_sph_vor_sort_faster` ``` | Change | Before [5dc8a79] <main> | After [a0350aee] <treddy_sph_vor_sort_faster> | Ratio | Benchmark (Parameter) | |----------|----------------------------|-------------------------------------------------|---------|-----------------------------------------------------------------------| | - | 12.4±0.02ms | 10.9±0.1ms | 0.88 | spatial.SphericalVorSort.time_spherical_polygon_vertex_sorting(10000) | | - | 1.23±0ms | 1.07±0ms | 0.87 | spatial.SphericalVorSort.time_spherical_polygon_vertex_sorting(1000) | | - | 6.17±0.01ms | 5.33±0.04ms | 0.86 | spatial.SphericalVorSort.time_spherical_polygon_vertex_sorting(5000) | | - | 122±4μs | 104±1μs | 0.85 | spatial.SphericalVorSort.time_spherical_polygon_vertex_sorting(100) | | - | 11.9±0.02μs | 10.0±0.08μs | 0.84 | spatial.SphericalVorSort.time_spherical_polygon_vertex_sorting(10) | SOME BENCHMARKS HAVE CHANGED SIGNIFICANTLY. PERFORMANCE INCREASED. ``` [skip cirrus] [skip circle]
* apply reviewer suggestion to improve efficiency of initialization of `sorted_vertices` [skip cirrus] [skip circle]
tylerjereddy
force-pushed
the
treddy_sph_vor_sort_faster
branch
from
fb716dd
to
3f15350
Compare
j-bowhay
approved these changes
Oct 26, 2023
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.
avoid a large number of memoryview->ndarray conversions in the
sort_vertices_of_regionsloopasv continuous -e -b ".*SphericalVor.*" main treddy_sph_vor_sort_faster[skip cirrus] [skip circle]