Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executorlib/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ class Executor:
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -93,6 +94,7 @@ def __init__(
self,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand All@@ -117,6 +119,7 @@ def __new__(
cls,
max_workers: int = 1,
backend: str = "local",
cache_directory: Optional[str] = None,
max_cores: int = 1,
cores_per_worker: int = 1,
threads_per_core: int = 1,
Expand DownExpand Up@@ -147,6 +150,7 @@ def __new__(
number of cores which can be used in parallel - just like the max_cores parameter. Using
max_cores is recommended, as computers have a limited number of compute cores.
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
max_cores (int): defines the number cores which can be used in parallel
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
Expand DownExpand Up@@ -179,6 +183,7 @@ def __new__(
return ExecutorWithDependencies(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand All@@ -201,6 +206,7 @@ def __new__(
return create_executor(
max_workers=max_workers,
backend=backend,
cache_directory=cache_directory,
max_cores=max_cores,
cores_per_worker=cores_per_worker,
threads_per_core=threads_per_core,
Expand Down
5 changes: 4 additions & 1 deletion executorlib/interactive/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ def create_executor(
max_workers: int = 1,
backend: str = "local",
max_cores: int = 1,
cache_directory: Optional[str] = None,
cores_per_worker: int = 1,
threads_per_core: int = 1,
gpus_per_worker: int = 0,
Expand All@@ -56,8 +57,9 @@ def create_executor(
max_workers (int): for backwards compatibility with the standard library, max_workers also defines the number of
cores which can be used in parallel - just like the max_cores parameter. Using max_cores is
recommended, as computers have a limited number of compute cores.
max_cores (int): defines the number cores which can be used in parallel
backend (str): Switch between the different backends "flux", "local" or "slurm". The default is "local".
max_cores (int): defines the number cores which can be used in parallel
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
cores_per_worker (int): number of MPI cores to be used for each function call
threads_per_core (int): number of OpenMP threads to be used for each function call
gpus_per_worker (int): number of GPUs per worker - defaults to 0
Expand DownExpand Up@@ -88,6 +90,7 @@ def create_executor(
"cores": cores_per_worker,
"hostname_localhost": hostname_localhost,
"cwd": cwd,
"cache_directory": cache_directory,
}
if backend == "flux":
check_oversubscribe(oversubscribe=openmpi_oversubscribe)
Expand Down
93 changes: 81 additions & 12 deletions executorlib/shared/executor.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import importlib.util
import inspect
import os
import queue
import sys
from concurrent.futures import (
Expand All@@ -14,11 +15,12 @@
import cloudpickle

from executorlib.shared.command import get_command_path
from executorlib.shared.communication import interface_bootup
from executorlib.shared.communication import SocketInterface, interface_bootup
from executorlib.shared.inputcheck import (
check_resource_dict,
check_resource_dict_is_empty,
)
from executorlib.shared.serialize import serialize_funct_h5
from executorlib.shared.spawner import BaseSpawner, MpiExecSpawner
from executorlib.shared.thread import RaisingThread

Expand DownExpand Up@@ -304,6 +306,7 @@ def execute_parallel_tasks(
spawner: BaseSpawner = MpiExecSpawner,
hostname_localhost: Optional[bool] = None,
init_function: Optional[Callable] = None,
cache_directory: Optional[str] = None,
**kwargs,
) -> None:
"""
Expand All@@ -321,6 +324,7 @@ def execute_parallel_tasks(
this look up for security reasons. So on MacOS it is required to set this
option to true
init_function (callable): optional function to preset arguments for functions which are submitted later
cache_directory (str, optional): The directory to store cache files. Defaults to "cache".
"""
interface = interface_bootup(
command_lst=_get_backend_path(
Expand All@@ -341,17 +345,17 @@ def execute_parallel_tasks(
future_queue.join()
break
elif "fn" in task_dict.keys() and "future" in task_dict.keys():
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()
if cache_directory is None:
_execute_task(
interface=interface, task_dict=task_dict, future_queue=future_queue
)
else:
_execute_task_with_cache(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
cache_directory=cache_directory,
)


def execute_separate_tasks(
Expand DownExpand Up@@ -644,3 +648,68 @@ def _submit_function_to_separate_process(
)
process.start()
return process, active_task_dict


def _execute_task(
interface: SocketInterface, task_dict: dict, future_queue: queue.Queue
):
"""
Execute the task in the task_dict by communicating it via the interface.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
"""
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
f.set_result(interface.send_and_receive_dict(input_dict=task_dict))
except Exception as thread_exception:
interface.shutdown(wait=True)
future_queue.task_done()
f.set_exception(exception=thread_exception)
raise thread_exception
else:
future_queue.task_done()


def _execute_task_with_cache(
interface: SocketInterface,
task_dict: dict,
future_queue: queue.Queue,
cache_directory: str,
):
"""
Execute the task in the task_dict by communicating it via the interface using the cache in the cache directory.

Args:
interface (SocketInterface): socket interface for zmq communication
task_dict (dict): task submitted to the executor as dictionary. This dictionary has the following keys
{"fn": callable, "args": (), "kwargs": {}, "resource_dict": {}}
future_queue (Queue): Queue for receiving new tasks.
cache_directory (str): The directory to store cache files.
"""
from executorlib.shared.hdf import dump, get_output

task_key, data_dict = serialize_funct_h5(
task_dict["fn"], *task_dict["args"], **task_dict["kwargs"]
)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if not os.path.exists(cache_directory):
os.mkdir(cache_directory)
future = task_dict["future"]
if task_key + ".h5out" not in os.listdir(cache_directory):
_execute_task(
interface=interface,
task_dict=task_dict,
future_queue=future_queue,
)
data_dict["output"] = future.result()
dump(file_name=file_name, data_dict=data_dict)
else:
_, result = get_output(file_name=file_name)
future = task_dict["future"]
future.set_result(result)
future_queue.task_done()
41 changes: 41 additions & 0 deletions tests/test_executor_backend_mpi.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import importlib.util
import shutil
import time
import unittest

from executorlib import Executor
Expand All@@ -20,6 +22,15 @@ def mpi_funct(i):
return i, size, rank


def mpi_funct_sleep(i):
from mpi4py import MPI

size = MPI.COMM_WORLD.Get_size()
rank = MPI.COMM_WORLD.Get_rank()
time.sleep(i)
return i, size, rank


class TestExecutorBackend(unittest.TestCase):
def test_meta_executor_serial(self):
with Executor(max_cores=2, backend="local", block_allocation=True) as exe:
Expand DownExpand Up@@ -71,3 +82,33 @@ def test_errors(self):
gpus_per_worker=1,
backend="local",
)


class TestExecutorBackendCache(unittest.TestCase):
def tearDown(self):
shutil.rmtree("./cache")

@unittest.skipIf(
skip_mpi4py_test, "mpi4py is not installed, so the mpi4py tests are skipped."
)
def test_meta_executor_parallel_cache(self):
with Executor(
max_workers=2,
cores_per_worker=2,
backend="local",
block_allocation=True,
cache_directory="./cache",
) as exe:
cloudpickle_register(ind=1)
time_1 = time.time()
fs_1 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_1.done())
time_2 = time.time()
self.assertTrue(time_2 - time_1 > 1)
time_3 = time.time()
fs_2 = exe.submit(mpi_funct_sleep, 1)
self.assertEqual(fs_2.result(), [(1, 2, 0), (1, 2, 1)])
self.assertTrue(fs_2.done())
time_4 = time.time()
self.assertTrue(time_3 - time_4 < 1)