Skip to content

Commit 00ac445

Browse files
jan-matthiscopybara-github
authored andcommitted
Adjust schema for virtual chunked.
PiperOrigin-RevId: 589147704
1 parent ce2e8d7 commit 00ac445

3 files changed

Lines changed: 16 additions & 5 deletions

File tree

decorators/flow.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from connectomics.common import jax_utils
2020
# pylint: disable=g-importing-member
2121
from connectomics.volume.decorators import adjust_schema_for_chunksize
22+
from connectomics.volume.decorators import adjust_schema_for_virtual_chunked
2223
from connectomics.volume.decorators import Decorator
2324
from connectomics.volume.decorators import Filter
2425
# pylint: enable=g-importing-member
@@ -73,6 +74,7 @@ def filt_read(domain: ts.IndexDomain, array: np.ndarray,
7374
schema = input_ts.schema
7475
if self._min_chunksize is not None:
7576
schema = adjust_schema_for_chunksize(schema, self._min_chunksize)
77+
schema = adjust_schema_for_virtual_chunked(schema)
7678

7779
# Remove non-spatial dimensions from `fc`-dimension (0th).
7880
json = schema.to_json()

decorators/maps.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
from typing import Any, Mapping, MutableMapping, Optional, Sequence
1818

1919
from connectomics.common import bounding_box
20-
from connectomics.volume.decorators import Decorator # pylint: disable=g-importing-member
20+
# pylint: disable=g-importing-member
21+
from connectomics.volume.decorators import adjust_schema_for_virtual_chunked
22+
from connectomics.volume.decorators import Decorator
23+
# pylint: enable=g-importing-member
2124
import gin
2225
import numpy as np
2326
import sofima
@@ -84,7 +87,8 @@ def warp_fn(domain: ts.IndexDomain, array: np.ndarray,
8487
chunksize.append(dim.size)
8588
else:
8689
chunksize.append(1)
87-
json = input_ts.schema.to_json()
90+
schema = adjust_schema_for_virtual_chunked(input_ts.schema)
91+
json = schema.to_json()
8892
json['chunk_layout']['read_chunk']['shape'] = chunksize
8993
json['chunk_layout']['write_chunk']['shape'] = chunksize
9094

decorators/warp.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818

1919
from connectomics.common import bounding_box
2020
from connectomics.common import opencv_utils
21-
from connectomics.volume.decorators import Decorator # pylint: disable=g-importing-member
21+
# pylint: disable=g-importing-member
22+
from connectomics.volume.decorators import adjust_schema_for_virtual_chunked
23+
from connectomics.volume.decorators import Decorator
24+
# pylint: enable=g-importing-member
2225
import gin
2326
import numpy as np
2427
import scipy.ndimage
@@ -205,7 +208,8 @@ def warp_fn(domain: ts.IndexDomain, array: np.ndarray,
205208
chunksize.append(dim.size)
206209
else:
207210
chunksize.append(1)
208-
json = input_ts.schema.to_json()
211+
schema = adjust_schema_for_virtual_chunked(input_ts.schema)
212+
json = schema.to_json()
209213
json['chunk_layout']['read_chunk']['shape'] = chunksize
210214
json['chunk_layout']['write_chunk']['shape'] = chunksize
211215

@@ -302,7 +306,8 @@ def warp_fn(domain: ts.IndexDomain, array: np.ndarray,
302306
chunksize.append(dim.size)
303307
else:
304308
chunksize.append(1)
305-
json = input_ts.schema.to_json()
309+
schema = adjust_schema_for_virtual_chunked(input_ts.schema)
310+
json = schema.to_json()
306311
json['chunk_layout']['read_chunk']['shape'] = chunksize
307312
json['chunk_layout']['write_chunk']['shape'] = chunksize
308313

0 commit comments

Comments
 (0)