Skip to content

Commit

Permalink
Merge branch 'hotfix/0.10.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-blanchard committed Sep 5, 2013
2 parents f3a7691 + b25ae5a commit 933af26
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
5 changes: 5 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ Requirements
Changelog
~~~~~~~~~

- v0.10.1

+ Made processes non-daemonic to fix ``pool.map`` issue with running
multiple configurations files at the same time with ``run_experiment``.

- v0.10.0

+ ``run_experiment`` can now take multiple configuration files.
Expand Down
14 changes: 9 additions & 5 deletions scripts/run_experiment
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ from __future__ import print_function, unicode_literals
import argparse
import logging
from functools import partial
from multiprocessing import Pool
from multiprocessing import Process

from skll.experiments import run_ablation, run_configuration
from skll.version import __version__
Expand Down Expand Up @@ -99,10 +99,14 @@ def main():

# Are we submitting things to the grid? If so, do that in parallel.
if not args.local:
pool = Pool()
pool.map(partial_runner, args.config_file)
pool.close()
pool.join()
processes = []
for config_file in args.config_file:
p = Process(target=partial_runner, args=(config_file,))
p.daemon = False
p.start()
processes.append(p)
for p in processes:
p.join()
# Otherwise run configurations sequentially.
else:
for config_file in args.config_file:
Expand Down
2 changes: 1 addition & 1 deletion skll/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
:organization: ETS
'''

__version__ = '0.10.0'
__version__ = '0.10.1'
VERSION = tuple(int(x) for x in __version__.split('.'))

2 comments on commit 933af26

@mheilman
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:-(

@dan-blanchard
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, not being able to test things with gridmap is a pain. As is having to duplicate pool.map's functionality because there's no way to make the processes non-daemonic with it.

Please sign in to comment.