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.

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 downsampling support and a test for it #350

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,26 @@
from funlib.geometry import Coordinate
from funlib.persistence import Array

from xarray_multiscale.multiscale import downscale_dask
from xarray_multiscale import windowed_mean
import numpy as np
import dask.array as da

from typing import Sequence


def adjust_shape(array: da.Array, scale_factors: Sequence[int]) -> da.Array:
"""
Crop array to a shape that is a multiple of the scale factors.
This allows for clean downsampling.
"""
misalignment = np.any(np.mod(array.shape, scale_factors))
if misalignment:
new_shape = np.subtract(array.shape, np.mod(array.shape, scale_factors))
slices = tuple(slice(0, s) for s in new_shape)
array = array[slices]
return array


@attr.s
class ResampledArrayConfig(ArrayConfig):
Expand Down Expand Up @@ -37,7 +57,27 @@ class ResampledArrayConfig(ArrayConfig):
metadata={"help_text": "The order of the interpolation!"}
)

def preprocess(self, array: Array) -> Array:
"""
Preprocess an array by resampling it to the desired voxel size.
"""
if self.downsample is not None:
downsample = Coordinate(self.downsample)
return Array(
data=downscale_dask(
adjust_shape(array.data, downsample),
windowed_mean,
scale_factors=downsample,
),
offset=array.offset,
voxel_size=array.voxel_size * downsample,
axis_names=array.axis_names,
units=array.units,
)
elif self.upsample is not None:
raise NotImplementedError("Upsampling not yet implemented")

def array(self, mode: str = "r") -> Array:
# This is non trivial. We want to upsample or downsample the source
# array lazily. Not entirely sure how to do this with dask arrays.
raise NotImplementedError()
source_array = self.source_array_config.array(mode)

return self.preprocess(source_array)
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ dependencies = [
"upath",
"boto3",
"matplotlib",
"xarray-multiscale",
]

# extras
Expand Down
32 changes: 32 additions & 0 deletions tests/components/test_preprocessing.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from dacapo.experiments.datasplits.datasets.arrays.resampled_array_config import (
ResampledArrayConfig,
)

import numpy as np
from funlib.persistence import Array
from funlib.geometry import Coordinate


def test_resample():
# test downsampling arrays with shape 10 and 11 by a factor of 2 to test croping works
for top in [11, 12]:
arr = Array(np.array(np.arange(1, top)), offset=(0,), voxel_size=(3,))
resample_config = ResampledArrayConfig(
"test_resample", None, upsample=None, downsample=(2,), interp_order=1
)
resampled = resample_config.preprocess(arr)
assert resampled.voxel_size == Coordinate((6,))
assert resampled.shape == (5,)
assert np.allclose(resampled[:], np.array([1.5, 3.5, 5.5, 7.5, 9.5]))

# test 2D array
arr = Array(
np.array(np.arange(1, 11).reshape(5, 2).T), offset=(0, 0), voxel_size=(3, 3)
)
resample_config = ResampledArrayConfig(
"test_resample", None, upsample=None, downsample=(2, 1), interp_order=1
)
resampled = resample_config.preprocess(arr)
assert resampled.voxel_size == Coordinate(6, 3)
assert resampled.shape == (1, 5)
assert np.allclose(resampled[:], np.array([[1.5, 3.5, 5.5, 7.5, 9.5]]))
Loading