diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2019-12-15 12:25:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 12:25:21 -0800 |
| commit | de06954b19a6c0980d48e4397adabfd15d808660 (patch) | |
| tree | abc7efcf50ca558d67f6eb13a040cffcca29e14e /numpy/core/setup.py | |
| parent | 740c7f5a089adceebd445b444f32d87ad09c7c14 (diff) | |
| parent | 85447b1ed7df98aff0ed9d666a92f8714f08c2ee (diff) | |
| download | numpy-de06954b19a6c0980d48e4397adabfd15d808660.tar.gz | |
Merge pull request #15069 from pv/blas-ilp64
ENH: add support for ILP64 OpenBLAS (without symbol suffix)
Diffstat (limited to 'numpy/core/setup.py')
| -rw-r--r-- | numpy/core/setup.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 5bbb1c622..974ec4628 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -91,9 +91,6 @@ def is_npy_no_smp(): # block. return 'NPY_NOSMP' in os.environ -def is_npy_use_blas64_(): - return (os.environ.get('NPY_USE_BLAS64_', "0") != "0") - def win32_checks(deflist): from numpy.distutils.misc_util import get_build_architecture a = get_build_architecture() @@ -756,12 +753,12 @@ def configuration(parent_package='',top_path=None): join('src', 'common', 'numpyos.c'), ] - if is_npy_use_blas64_(): - blas_info = get_info('blas64__opt', 2) - have_blas = blas_info and ('HAVE_CBLAS64_', None) in blas_info.get('define_macros', []) + if os.environ.get('NPY_USE_BLAS_ILP64', "0") != "0": + blas_info = get_info('blas_ilp64_opt', 2) else: blas_info = get_info('blas_opt', 0) - have_blas = blas_info and ('HAVE_CBLAS', None) in blas_info.get('define_macros', []) + + have_blas = blas_info and ('HAVE_CBLAS', None) in blas_info.get('define_macros', []) if have_blas: extra_info = blas_info |