Skip to content

Commit

Permalink
Vendor loky 3.1.0 (#1269)
Browse files Browse the repository at this point in the history
  • Loading branch information
ogrisel committed Feb 23, 2022
1 parent 4c8fab6 commit 7c1ac79
Show file tree
Hide file tree
Showing 28 changed files with 693 additions and 2,273 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Expand Up @@ -12,6 +12,10 @@ Development version
the temporary memmap folder contents concurrently.
https://github.com/joblib/joblib/pull/1263

- Vendor loky 3.1.0 with several fixes to more robustly forcibly terminate
worker processes in case of a crash.
https://github.com/joblib/joblib/pull/1269

Release 1.1.0
--------------

Expand Down
17 changes: 12 additions & 5 deletions joblib/externals/loky/__init__.py
Expand Up @@ -3,11 +3,18 @@
:class:`ProcessPoolExecutor` and a function :func:`get_reusable_executor` which
hide the pool management under the hood.
"""
from ._base import Executor, Future
from ._base import wait, as_completed
from ._base import TimeoutError, CancelledError
from ._base import ALL_COMPLETED, FIRST_COMPLETED, FIRST_EXCEPTION
from concurrent.futures import (
ALL_COMPLETED,
FIRST_COMPLETED,
FIRST_EXCEPTION,
CancelledError,
Executor,
TimeoutError,
as_completed,
wait,
)

from ._base import Future
from .backend.context import cpu_count
from .backend.reduction import set_loky_pickler
from .reusable_executor import get_reusable_executor
Expand All @@ -22,4 +29,4 @@
"wrap_non_picklable_objects", "set_loky_pickler"]


__version__ = '3.0.0'
__version__ = '3.1.0'

0 comments on commit 7c1ac79

Please sign in to comment.