Skip to content

Enable dask+cupy (cuda) implementation for (some) convolution methods, e.g. aspect #815

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

Open
relativityhd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable dask+cupy (cuda) implementation for (some) convolution methods, e.g. aspect #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions xrspatial/aspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,16 @@ def _run_dask_numpy(data: da.Array) -> da.Array:
return out


def _run_dask_cupy(data: da.Array) -> da.Array:
data = data.astype(cupy.float32)
_func = partial(_run_cupy)
out = data.map_overlap(_func,
depth=(1, 1),
boundary=cupy.nan,
meta=cupy.array(()))
return out


def aspect(agg: xr.DataArray,
name: Optional[str] = 'aspect') -> xr.DataArray:
"""
Expand Down Expand Up @@ -249,8 +259,7 @@ def aspect(agg: xr.DataArray,
numpy_func=_run_numpy,
dask_func=_run_dask_numpy,
cupy_func=_run_cupy,
dask_cupy_func=lambda *args: not_implemented_func(
*args, messages='aspect() does not support dask with cupy backed DataArray') # noqa
dask_cupy_func=_run_dask_cupy,
)

out = mapper(agg)(agg.data)
Expand Down
15 changes: 12 additions & 3 deletions xrspatial/convolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,15 +373,24 @@ 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
pad_w = kernel.shape[1] // 2
_func = partial(_convolve_2d_cupy, kernel=kernel)
out = data.map_overlap(_func,
depth=(pad_h, pad_w),
boundary=cupy.nan,
meta=cupy.array(()))
return out


def convolve_2d(data, kernel):
mapper = ArrayTypeFunctionMapping(
numpy_func=_convolve_2d_numpy,
cupy_func=_convolve_2d_cupy,
dask_func=_convolve_2d_dask_numpy,
dask_cupy_func=lambda *args: not_implemented_func(
*args, messages='convolution_2d() does not support dask with cupy backed xr.DataArray' # noqa
)
dask_cupy_func=_convolve_2d_dask_cupy
)
out = mapper(xr.DataArray(data))(data, kernel)
return out
Expand Down
13 changes: 11 additions & 2 deletions xrspatial/curvature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@ def _run_cupy(data: cupy.ndarray,

return out

def _run_dask_cupy(data: da.Array,
cellsize: Union[int, float]) -> da.Array:
data = data.astype(cupy.float32)
_func = partial(_cpu, cellsize=cellsize)
out = data.map_overlap(_func,
depth=(1, 1),
boundary=cupy.nan,
meta=cupy.array(()))
return out


def curvature(agg: xr.DataArray,
name: Optional[str] = 'curvature') -> xr.DataArray:
Expand Down Expand Up @@ -209,8 +219,7 @@ def curvature(agg: xr.DataArray,
numpy_func=_run_numpy,
cupy_func=_run_cupy,
dask_func=_run_dask_numpy,
dask_cupy_func=lambda *args: not_implemented_func(
*args, messages='curvature() does not support dask with cupy backed DataArray.'), # noqa
dask_cupy_func=_run_dask_cupy
)
out = mapper(agg)(agg.data, cellsize)
return xr.DataArray(out,
Expand Down
19 changes: 16 additions & 3 deletions xrspatial/slope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,21 @@ def _run_dask_numpy(data: da.Array,
meta=np.array(()))
return out

def _run_dask_cupy(data: da.Array,
cellsize_x: Union[int, float],
cellsize_y: Union[int, float]) -> da.Array:
data = data.astype(cupy.float32)
_func = partial(_run_cupy,
cellsize_x=cellsize_x,
cellsize_y=cellsize_y)

out = data.map_overlap(_func,
depth=(1, 1),
boundary=cupy.nan,
meta=cupy.array(()))
return out



@cuda.jit(device=True)
def _gpu(arr, cellsize_x, cellsize_y):
Expand Down Expand Up @@ -163,9 +178,7 @@ def slope(agg: xr.DataArray,
numpy_func=_run_numpy,
cupy_func=_run_cupy,
dask_func=_run_dask_numpy,
dask_cupy_func=lambda *args: not_implemented_func(
*args, messages='slope() does not support dask with cupy backed DataArray' # noqa
),
dask_cupy_func=_run_dask_cupy,
)
out = mapper(agg)(agg.data, cellsize_x, cellsize_y)

Expand Down