Merge pull request #173 from zuoxingdong/step_info_trajectory

update run_experiment: support run serially

baselines/cem/experiment.py

@@ -135,7 +135,7 @@ def run(config, seed, device, logdir):
                    config=config, 
                    seeds=[1770966829, 1500925526, 2054191100], 
                    log_dir='logs/default',
-                   max_workers=5, 
+                   max_workers=None,  # no parallelization 
                    chunksize=1, 
                    use_gpu=False,
                    gpu_ids=None)

lagom/experiment/run_experiment.py

@@ -55,7 +55,7 @@ def run_experiment(run, config, seeds, log_dir, max_workers, chunksize=1, use_gp
         config (Config): a :class:`Config` object defining all configuration settings
         seeds (list): a list of random seeds
         log_dir (str): a string to indicate the path to store loggings.
-        max_workers (int): argument for ProcessPoolExecutor.
+        max_workers (int): argument for ProcessPoolExecutor. if `None`, then all experiments run serially.
         chunksize (int): argument for Executor.map()
         use_gpu (bool): if `True`, then use CUDA. Otherwise, use CPU.
         gpu_ids (list): if `None`, then use all available GPUs. Otherwise, only use the
@@ -124,7 +124,10 @@ def _run(args):
         result = run(config, seed, device, logdir)
         return result
 
-    with ProcessPoolExecutor(max_workers=max_workers) as executor:
-        args = list(product(configs, seeds))
-        results = list(executor.map(CloudpickleWrapper(_run), args, chunksize=chunksize))
+    args = list(product(configs, seeds))
+    if max_workers is None:
+        results = [_run(x) for x in args]
+    else:
+        with ProcessPoolExecutor(max_workers=max_workers) as executor:
+            results = list(executor.map(CloudpickleWrapper(_run), args, chunksize=chunksize))
     return results

test/test_experiment.py

@@ -114,7 +114,7 @@ def test_config(num_sample, keep_dict_order):
 
 
 @pytest.mark.parametrize('num_sample', [1, 5])
-@pytest.mark.parametrize('max_workers', [1, 5, 100])
+@pytest.mark.parametrize('max_workers', [None, 1, 5, 100])
 @pytest.mark.parametrize('chunksize', [1, 7, 40])
 def test_run_experiment(num_sample, max_workers, chunksize):
     def run(config, seed, device, logdir):