enable anisotropic nearest interpolation downsampling (#643)

* change capacity of linear_filter_3d to also do anisotropic downsampling

* update changelog

* update comments

Author: leowe

webknossos/webknossos/dataset/downsampling_utils.py

@@ -117,16 +117,9 @@ def parse_interpolation_mode(
 def linear_filter_3d(data: np.ndarray, factors: List[int], order: int) -> np.ndarray:
     factors_np = np.array(factors)
 
-    assert np.all(
-        factors_np == factors[0]
-    ), "The selected filtering strategy does not support anisotropic downsampling."
-    factor = factors[0]
-
-    ds = data.shape
-    assert not any((d % factor > 0 for d in ds))
     return zoom(
         data,
-        1 / factor,
+        1 / factors_np,
         output=data.dtype,
         # 0: nearest
         # 1: bilinear

webknossos/webknossos/dataset/layer.py

@@ -715,8 +715,6 @@ def downsample_mag(
          - "bilinear"
          - "bicubic"
 
-        Only "median" and "mode" currently work with anisotropic downsampling.
-
         The `args` can contain information to distribute the computation.
         If allow_overwrite is True, an existing Mag may be overwritten.
 

wkcuber/Changelog.md

@@ -16,7 +16,7 @@ For upgrade instructions, please check the respective *Breaking Changes* section
 ### Changed
 
 ### Fixed
-
+- Fixed that wkcuber.downsampling didn't support anisotropic downsampling for some downsampling modes like `nearest`. [#643](https://github.com/scalableminds/webknossos-libs/pull/643)
 
 ## [0.9.12](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.9.12) - 2022-03-18
 [Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.9.11...v0.9.12)
@@ -36,7 +36,6 @@ For upgrade instructions, please check the respective *Breaking Changes* section
 - Fixed that wkcuber.downsampling didn't support an anisotropic mag for `--from`. [#638](https://github.com/scalableminds/webknossos-libs/pull/638)
 - Fixed that wkcuber.downsampling didn't provide a meaningful error message when trying to do downsampling with an unsupported interpolation mode. [#619](https://github.com/scalableminds/webknossos-libs/pull/619)
 
-
 ## [0.9.9](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.9.9) - 2022-03-03
 [Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.9.8...v0.9.9)
 

wkcuber/wkcuber/downsampling.py

@@ -115,8 +115,6 @@ def downsample_mags(
     Argument `from_mag` expects the resolution to base downsampling on.
 
     For the other parameters see the CLI help or `Layer.downsample` and `Layer.downsampling_mag`.
-
-    Note: Not all `interpolation_mode`s work with anisotropic downsampling.
     """
     assert layer_name and from_mag or not layer_name and not from_mag, (
         "You provided only one of the following "

wkcuber/wkcuber/utils.py

@@ -98,7 +98,7 @@ def add_interpolation_flag(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "--interpolation_mode",
         "-i",
-        help="Interpolation mode (median, mode, nearest, bilinear or bicubic). At the moment only median and mode is supported for anisotropic downsampling. All of the modes are working with isotropic downsampling.",
+        help="Interpolation mode (median, mode, nearest, bilinear or bicubic).",
         default="default",
     )