From 0205451acf4eeb45f690dc4d3b053603f8f7f4a1 Mon Sep 17 00:00:00 2001 From: Florian Pinault Date: Wed, 15 Nov 2023 22:11:08 +0000 Subject: [PATCH] up --- ecml_tools/create/__init__.py | 2 +- ecml_tools/create/config.py | 3 --- ecml_tools/create/loaders.py | 8 ++++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ecml_tools/create/__init__.py b/ecml_tools/create/__init__.py index 2c635cd..f00b7f9 100644 --- a/ecml_tools/create/__init__.py +++ b/ecml_tools/create/__init__.py @@ -33,7 +33,7 @@ def initialise( raise Exception(f"{path} already exists. Use --force to overwrite.") with cache_context(cache_dir): - obj = cls.from_config(partial=True, path=path, config=config, print=print) + obj = cls.from_config(path=path, config=config, print=print) obj.initialise(check_name=not no_check_name) @classmethod diff --git a/ecml_tools/create/config.py b/ecml_tools/create/config.py index 9b4db64..b9d907c 100644 --- a/ecml_tools/create/config.py +++ b/ecml_tools/create/config.py @@ -113,9 +113,6 @@ def normalise(self): # TODO: consider 2D grid points self.statistics_axis = statistics_axis - def input_handler(self, partial=False): - return InputHandler(self, partial=partial) - @classmethod def _get_first_key_if_dict(cls, x): if isinstance(x, str): diff --git a/ecml_tools/create/loaders.py b/ecml_tools/create/loaders.py index 7aad548..0e8c2ad 100644 --- a/ecml_tools/create/loaders.py +++ b/ecml_tools/create/loaders.py @@ -18,6 +18,7 @@ from .config import loader_config from .utils import bytes, compute_directory_sizes, normalize_and_check_dates from .writer import DataWriter +from .input import InputHandler LOG = logging.getLogger(__name__) @@ -25,7 +26,8 @@ class Creator: - def __init__(self, *, path, config, print=print, partial=False, **kwargs): + partial = False + def __init__(self, *, path, config, print=print, **kwargs): # Catch all floating point errors, including overflow, sqrt(<0), etc np.seterr(all="raise") @@ -34,7 +36,8 @@ def __init__(self, *, path, config, print=print, partial=False, **kwargs): assert isinstance(path, str), path self.main_config = loader_config(config) - self.input_handler = self.main_config.input_handler(partial) + self.input_handler = InputHandler(self.main_config, partial=self.partial) + self.path = path self.kwargs = kwargs self.print = print @@ -102,6 +105,7 @@ def _add_dataset(self, mode="r+", **kwargs): class InitialiseCreator(Creator): + partial = True def initialise(self, check_name=True): """Create empty dataset"""