|
24 | 24 | ) |
25 | 25 | from zarr.core.buffer import Buffer, NDBuffer |
26 | 26 | from zarr.core.common import JSON |
27 | | - from zarr.core.dtype import ZarrDType |
28 | 27 | from zarr.core.metadata.dtype import DTypeWrapper |
29 | 28 |
|
30 | 29 | __all__ = [ |
|
33 | 32 | "get_codec_class", |
34 | 33 | "get_ndbuffer_class", |
35 | 34 | "get_pipeline_class", |
36 | | - "get_v2dtype_class", |
37 | | - "get_v3dtype_class", |
38 | 35 | "register_buffer", |
39 | 36 | "register_codec", |
40 | 37 | "register_ndbuffer", |
41 | 38 | "register_pipeline", |
42 | | - "register_v2dtype", |
43 | | - "register_v3dtype", |
44 | 39 | ] |
45 | 40 |
|
46 | 41 | T = TypeVar("T") |
@@ -86,8 +81,6 @@ def get(self, key: str) -> type[DTypeWrapper]: |
86 | 81 | __buffer_registry: Registry[Buffer] = Registry() |
87 | 82 | __ndbuffer_registry: Registry[NDBuffer] = Registry() |
88 | 83 | __data_type_registry = DataTypeRegistry() |
89 | | -__v3_dtype_registry: Registry[ZarrDType] = Registry() |
90 | | -__v2_dtype_registry: Registry[ZarrDType] = Registry() |
91 | 84 |
|
92 | 85 | """ |
93 | 86 | The registry module is responsible for managing implementations of codecs, |
@@ -124,13 +117,9 @@ def _collect_entrypoints() -> list[Registry[Any]]: |
124 | 117 | __ndbuffer_registry.lazy_load_list.extend(entry_points.select(group="zarr.ndbuffer")) |
125 | 118 | __ndbuffer_registry.lazy_load_list.extend(entry_points.select(group="zarr", name="ndbuffer")) |
126 | 119 |
|
127 | | - # __data_type_registry.lazy_load_list.extend(entry_points.select(group="zarr.data_type")) |
128 | | - # __data_type_registry.lazy_load_list.extend(entry_points.select(group="zarr", name="data_type")) |
| 120 | + __data_type_registry.lazy_load_list.extend(entry_points.select(group="zarr.data_type")) |
| 121 | + __data_type_registry.lazy_load_list.extend(entry_points.select(group="zarr", name="data_type")) |
129 | 122 |
|
130 | | - __v3_dtype_registry.lazy_load_list.extend(entry_points.select(group="zarr.v3dtype")) |
131 | | - __v3_dtype_registry.lazy_load_list.extend(entry_points.select(group="zarr", name="v3dtype")) |
132 | | - __v2_dtype_registry.lazy_load_list.extend(entry_points.select(group="zarr.v2dtype")) |
133 | | - __v2_dtype_registry.lazy_load_list.extend(entry_points.select(group="zarr", name="v2dtype")) |
134 | 123 | __pipeline_registry.lazy_load_list.extend(entry_points.select(group="zarr.codec_pipeline")) |
135 | 124 | __pipeline_registry.lazy_load_list.extend( |
136 | 125 | entry_points.select(group="zarr", name="codec_pipeline") |
@@ -180,14 +169,6 @@ def register_data_type(cls: type[DTypeWrapper]) -> None: |
180 | 169 | __data_type_registry.register(cls) |
181 | 170 |
|
182 | 171 |
|
183 | | -def register_v3dtype(cls: type[ZarrDType]) -> None: |
184 | | - __v3_dtype_registry.register(cls) |
185 | | - |
186 | | - |
187 | | -def register_v2dtype(cls: type[ZarrDType]) -> None: |
188 | | - __v2_dtype_registry.register(cls) |
189 | | - |
190 | | - |
191 | 172 | def get_codec_class(key: str, reload_config: bool = False) -> type[Codec]: |
192 | 173 | if reload_config: |
193 | 174 | _reload_config() |
@@ -356,50 +337,4 @@ def get_data_type_from_numpy(dtype: npt.DTypeLike) -> DTypeWrapper: |
356 | 337 | ) |
357 | 338 |
|
358 | 339 |
|
359 | | -# TODO: merge the get_vXdtype_class_ functions |
360 | | -# these can be used instead of the various parse_X functions (hopefully) |
361 | | -def get_v3dtype_class(dtype: str) -> type[ZarrDType]: |
362 | | - __v3_dtype_registry.lazy_load() |
363 | | - v3dtype_class = __v3_dtype_registry.get(dtype) |
364 | | - if v3dtype_class: |
365 | | - return v3dtype_class |
366 | | - raise ValueError( |
367 | | - f"ZarrDType class '{dtype}' not found in registered buffers: {list(__v3_dtype_registry)}." |
368 | | - ) |
369 | | - |
370 | | - |
371 | | -def get_v3dtype_class_from_numpy(dtype: npt.DTypeLike) -> type[ZarrDType]: |
372 | | - __v3_dtype_registry.lazy_load() |
373 | | - |
374 | | - dtype = np.dtype(dtype) |
375 | | - for val in __v3_dtype_registry.values(): |
376 | | - if dtype == val.to_numpy: |
377 | | - return val |
378 | | - raise ValueError( |
379 | | - f"numpy dtype '{dtype}' does not have a corresponding Zarr dtype in: {list(__v3_dtype_registry)}." |
380 | | - ) |
381 | | - |
382 | | - |
383 | | -def get_v2dtype_class(dtype: str) -> type[ZarrDType]: |
384 | | - __v2_dtype_registry.lazy_load() |
385 | | - v2dtype_class = __v2_dtype_registry.get(dtype) |
386 | | - if v2dtype_class: |
387 | | - return v2dtype_class |
388 | | - raise ValueError( |
389 | | - f"ZarrDType class '{dtype}' not found in registered buffers: {list(__v2_dtype_registry)}." |
390 | | - ) |
391 | | - |
392 | | - |
393 | | -def get_v2dtype_class_from_numpy(dtype: npt.DTypeLike) -> type[ZarrDType]: |
394 | | - __v2_dtype_registry.lazy_load() |
395 | | - |
396 | | - dtype = np.dtype(dtype) |
397 | | - for val in __v2_dtype_registry.values(): |
398 | | - if dtype == val.to_numpy: |
399 | | - return val |
400 | | - raise ValueError( |
401 | | - f"numpy dtype '{dtype}' does not have a corresponding Zarr dtype in: {list(__v2_dtype_registry)}." |
402 | | - ) |
403 | | - |
404 | | - |
405 | 340 | _collect_entrypoints() |
0 commit comments