Merge pull request #434 from pyiron/cache_refactoring

Move cache functionality to shared

Author: jan-janssen

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:

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])

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
 

executorlib/cache/shared.py renamed to executorlib/shared/cache.py

@@ -10,8 +10,8 @@
 
 import cloudpickle
 
-from executorlib.cache.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:

executorlib/cache/hdf.py renamed to executorlib/shared/hdf.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:

tests/test_cache_executor_mpi.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:

tests/test_cache_executor_serial.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:

tests/test_cache_hdf.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: