Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions xrspatial/convolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ def _convolve_2d_cupy(data, kernel):
_convolve_2d_cuda[griddim, blockdim](data, kernel, cupy.asarray(out))
return out


def _convolve_2d_dask_cupy(data, kernel):
data = data.astype(cupy.float32)
pad_h = kernel.shape[0] // 2
Expand Down
8 changes: 5 additions & 3 deletions xrspatial/tests/test_focal.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,11 @@ def test_2d_convolution_gpu(
dask_cupy_agg = xr.DataArray(
da.from_array(cupy.asarray(convolve_2d_data), chunks=(3, 3))
)
with pytest.raises(NotImplementedError) as e_info:
convolution_2d(dask_cupy_agg, kernel_custom)
assert e_info
result_kernel_annulus = convolve_2d(dask_cupy_agg.data, kernel_annulus_2_2_2_1)
assert isinstance(result_kernel_annulus, da.Array)
np.testing.assert_allclose(
result_kernel_annulus.compute().get(), convolution_kernel_annulus_2_2_1, equal_nan=True
)


def test_calc_cellsize_unit_input_attrs(convolve_2d_data):
Expand Down