blumenstiel commited on
Commit
50c6e01
·
verified ·
1 Parent(s): 3879b31

Update terramesh.py

Browse files
Files changed (1) hide show
  1. terramesh.py +5 -9
terramesh.py CHANGED
@@ -117,7 +117,7 @@ def build_terramesh_dataset(
117
  modalities = modalities[0]
118
 
119
  # No shuffle and partial load for val
120
- shuffle = partial if partial is not None else split != "val"
121
  partial = partial if partial is not None else split == "val"
122
  shardshuffle = shardshuffle * shuffle
123
 
@@ -163,17 +163,13 @@ def build_terramesh_dataset(
163
  return dataset
164
 
165
 
166
- def zarr_decoder(key, value):
167
  if key == "zarr.zip" or key.endswith(".zarr.zip"):
168
  mapper = fsspec.filesystem("zip", fo=io.BytesIO(value), block_size=None).get_mapper("")
169
  return zarr.open_consolidated(mapper, mode="r")["bands"][...]
170
 
171
 
172
- # Default decoder
173
- default_decoder = wds.decode()
174
-
175
-
176
- def zarr_metadata_decoder(sample):
177
  for key, value in list(sample.items()):
178
  if key == "zarr.zip" or key.endswith(".zarr.zip"):
179
  mapper = fsspec.filesystem("zip", fo=io.BytesIO(value), block_size=None).get_mapper("")
@@ -269,7 +265,7 @@ def build_wds_dataset(
269
  )
270
 
271
  # Decode from bytes to numpy arrays, etc.
272
- dataset = dataset.map(zarr_metadata_decoder) if return_metadata else dataset.decode(zarr_decoder)
273
 
274
  # Rename modality to "image" and remove temporal dimension
275
  dataset = dataset.rename(image="zarr.zip")
@@ -298,7 +294,7 @@ def _subset_pipeline(urls, *, batch_size, shardshuffle, deterministic, seed, emp
298
  multi_tarfile_samples,
299
  wds.shuffle(shardshuffle, seed=seed),
300
  # Decode from bytes to numpy arrays, etc.
301
- (wds.map(zarr_metadata_decoder) if return_metadata else wds.decode(zarr_decoder)),
302
  # Remove time dimension from tensors
303
  wds.map(drop_time_dim) if not time_dim else wds.map(identity),
304
  wds.map(remove_extensions),
 
117
  modalities = modalities[0]
118
 
119
  # No shuffle and partial load for val
120
+ shuffle = shuffle if shuffle is not None else split != "val"
121
  partial = partial if partial is not None else split == "val"
122
  shardshuffle = shardshuffle * shuffle
123
 
 
163
  return dataset
164
 
165
 
166
+ def zarr_decoding(key, value):
167
  if key == "zarr.zip" or key.endswith(".zarr.zip"):
168
  mapper = fsspec.filesystem("zip", fo=io.BytesIO(value), block_size=None).get_mapper("")
169
  return zarr.open_consolidated(mapper, mode="r")["bands"][...]
170
 
171
 
172
+ def zarr_metadata_decoding(sample):
 
 
 
 
173
  for key, value in list(sample.items()):
174
  if key == "zarr.zip" or key.endswith(".zarr.zip"):
175
  mapper = fsspec.filesystem("zip", fo=io.BytesIO(value), block_size=None).get_mapper("")
 
265
  )
266
 
267
  # Decode from bytes to numpy arrays, etc.
268
+ dataset = dataset.map(zarr_metadata_decoding) if return_metadata else dataset.decode(zarr_decoding)
269
 
270
  # Rename modality to "image" and remove temporal dimension
271
  dataset = dataset.rename(image="zarr.zip")
 
294
  multi_tarfile_samples,
295
  wds.shuffle(shardshuffle, seed=seed),
296
  # Decode from bytes to numpy arrays, etc.
297
+ (wds.map(zarr_metadata_decoding) if return_metadata else wds.decode(zarr_decoding)),
298
  # Remove time dimension from tensors
299
  wds.map(drop_time_dim) if not time_dim else wds.map(identity),
300
  wds.map(remove_extensions),