From 8c49260ac9713c60cddecaed238ce3febea500dd Mon Sep 17 00:00:00 2001 From: bknueven <30801372+bknueven@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:22:05 -0700 Subject: [PATCH] Work around for issue watertap-org/watertap#1312 (watertap-org/watertap#1316) * try switching to MultiProcessing * updating tutorial comment * default to multiprocessing; make interface more forgiving --- src/parameter_sweep/parallel/parallel_manager_factory.py | 8 ++++---- tutorials/parameter_sweep_demo.ipynb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/parameter_sweep/parallel/parallel_manager_factory.py b/src/parameter_sweep/parallel/parallel_manager_factory.py index 43174be..97ea8d1 100644 --- a/src/parameter_sweep/parallel/parallel_manager_factory.py +++ b/src/parameter_sweep/parallel/parallel_manager_factory.py @@ -47,12 +47,12 @@ def create_parallel_manager(parallel_manager_class=None, **kwargs): number_of_subprocesses = kwargs.get("number_of_subprocesses", 1) if should_fan_out(number_of_subprocesses): - parallel_backend = kwargs.get("parallel_back_end", "ConcurrentFutures") - if parallel_backend == "ConcurrentFutures": + parallel_backend = kwargs.get("parallel_back_end", "multiprocessing") + if parallel_backend.lower() in ("concurrentfutures", "concurrent.futures"): return ConcurrentFuturesParallelManager(number_of_subprocesses) - elif parallel_backend == "MultiProcessing": + elif parallel_backend.lower() in ("multiprocessing",): return MultiprocessingParallelManager(number_of_subprocesses) - elif parallel_backend == "RayIo": + elif parallel_backend.lower() in ("rayio", "ray"): if ray_avaialble: return RayIoParallelManager(number_of_subprocesses) else: diff --git a/tutorials/parameter_sweep_demo.ipynb b/tutorials/parameter_sweep_demo.ipynb index 2c81f79..498f44a 100644 --- a/tutorials/parameter_sweep_demo.ipynb +++ b/tutorials/parameter_sweep_demo.ipynb @@ -221,7 +221,7 @@ " \"optimize_kwargs\": {\"solver\": solver, \"check_termination\": False},\n", " \"initialize_function\": None,\n", " \"initialize_kwargs\": {},\n", - " \"parallel_back_end\": \"ConcurrentFutures\", # Multiprocessing, MPI, Ray available\n", + " \"parallel_back_end\": \"MultiProcessing\", # ConcurrentFutures, MPI, Ray available\n", " \"number_of_subprocesses\": num_procs,\n", " \n", " # Additional useful keyword arguments\n",