diff options
| author | xoviat <xoviat@users.noreply.github.com> | 2017-12-30 21:54:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 21:54:21 -0600 |
| commit | 56b3b66d50343d5cf1fbbd6e263f6c8140680a32 (patch) | |
| tree | fb60abf32b836ab8b41fdb297d358b457cbb06c1 /numpy/distutils/misc_util.py | |
| parent | 887bb661a77a9f38eb71a6b32463e4a3db0f9477 (diff) | |
| parent | 5f281116066493ead7f16e3e6dcd7bedbba48b46 (diff) | |
| download | numpy-56b3b66d50343d5cf1fbbd6e263f6c8140680a32.tar.gz | |
Merge branch 'master' into config-load-dll
Diffstat (limited to 'numpy/distutils/misc_util.py')
| -rw-r--r-- | numpy/distutils/misc_util.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 0c78220cb..38edf4691 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -9,6 +9,7 @@ import atexit import tempfile import subprocess import shutil +import multiprocessing import distutils from distutils.errors import DistutilsError @@ -92,7 +93,11 @@ def get_num_build_jobs(): """ from numpy.distutils.core import get_distribution - envjobs = int(os.environ.get("NPY_NUM_BUILD_JOBS", 1)) + try: + cpu_count = len(os.sched_getaffinity(0)) + except AttributeError: + cpu_count = multiprocessing.cpu_count() + envjobs = int(os.environ.get("NPY_NUM_BUILD_JOBS", cpu_count)) dist = get_distribution() # may be None during configuration if dist is None: @@ -2288,7 +2293,7 @@ def generate_config_py(target): import os import sys -extra_dll_dir = os.path.join(os.path.dirname(__file__), 'extra-dll') +extra_dll_dir = os.path.join(os.path.dirname(__file__), '.libs') if os.path.isdir(extra_dll_dir) and sys.platform == 'win32': try: |