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

Jump to bottom

ndimage: add grid_mode option to zoom #4401

Merged
merged 9 commits into from
Dec 21, 2020
Merged

ndimage: add grid_mode option to zoom #4401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5a1c0cf
ENH: Support all ndimage boundary handling modes
grlee77 Dec 3, 2020
e71635a
STYLE: consistently use single quotes in ndimage interpolation code
grlee77 Dec 3, 2020
d5c752d
BUG: fix mode 'grid-constant for order=0
grlee77 Dec 3, 2020
eb3e8e2
DOC: update mode description in docstrings
grlee77 Dec 3, 2020
23cdb6b
TST: skip complex test of warp mode on scipy <1.6
grlee77 Dec 10, 2020
7fc4c13
mark new modes as experimental pending SciPy 1.6 release
grlee77 Dec 18, 2020
9f9e24f
ENH: implement grid_mode paramter for zoom
grlee77 Nov 30, 2020
dccd261
mark grid_mode=True as experimental
grlee77 Dec 18, 2020
ddc31ab
Fix message of experimental mark
takagi Dec 21, 2020
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
8 changes: 7 additions & 1 deletion cupyx/scipy/ndimage/_filters_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ def _run_1d_filters(filters, input, args, output, mode, cval, origin=0):
output = _util._get_output(output, input)
modes = _util._fix_sequence_arg(mode, input.ndim, 'mode',
_util._check_mode)
# for filters, "wrap" is a synonym for "grid-wrap".
modes = ['grid-wrap' if m == 'wrap' else m for m in modes]
origins = _util._fix_sequence_arg(origin, input.ndim, 'origin', int)
n_filters = sum(filter is not None for filter in filters)
if n_filters == 0:
Expand Down Expand Up @@ -219,6 +221,9 @@ def _generate_nd_kernel(name, pre, found, post, mode, w_shape, int_type,
in_params += ', raw M mask'
out_params = 'Y y'

# for filters, "wrap" is a synonym for "grid-wrap"
mode = 'grid-wrap' if mode == 'wrap' else mode

# CArray: remove xstride_{j}=... from string
size = ('%s xsize_{j}=x.shape()[{j}], ysize_{j} = _raw_y.shape()[{j}]'
', xstride_{j}=x.strides()[{j}];' % int_type)
Expand Down Expand Up @@ -298,8 +303,9 @@ def _generate_nd_kernel(name, pre, found, post, mode, w_shape, int_type,
ws_init=ws_init, ws_pre=ws_pre, ws_post=ws_post,
loops='\n'.join(loops), found=found, end_loops='}'*ndim)

mode_str = mode.replace('-', '_') # avoid potential hyphen in kernel name
name = 'cupy_ndimage_{}_{}d_{}_w{}'.format(
name, ndim, mode, '_'.join(['{}'.format(x) for x in w_shape]))
name, ndim, mode_str, '_'.join(['{}'.format(x) for x in w_shape]))
if all_weights_nonzero:
name += '_all_nonzero'
if int_type == 'ptrdiff_t':
Expand Down
Loading