From fe40300c75db7ab60b407dd05999aa6d246fd0ae Mon Sep 17 00:00:00 2001 From: Dan Blanchard Date: Wed, 7 May 2014 15:30:17 -0400 Subject: [PATCH 1/2] Fix issue where _process_jobs_locally would not work with max_processes > 1 --- gridmap/job.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gridmap/job.py b/gridmap/job.py index 8dbeaa0..674197e 100644 --- a/gridmap/job.py +++ b/gridmap/job.py @@ -639,6 +639,7 @@ def _execute(job): Used by _process_jobs_locally """ job.execute() + return job.ret def _process_jobs_locally(jobs, max_processes=1): @@ -663,8 +664,8 @@ def _process_jobs_locally(jobs, max_processes=1): else: pool = Pool(max_processes) result = pool.map(_execute, jobs) - for ix, job in enumerate(jobs): - job.ret = result[ix] + for ret_val, job in zip(result, jobs): + job.ret = ret_val pool.close() pool.join() From 8a2d30b7aedd9199666268dcd62a3b0c391144a6 Mon Sep 17 00:00:00 2001 From: Dan Blanchard Date: Mon, 12 May 2014 11:40:10 -0400 Subject: [PATCH 2/2] Bump version to 0.12.5 --- gridmap/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gridmap/version.py b/gridmap/version.py index 2e32d0c..0a76752 100644 --- a/gridmap/version.py +++ b/gridmap/version.py @@ -28,5 +28,5 @@ :organization: ETS ''' -__version__ = '0.12.4' +__version__ = '0.12.5' VERSION = tuple(int(x) for x in __version__.split('.'))