From a2eb4e322fc2459d96b7879d81a42e9572c9aec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Fri, 25 Oct 2024 14:14:49 +0200 Subject: [PATCH 1/2] Move cache functionality to shared --- executorlib/backend/cache_parallel.py | 2 +- executorlib/backend/cache_serial.py | 2 +- executorlib/cache/executor.py | 2 +- executorlib/{cache/shared.py => shared/cache.py} | 2 +- executorlib/{cache => shared}/hdf.py | 0 tests/test_cache_executor_mpi.py | 2 +- tests/test_cache_executor_serial.py | 2 +- tests/test_cache_hdf.py | 2 +- tests/test_cache_shared.py | 6 +++--- 9 files changed, 10 insertions(+), 10 deletions(-) rename executorlib/{cache/shared.py => shared/cache.py} (99%) rename executorlib/{cache => shared}/hdf.py (100%) diff --git a/executorlib/backend/cache_parallel.py b/executorlib/backend/cache_parallel.py index d07132d9..0d80b304 100644 --- a/executorlib/backend/cache_parallel.py +++ b/executorlib/backend/cache_parallel.py @@ -3,7 +3,7 @@ import cloudpickle -from executorlib.cache.shared import backend_load_file, backend_write_file +from executorlib.shared.cache import backend_load_file, backend_write_file def main() -> None: diff --git a/executorlib/backend/cache_serial.py b/executorlib/backend/cache_serial.py index 863eda2f..55200c8a 100644 --- a/executorlib/backend/cache_serial.py +++ b/executorlib/backend/cache_serial.py @@ -1,6 +1,6 @@ import sys -from executorlib.cache.shared import execute_task_in_file +from executorlib.shared.cache import execute_task_in_file if __name__ == "__main__": execute_task_in_file(file_name=sys.argv[1]) diff --git a/executorlib/cache/executor.py b/executorlib/cache/executor.py index 8ee83b38..ebe75287 100644 --- a/executorlib/cache/executor.py +++ b/executorlib/cache/executor.py @@ -1,6 +1,6 @@ import os -from executorlib.cache.shared import execute_in_subprocess, execute_tasks_h5 +from executorlib.shared.cache import execute_in_subprocess, execute_tasks_h5 from executorlib.shared.executor import ExecutorBase from executorlib.shared.thread import RaisingThread diff --git a/executorlib/cache/shared.py b/executorlib/shared/cache.py similarity index 99% rename from executorlib/cache/shared.py rename to executorlib/shared/cache.py index 44669494..3b124dd7 100644 --- a/executorlib/cache/shared.py +++ b/executorlib/shared/cache.py @@ -10,7 +10,7 @@ import cloudpickle -from executorlib.cache.hdf import dump, get_output, load +from executorlib.shared.hdf import dump, get_output, load from executorlib.shared.executor import get_command_path diff --git a/executorlib/cache/hdf.py b/executorlib/shared/hdf.py similarity index 100% rename from executorlib/cache/hdf.py rename to executorlib/shared/hdf.py diff --git a/tests/test_cache_executor_mpi.py b/tests/test_cache_executor_mpi.py index 1110be6d..ea78a992 100644 --- a/tests/test_cache_executor_mpi.py +++ b/tests/test_cache_executor_mpi.py @@ -6,7 +6,7 @@ try: from executorlib import FileExecutor - from executorlib.cache.shared import execute_tasks_h5, execute_in_subprocess + from executorlib.shared.cache import execute_tasks_h5, execute_in_subprocess skip_h5io_test = False except ImportError: diff --git a/tests/test_cache_executor_serial.py b/tests/test_cache_executor_serial.py index dc3935c4..f451abb9 100644 --- a/tests/test_cache_executor_serial.py +++ b/tests/test_cache_executor_serial.py @@ -8,7 +8,7 @@ try: from executorlib import FileExecutor - from executorlib.cache.shared import execute_tasks_h5, execute_in_subprocess + from executorlib.shared.cache import execute_tasks_h5, execute_in_subprocess skip_h5io_test = False except ImportError: diff --git a/tests/test_cache_hdf.py b/tests/test_cache_hdf.py index d4d40cba..495cacd8 100644 --- a/tests/test_cache_hdf.py +++ b/tests/test_cache_hdf.py @@ -4,7 +4,7 @@ try: - from executorlib.cache.hdf import dump, load + from executorlib.shared.hdf import dump, load skip_h5io_test = False except ImportError: diff --git a/tests/test_cache_shared.py b/tests/test_cache_shared.py index 801588e2..de763835 100644 --- a/tests/test_cache_shared.py +++ b/tests/test_cache_shared.py @@ -5,13 +5,13 @@ try: - from executorlib.cache.hdf import dump - from executorlib.cache.shared import ( + from executorlib.shared.hdf import dump + from executorlib.shared.cache import ( FutureItem, _check_task_output, _serialize_funct_h5, ) - from executorlib.cache.shared import execute_task_in_file + from executorlib.shared.cache import execute_task_in_file skip_h5io_test = False except ImportError: From 3e71bdda8c86c20f2300c8f7e57da7cc414eb07d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:15:28 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- executorlib/shared/cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/executorlib/shared/cache.py b/executorlib/shared/cache.py index 3b124dd7..a2b5975b 100644 --- a/executorlib/shared/cache.py +++ b/executorlib/shared/cache.py @@ -10,8 +10,8 @@ import cloudpickle -from executorlib.shared.hdf import dump, get_output, load from executorlib.shared.executor import get_command_path +from executorlib.shared.hdf import dump, get_output, load class FutureItem: