Further refactor spline filters #20519
Open
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
…e and fix initial state handling
Compare to what scipy 1.9.1 / numpy 1.20.x returns
The test exercises spline_filter of complex argument, and has useful info about spline_filter working in single precision for complex inputs (the reason is still unclear).
- merge _splines.py and _bsplines.py - merge tests/test_splines.py and tests/test_bsplines.py - rename the merged implementation file into _spline_filters.py None of this is user visible.
Run `$ clang-format -i ` on both files with .clang-format from scipy/special/special
github-actions
bot
added
C/C++
|
It looks good to me! Thanks @ev-br |
(availablity of M_PI and PyArray_MIN varies by the system etc)
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 issue
Based off #18926, will need a rebase when that one lands.
Supersedes and closes #14558
closes #13643
I initially meant to fix #9209, but turns out it is better addressed separately.
#12691 is related, but no change to it in this PR.
What does this implement/fix?
_splinemodulefrom tempita-templated C into C++;#ifdef GNUCguards_splines.pyand_bsplines.py. Previously it was not clear what is where and why; The resulting python module is under 1kLOC, so it's OK, I think;sepfir2dandspline_filter.Additional information
This is pure maintenance in the end. I think it makes sense to land this separately from gh-18926: the latter does non-trivial algorithmic improvements, and this one just shuffles code around.
The main improvement is probably the complex-valued arithmetics: #13643 was due to the implementation probably predating C99; this PR uses standard tools instead; the python <-> C++ glue parrots what scipy.special does (thanks @steppi for the explanation!).
Here's a bigger picture, as far as I understand it:
signal.spline_filteris IIUC used for image denoisingsignal.symirrorder{1,2}andsignal.sepfir2dsymiirorderfilters in ENH: Move symiirorder1/2, cspline2d, qspline2d and spline_filter to use sosfilt/lfilter #18926 to uselfilter/sosfiltinstead of... uhm... bespoke manual implementations from the multipack era.sepfir2dis still using C code from 2003, only minimally modernized.A larger clean-up of
sepfir2dcould be to take a look at what CuPy does: it delegates a large chunk ofsignalconvolution/filtering tondimage(https://github.com/cupy/cupy/blob/v13.0.0/cupyx/scipy/signal/_bsplines.py#L72). Maybe SciPy can follow suit and remove a large amount of C code in scipy.signal.Note that this is where gh-13643 originates.
This will require figuring out what CuPy actually does, and a careful testing, benchmarking etc etc. So it's a somewhat sizeable project, and is best done separately.