mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #17914: Use os.cpu_count() instead of multiprocessing.cpu_count() where

Browse source 
applicable.
This commit is contained in:
Charles-François Natali 2013-06-28 19:25:45 +02:00
parent c723da361a
commit 37cfb0a920
4 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/multiprocessing.rst
View file

@ -1664,7 +1664,7 @@ with the :class:`Pool` class.
callbacks and has a parallel map implementation. callbacks and has a parallel map implementation.
*processes* is the number of worker processes to use. If *processes* is *processes* is the number of worker processes to use. If *processes* is
``None`` then the number returned by :func:`cpu_count` is used. If ``None`` then the number returned by :func:`os.cpu_count` is used. If
*initializer* is not ``None`` then each worker process will call *initializer* is not ``None`` then each worker process will call
``initializer(*initargs)`` when it starts. ``initializer(*initargs)`` when it starts.

2
Lib/concurrent/futures/process.py
View file

@ -331,7 +331,7 @@ class ProcessPoolExecutor(_base.Executor):
_check_system_limits() _check_system_limits()
if max_workers is None: if max_workers is None:
self._max_workers = multiprocessing.cpu_count() self._max_workers = os.cpu_count() or 1
else: else:
self._max_workers = max_workers self._max_workers = max_workers

8
Lib/multiprocessing/pool.py
View file

@ -17,10 +17,11 @@ import threading
import queue import queue
import itertools import itertools
import collections import collections
import os
import time import time
import traceback import traceback
from multiprocessing import Process, cpu_count, TimeoutError from multiprocessing import Process, TimeoutError
from multiprocessing.util import Finalize, debug from multiprocessing.util import Finalize, debug
# #
@ -147,10 +148,7 @@ class Pool(object):
self._initargs = initargs self._initargs = initargs
if processes is None: if processes is None:
try: processes = os.cpu_count() or 1
processes = cpu_count()
except NotImplementedError:
processes = 1
if processes < 1: if processes < 1:
raise ValueError("Number of processes must be at least 1") raise ValueError("Number of processes must be at least 1")

8
Lib/test/regrtest.py
View file

@ -508,12 +508,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
elif o in ('-j', '--multiprocess'): elif o in ('-j', '--multiprocess'):
use_mp = int(a) use_mp = int(a)
if use_mp <= 0: if use_mp <= 0:
try: # Use all cores + extras for tests that like to sleep
import multiprocessing use_mp = 2 + (os.cpu_count() or 1)
# Use all cores + extras for tests that like to sleep
use_mp = 2 + multiprocessing.cpu_count()
except (ImportError, NotImplementedError):
use_mp = 3
if use_mp == 1: if use_mp == 1:
use_mp = None use_mp = None
elif o == '--header': elif o == '--header':