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

Jump to bottom

Zarr Tile Sink: Generate Downsampled Levels #1490

Merged

annehaley merged 27 commits into master from downsample

Apr 5, 2024

Collaborator

annehaley commented Mar 29, 2024 •

edited

Loading

Resolves #1466

This PR adds a new file to large_image.tilesource called resample.py. This new file contains an enum called ResampleMethod and the implementations for using each resample method to downsample a tile to half resolution. This file includes a function downsampleTileHalfRes to perform this downsampling given a tile and a resample method.

This PR updates the ZarrFileTileSource to use the downsampleTileHalfRes function in a new class function _generateDownsampledLevels. These updates include changes to addTile and the cropping method used in write.

This PR also adds tests to confirm the shapes of the generated downsampled levels.

annehaley added 16 commits

March 26, 2024 13:12


          wip: start implementing downsampling method

d31ee70


          fix: handle bands separately when number of bands > 4

91d0b99


          test: add basic tests for downsampling

152b80b


          fix: update reference to ResampleMethod

1ea179e


          fix: Use tileIterator and addTile to write downsampled levels

7f35702


          test: Update downsampling tests

e86015d


          Merge branch 'master' into downsample

38d5e57


          refactor: split addTile into two functions to satisfy function comp…

a8bf91a

…lexity check


          refactor: move typed resampling methods to large_image.tilesource m…

441995f

…odule


          fix: simplify NP_MODE resize implementation

42aeffe


          fix: eliminate type error for 2d tiles

49a46d7


          fix: only default to LANCZOS if dtype is uint8

e769fe0


          fix: don't split bands when using numpy resample methods

94d517d


          test: use 6 8-bit bands in downsampling multiband test

d33c89b


          fix: put back tile shape check for typing

cbd48da


          Merge branch 'master' into downsample

92a1687

manthey reviewed

View reviewed changes

large_image/tilesource/resample.py Show resolved Hide resolved

manthey reviewed

View reviewed changes

large_image/tilesource/resample.py Outdated Show resolved Hide resolved

manthey reviewed

View reviewed changes

large_image/tilesource/resample.py Outdated Show resolved Hide resolved

manthey reviewed

View reviewed changes

sources/zarr/large_image_source_zarr/__init__.py Outdated Show resolved Hide resolved

manthey reviewed

View reviewed changes

sources/zarr/large_image_source_zarr/__init__.py Outdated Show resolved Hide resolved

manthey reviewed

View reviewed changes

sources/zarr/large_image_source_zarr/__init__.py Outdated Show resolved Hide resolved

annehaley added 2 commits

April 3, 2024 19:22


          fix: round up tile dimensions when dividing by 2

a472576


          fix: only overlap tiles when using interpolated resample modes

9a74c0a

annehaley force-pushed the downsample branch from 653bf88 to 9a74c0a Compare

April 3, 2024 19:43

manthey reviewed

View reviewed changes

sources/zarr/large_image_source_zarr/__init__.py Outdated Show resolved Hide resolved

annehaley added 4 commits

April 3, 2024 20:17


          fix: swap order of operations computing tile start coords using overlap

e7234b2


          fix: copy last row/col when tile has odd dims

dbcb661


          refactor: rename min/max methods

ff67307


          style: remove extra whitespace

815c87e


          Merge branch 'master' into downsample

05827bc

manthey reviewed

View reviewed changes

sources/zarr/large_image_source_zarr/__init__.py Outdated Show resolved Hide resolved


          fix: update crop method and crop before generating downsampled levels

4ef0c58

manthey reviewed

View reviewed changes

test/test_sink.py Outdated Show resolved Hide resolved

annehaley added 2 commits

April 4, 2024 16:37


          test: Reorganize tests and add assertion for downsampled content

f7876a3


          refactor: define expected masks as a dict to pass function complexity…

fe4ed29

… check

annehaley marked this pull request as ready for review

April 4, 2024 17:21

manthey reviewed

View reviewed changes

test/test_sink.py Outdated Show resolved Hide resolved

manthey approved these changes

View reviewed changes

Member

manthey left a comment

I made one comment about testing odd sized tiles, but otherwise this looks good.


          test: use odd dimensions in downsampling test

2e10ec4

Member

manthey commented Apr 5, 2024

I made one comment about testing odd sized tiles, but otherwise this looks good.

Great. Merge away.

annehaley merged commit ef47fe8 into master

16 checks passed

annehaley deleted the downsample branch

April 5, 2024 19:53

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet