Validate raster dtype in convolve_2d() (#1389)#1393
Merged
Conversation
Wrap the input in xr.DataArray and run _validate_raster before the kernel dispatch so boolean, string, complex, and wrong-ndim inputs fail with a clear ValueError instead of a numba TypingError or a cupy crash. PR #1384 already taught _validate_raster to reject complex dtypes, so a single call covers the whole non-numeric set.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Closes #1389.
Summary
convolve_2d()skipped_validate_raster, so boolean, string, or wrong-ndim inputs reached numba/cupy and produced confusing internal errors. This wraps the input inxr.DataArrayonce and validates it before the kernel dispatch.PR #1384 already taught
_validate_rasterto reject complex dtypes, so the single call covers boolean, string, and complex.Changes
xrspatial/convolution.py: wrap input inxr.DataArrayand call_validate_raster(agg, func_name='convolve_2d', ndim=2)at the top ofconvolve_2d(). The same DataArray feeds the existingArrayTypeFunctionMappingdispatch.xrspatial/tests/test_convolution.py: 4 new tests (boolean rejected, string rejected, 1D rejected, float64 still works).Test plan
pytest xrspatial/tests/test_convolution.pypasses (4/4)pytest xrspatial/tests/test_focal.pystill passes (134/134)