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.

Sign up for GitHub

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 spline_filter and spline_filter1d #215

Merged
merged 22 commits into from
May 19, 2021
Merged

Add spline_filter and spline_filter1d #215

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
aa6e8d9
add spline_filter and spline_filter1d to ndinterp
grlee77 Mar 1, 2021
4528614
call da.from_array on the input if it is not already a Dask array
grlee77 May 5, 2021
78ffed8
support use of prefilter kwarg for affine_transform
grlee77 May 6, 2021
ef2d18a
test affine_transform with additional prefilter and mode combinations
grlee77 May 6, 2021
82b0ae8
avoid warnings about deprecated import from collections
grlee77 May 6, 2021
5c92973
fix copy/paste error in _dispatch_ndinterp.py
grlee77 May 6, 2021
03c02e9
minor cleanup in test_affine_transformation.py
grlee77 May 6, 2021
9f2f578
TST: add spline_filter tests
grlee77 May 6, 2021
336db00
add order-dependent default depth
grlee77 May 6, 2021
d7afdc4
TST: test output argument of spline_filter functions
grlee77 May 6, 2021
8db4ffa
DOC: update coverage.rst
grlee77 May 6, 2021
a6cd408
TST: fix test_affine_transform_prefilter_modes
grlee77 May 6, 2021
69ed890
add scipy and dask version-dependent skip
grlee77 May 7, 2021
e224f0f
add one more scipy version-dependent skip
grlee77 May 7, 2021
59ad8ca
TST: improve coverage by testing corner cases
grlee77 May 7, 2021
c8d552b
enable mode='grid-wrap' for spline_filter
grlee77 May 7, 2021
de62990
rename temporary variable to _depth to avoid shadowing function argument
grlee77 May 7, 2021
83ff7ac
fix typo in test_spline_filter_array_output_unsupported
grlee77 May 7, 2021
61fa4a7
fix: allow grid-warp in spline_filter1d as well
grlee77 May 8, 2021
6938f6b
pep8 fixes
grlee77 May 19, 2021
52e5b56
more informative mode-related error messages
grlee77 May 19, 2021
e64d44a
update scipy.ndimage import style
grlee77 May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename temporary variable to _depth to avoid shadowing function argument
  • Loading branch information
@grlee77
grlee77 committed May 7, 2021
commit de62990986153f368c838d1acb74678aaa8f1b09
4 changes: 2 additions & 2 deletions tests/test_dask_image/test_ndinterp/test_spline_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ def validate_spline_filter(n=2,

if version.parse(dask.__version__) < version.parse("2020.1.0"):
# older dask will fail if any chunks have size smaller than depth
depth = da_ndinterp._get_default_depth(interp_order)
_depth = da_ndinterp._get_default_depth(interp_order)
rem = axis_size % chunksize
if chunksize < depth or (rem != 0 and rem < depth):
if chunksize < _depth or (rem != 0 and rem < _depth):
pytest.skip("older dask doesn't automatically rechunk")

if input_as_non_dask_array:
Expand Down