Generalise async executor code

cubed/runtime/executors/asyncio.py

@@ -0,0 +1,83 @@
+import asyncio
+import copy
+import time
+from asyncio import Future
+from typing import Any, AsyncIterator, Callable, Dict, Iterable, List, Optional, Tuple
+
+from cubed.runtime.backup import should_launch_backup
+
+
+async def async_map_unordered(
+    create_futures_func: Callable[..., List[Tuple[Any, Future]]],
+    input: Iterable[Any],
+    use_backups: bool = False,
+    create_backup_futures_func: Optional[
+        Callable[..., List[Tuple[Any, Future]]]
+    ] = None,
+    return_stats: bool = False,
+    name: Optional[str] = None,
+    **kwargs,
+) -> AsyncIterator[Any]:
+    """
+    Asynchronous parallel map over an iterable input, with support for backups and batching.
+    """
+
+    if create_backup_futures_func is None:
+        create_backup_futures_func = create_futures_func
+
+    task_create_tstamp = time.time()
+    tasks = {task: i for i, task in create_futures_func(input, **kwargs)}
+    pending = set(tasks.keys())
+    t = time.monotonic()
+    start_times = {f: t for f in pending}
+    end_times = {}
+    backups: Dict[asyncio.Future, asyncio.Future] = {}
+
+    while pending:
+        finished, pending = await asyncio.wait(
+            pending, return_when=asyncio.FIRST_COMPLETED, timeout=2
+        )
+        for task in finished:
+            # TODO: use exception groups in Python 3.11 to handle case of multiple task exceptions
+            if task.exception():
+                # if the task has a backup that is not done, or is done with no exception, then don't raise this exception
+                backup = backups.get(task, None)
+                if backup:
+                    if not backup.done() or not backup.exception():
+                        continue
+                raise task.exception()
+            end_times[task] = time.monotonic()
+            if return_stats:
+                result, stats = task.result()
+                if name is not None:
+                    stats["array_name"] = name
+                stats["task_create_tstamp"] = task_create_tstamp
+                yield result, stats
+            else:
+                yield task.result()
+
+            # remove any backup task
+            if use_backups:
+                backup = backups.get(task, None)
+                if backup:
+                    if backup in pending:
+                        pending.remove(backup)
+                    del backups[task]
+                    del backups[backup]
+                    backup.cancel()
+
+        if use_backups:
+            now = time.monotonic()
+            for task in copy.copy(pending):
+                if task not in backups and should_launch_backup(
+                    task, now, start_times, end_times
+                ):
+                    # launch backup task
+                    print("Launching backup task")
+                    i = tasks[task]
+                    i, new_task = create_backup_futures_func([i], **kwargs)[0]
+                    tasks[new_task] = i
+                    start_times[new_task] = time.monotonic()
+                    pending.add(new_task)
+                    backups[task] = new_task
+                    backups[new_task] = task

cubed/runtime/executors/modal_async.py

@@ -1,9 +1,7 @@
 import asyncio
-import copy
 import time
 from asyncio.exceptions import TimeoutError
-from functools import partial
-from typing import Any, AsyncIterator, Dict, Iterable, Optional, Sequence
+from typing import Any, AsyncIterator, Iterable, Optional, Sequence
 
 from aiostream import stream
 from modal.exception import ConnectionError
@@ -13,7 +11,7 @@
 
 from cubed.core.array import Callback, Spec
 from cubed.core.plan import visit_node_generations, visit_nodes
-from cubed.runtime.backup import should_launch_backup
+from cubed.runtime.executors.asyncio import async_map_unordered
 from cubed.runtime.executors.modal import (
     Container,
     check_runtime_memory,
@@ -45,9 +43,9 @@ async def map_unordered(
 
     :return: Function values (and optionally stats) as they are completed, not necessarily in the input order.
     """
-    task_create_tstamp = time.time()
 
     if not use_backups:
+        task_create_tstamp = time.time()
         async for result in app_function.map(input, order_outputs=False, kwargs=kwargs):
             if return_stats:
                 result, stats = result
@@ -59,86 +57,44 @@ async def map_unordered(
                 yield result
         return
 
+    def create_futures_func(input, **kwargs):
+        return [
+            (i, asyncio.ensure_future(app_function.call.aio(i, **kwargs)))
+            for i in input
+        ]
+
     backup_function = backup_function or app_function
 
-    tasks = {
-        asyncio.ensure_future(app_function.call.aio(i, **kwargs)): i for i in input
-    }
-    pending = set(tasks.keys())
-    t = time.monotonic()
-    start_times = {f: t for f in pending}
-    end_times = {}
-    backups: Dict[asyncio.Future, asyncio.Future] = {}
-
-    while pending:
-        finished, pending = await asyncio.wait(
-            pending, return_when=asyncio.FIRST_COMPLETED, timeout=2
-        )
-        for task in finished:
-            # TODO: use exception groups in Python 3.11 to handle case of multiple task exceptions
-            if task.exception():
-                # if the task has a backup that is not done, or is done with no exception, then don't raise this exception
-                backup = backups.get(task, None)
-                if backup:
-                    if not backup.done() or not backup.exception():
-                        continue
-                raise task.exception()
-            end_times[task] = time.monotonic()
-            if return_stats:
-                result, stats = task.result()
-                if name is not None:
-                    stats["array_name"] = name
-                stats["task_create_tstamp"] = task_create_tstamp
-                yield result, stats
-            else:
-                yield task.result()
-
-            # remove any backup task
-            if use_backups:
-                backup = backups.get(task, None)
-                if backup:
-                    if backup in pending:
-                        pending.remove(backup)
-                    del backups[task]
-                    del backups[backup]
-                    backup.cancel()
-
-        if use_backups:
-            now = time.monotonic()
-            for task in copy.copy(pending):
-                if task not in backups and should_launch_backup(
-                    task, now, start_times, end_times
-                ):
-                    # launch backup task
-                    print("Launching backup task")
-                    i = tasks[task]
-                    new_task = asyncio.ensure_future(
-                        backup_function.call.aio(i, **kwargs)
-                    )
-                    tasks[new_task] = i
-                    start_times[new_task] = time.monotonic()
-                    pending.add(new_task)
-                    backups[task] = new_task
-                    backups[new_task] = task
+    def create_backup_futures_func(input, **kwargs):
+        return [
+            (i, asyncio.ensure_future(backup_function.call.aio(i, **kwargs)))
+            for i in input
+        ]
+
+    async for result in async_map_unordered(
+        create_futures_func,
+        input,
+        use_backups=use_backups,
+        create_backup_futures_func=create_backup_futures_func,
+        return_stats=return_stats,
+        name=name,
+        **kwargs,
+    ):
+        yield result
 
 
 def pipeline_to_stream(app_function, name, pipeline, **kwargs):
-    it = stream.iterate(
-        [
-            partial(
-                map_unordered,
-                app_function,
-                pipeline.mappable,
-                return_stats=True,
-                name=name,
-                func=pipeline.function,
-                config=pipeline.config,
-                **kwargs,
-            )
-        ]
+    return stream.iterate(
+        map_unordered(
+            app_function,
+            pipeline.mappable,
+            return_stats=True,
+            name=name,
+            func=pipeline.function,
+            config=pipeline.config,
+            **kwargs,
+        )
     )
-    # concat stages, running only one stage at a time
-    return stream.concatmap(it, lambda f: f(), task_limit=1)
 
 
 # This just retries the initial connection attempt, not the function calls

cubed/runtime/executors/python_async.py

@@ -1,5 +1,4 @@
 import asyncio
-import time
 from concurrent.futures import Executor, ThreadPoolExecutor
 from functools import partial
 from typing import Any, AsyncIterator, Callable, Iterable, Optional, Sequence
@@ -12,6 +11,7 @@
 from cubed.core.array import Callback, Spec
 from cubed.core.plan import visit_node_generations, visit_nodes
 from cubed.primitive.types import CubedPipeline
+from cubed.runtime.executors.asyncio import async_map_unordered
 from cubed.runtime.types import DagExecutor
 from cubed.runtime.utils import execution_stats, handle_callbacks
 
@@ -33,61 +33,49 @@ async def map_unordered(
     name: Optional[str] = None,
     **kwargs,
 ) -> AsyncIterator[Any]:
-    if name is not None:
-        print(f"{name}: running map_unordered")
     if retries == 0:
         retrying_function = function
     else:
         retryer = Retrying(reraise=True, stop=stop_after_attempt(retries + 1))
         retrying_function = partial(retryer, function)
 
-    task_create_tstamp = time.time()
-    tasks = {
-        asyncio.wrap_future(
-            concurrent_executor.submit(retrying_function, i, **kwargs)
-        ): i
-        for i in input
-    }
-    pending = set(tasks.keys())
-
-    while pending:
-        finished, pending = await asyncio.wait(
-            pending, return_when=asyncio.FIRST_COMPLETED, timeout=2
-        )
-        for task in finished:
-            # TODO: use exception groups in Python 3.11 to handle case of multiple task exceptions
-            if task.exception():
-                raise task.exception()
-            if return_stats:
-                result, stats = task.result()
-                if name is not None:
-                    stats["array_name"] = name
-                stats["task_create_tstamp"] = task_create_tstamp
-                yield result, stats
-            else:
-                yield task.result()
+    def create_futures_func(input, **kwargs):
+        return [
+            (
+                i,
+                asyncio.wrap_future(
+                    concurrent_executor.submit(retrying_function, i, **kwargs)
+                ),
+            )
+            for i in input
+        ]
+
+    async for result in async_map_unordered(
+        create_futures_func,
+        input,
+        use_backups=use_backups,
+        return_stats=return_stats,
+        name=name,
+        **kwargs,
+    ):
+        yield result
 
 
 def pipeline_to_stream(
     concurrent_executor: Executor, name: str, pipeline: CubedPipeline, **kwargs
 ) -> Stream:
-    it = stream.iterate(
-        [
-            partial(
-                map_unordered,
-                concurrent_executor,
-                run_func,
-                pipeline.mappable,
-                return_stats=True,
-                name=name,
-                func=pipeline.function,
-                config=pipeline.config,
-                **kwargs,
-            )
-        ]
+    return stream.iterate(
+        map_unordered(
+            concurrent_executor,
+            run_func,
+            pipeline.mappable,
+            return_stats=True,
+            name=name,
+            func=pipeline.function,
+            config=pipeline.config,
+            **kwargs,
+        )
     )
-    # concat stages, running only one stage at a time
-    return stream.concatmap(it, lambda f: f(), task_limit=1)
 
 
 async def async_execute_dag(
@@ -99,7 +87,8 @@ async def async_execute_dag(
     compute_arrays_in_parallel: Optional[bool] = None,
     **kwargs,
 ) -> None:
-    with ThreadPoolExecutor() as concurrent_executor:
+    concurrent_executor = ThreadPoolExecutor()
+    try:
         if not compute_arrays_in_parallel:
             # run one pipeline at a time
             for name, node in visit_nodes(dag, resume=resume):
@@ -123,6 +112,10 @@ async def async_execute_dag(
                     async for _, stats in streamer:
                         handle_callbacks(callbacks, stats)
 
+    finally:
+        # don't wait for any cancelled tasks
+        concurrent_executor.shutdown(wait=False)
+
 
 class AsyncPythonDagExecutor(DagExecutor):
     """An execution engine that uses Python asyncio."""

cubed/tests/runtime/test_modal_async.py

@@ -36,6 +36,11 @@ def deterministic_failure_modal(i, path=None, timing_map=None):
     return deterministic_failure(path, timing_map, i)
 
 
+@stub.function(image=image, secret=modal.Secret.from_name("my-aws-secret"), timeout=10)
+def deterministic_failure_modal_no_retries(i, path=None, timing_map=None):
+    return deterministic_failure(path, timing_map, i)
+
+
 @stub.function(
     image=image, secret=modal.Secret.from_name("my-aws-secret"), retries=2, timeout=300
 )
@@ -47,7 +52,10 @@ async def run_test(app_function, input, use_backups=False, **kwargs):
     outputs = set()
     async with stub.run():
         async for output in map_unordered(
-            app_function, input, use_backups=use_backups, **kwargs
+            app_function,
+            input,
+            use_backups=use_backups,
+            **kwargs,
         ):
             outputs.add(output)
     return outputs