Skip to content

Additions to open_virtual_mfdataset - #508

Merged
TomNicholas merged 15 commits into
zarr-developers:open_virtual_mfdatasetfrom
TomNicholas:open_virtual_mfdataset
Mar 25, 2025
Merged

Additions to open_virtual_mfdataset#508
TomNicholas merged 15 commits into
zarr-developers:open_virtual_mfdatasetfrom
TomNicholas:open_virtual_mfdataset

Conversation

@TomNicholas

Copy link
Copy Markdown
Member
  • Closes #xxxx
  • Tests added
  • Tests passing
  • Full type hint coverage
  • Changes are documented in docs/releases.rst
  • New functions/methods are listed in api.rst
  • New functionality has documentation

TomNicholas and others added 15 commits March 24, 2025 14:43
* add check that works for fill_values too

* note about removing once merged upstream

* type hint

* regression test

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Remove accidental changes to pyproject.toml

* Update pyproject.toml

* ignore mypy

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Setup intersphinx mapping for docs

---------

Co-authored-by: Kyle Barron <kylebarron2@gmail.com>
…aviour (zarr-developers#477)

* draft refactor

* sketch of simplified handling of loadable_variables

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* get at least some tests working

* separate VirtualBackend api definition from common utilities

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove indexes={} everywhere in tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* stop passing through loadable_variables to where it isn't used

* implement logic to load 1D dimension coords by default

* remove more instances of indexes={}

* remove more indexes={}

* refactor logic for choosing loadable_variables

* fix more tets

* xfail Aimee's test that I don't understand

* xfail test that explicitly specifies no indexes

* made a bunch more stuff pass

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix netcdf3 reader

* fix bad import in FITS reader

* fix import in tiff reader

* fix import in icechunk test

* release note

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update docstring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix fits reader

* xfail on empty dict for indexes

* linting

* actually test new expected behaviour

* fix logic for setting loadable_variables

* update docs page to reflect new behaviour

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix expected behaviour in another tests

* additional assert

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* use encode_dataset_coordinates in kerchunk writer

* Encode zarr vars

* fix some mypy errors

* move drop_variables implmentation to the end of every reader

* override loadable_variables and raise warning

* fix failing test by not creating loadable variables that would get inlined by default

* improve error message

* remove some more occurrences of indexes={}

* skip slow test

* slay mypy errors

* docs typos

* should fix dmrpp test

* Delete commented-out code

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove unecessary test skip

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Max Jones <14077947+maxrjones@users.noreply.github.com>
* re-add icechunk to upstream tests

* add pytest-asyncio to test envs
@TomNicholas
TomNicholas merged commit 1507378 into zarr-developers:open_virtual_mfdataset Mar 25, 2025
@TomNicholas
TomNicholas deleted the open_virtual_mfdataset branch March 25, 2025 20:26
TomNicholas added a commit that referenced this pull request Mar 29, 2025
* copy implementation from xarray

* sketch idea for lithops parallelization

* standardize naming of variables

* add to public API

* fix errors caused by trying to import xarray types

* start writing tests

* passing test for combining in serial

* requires_kerchunk

* test for lithops with default LocalHost executor

* notes on confusing AssertionError

* ensure lithops is installed

* remove uneeded fixture

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Additions to `open_virtual_mfdataset` (#508)

* need latest version of xarray to import internals correctly

* Fix metadata equality for nan fill value (#502)

* add check that works for fill_values too

* note about removing once merged upstream

* type hint

* regression test

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Remove accidental changes to pyproject.toml

* Update pyproject.toml

* ignore mypy

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Setup intersphinx mapping for docs (#503)

* Setup intersphinx mapping for docs

---------

Co-authored-by: Kyle Barron <kylebarron2@gmail.com>

* Change default loadable_variables (and indexes) to match xarray's behaviour (#477)

* draft refactor

* sketch of simplified handling of loadable_variables

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* get at least some tests working

* separate VirtualBackend api definition from common utilities

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove indexes={} everywhere in tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* stop passing through loadable_variables to where it isn't used

* implement logic to load 1D dimension coords by default

* remove more instances of indexes={}

* remove more indexes={}

* refactor logic for choosing loadable_variables

* fix more tets

* xfail Aimee's test that I don't understand

* xfail test that explicitly specifies no indexes

* made a bunch more stuff pass

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix netcdf3 reader

* fix bad import in FITS reader

* fix import in tiff reader

* fix import in icechunk test

* release note

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update docstring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix fits reader

* xfail on empty dict for indexes

* linting

* actually test new expected behaviour

* fix logic for setting loadable_variables

* update docs page to reflect new behaviour

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix expected behaviour in another tests

* additional assert

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* use encode_dataset_coordinates in kerchunk writer

* Encode zarr vars

* fix some mypy errors

* move drop_variables implmentation to the end of every reader

* override loadable_variables and raise warning

* fix failing test by not creating loadable variables that would get inlined by default

* improve error message

* remove some more occurrences of indexes={}

* skip slow test

* slay mypy errors

* docs typos

* should fix dmrpp test

* Delete commented-out code

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove unecessary test skip

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Max Jones <14077947+maxrjones@users.noreply.github.com>

* Update pyproject.toml deps (#504)

* re-add icechunk to upstream tests

* add pytest-asyncio to test envs

* passing serial open_virtual_mfdataset test

* passes with lithops but only for the HDF backend

* add test for dask

* refactored serial and lithops codepaths to use an executor pattern

* xfail lithops

* consolidate tests by parametrizing over parallel kwarg

* re-enable lithops test

* remove unneeded get_executor function

* add test for using dask distributed to parallelize

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Max Jones <14077947+maxrjones@users.noreply.github.com>
Co-authored-by: Kyle Barron <kylebarron2@gmail.com>

* Additions to `open_virtual_mfdataset` (#509)

* need latest version of xarray to import internals correctly

* passing serial open_virtual_mfdataset test

* passes with lithops but only for the HDF backend

* add test for dask

* refactored serial and lithops codepaths to use an executor pattern

* xfail lithops

* consolidate tests by parametrizing over parallel kwarg

* re-enable lithops test

* remove unneeded get_executor function

* add test for using dask distributed to parallelize

* Add ManifestStore for loading data from ManifestArrays (#490)

* Draft ManifestStore implementation

---------

Co-authored-by: Tom Nicholas <tom@earthmover.io>
Co-authored-by: Kyle Barron <kylebarron2@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* make it work for dask delayed

* correct docstring

---------

Co-authored-by: Max Jones <14077947+maxrjones@users.noreply.github.com>
Co-authored-by: Kyle Barron <kylebarron2@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* More open_virtual_mfdataset (#510)

* need latest version of xarray to import internals correctly

* passing serial open_virtual_mfdataset test

* passes with lithops but only for the HDF backend

* add test for dask

* refactored serial and lithops codepaths to use an executor pattern

* xfail lithops

* consolidate tests by parametrizing over parallel kwarg

* re-enable lithops test

* remove unneeded get_executor function

* add test for using dask distributed to parallelize

* make it work for dask delayed

* correct docstring

* added compliant executor for lithops

* add links to lithops issues

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Final fixes for open_virtual_mfdataset (#517)

* need latest version of xarray to import internals correctly

* passing serial open_virtual_mfdataset test

* passes with lithops but only for the HDF backend

* add test for dask

* refactored serial and lithops codepaths to use an executor pattern

* xfail lithops

* consolidate tests by parametrizing over parallel kwarg

* re-enable lithops test

* remove unneeded get_executor function

* add test for using dask distributed to parallelize

* make it work for dask delayed

* correct docstring

* added compliant executor for lithops

* add links to lithops issues

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* specify dask and lithops executors with a string again

* fix easy typing stuff

* fix typing errors by aligning executor signatures

* remove open_virtual_mfdataset from public API for now

* release note

* refactor construction of expected result

* implement preprocess arg, and dodge lithops bug

* update comment

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Apply suggestions from code reviewRemRemove new deps

* remove rogue print statement

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Max Jones <14077947+maxrjones@users.noreply.github.com>
Co-authored-by: Kyle Barron <kylebarron2@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants