From a3859e56ae446bec51d94624f83cc8f46887c915 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 5 Dec 2019 17:49:58 +0000 Subject: autodetect now seems to work lets try that --- setup.py | 139 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 70 insertions(+), 69 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5014570..6b10d0c 100644 --- a/setup.py +++ b/setup.py @@ -119,40 +119,41 @@ def _skl_get_blas_info(): return True return False - if on_cibw_win(): - blas_info = get_info("blas_opt", notfound_action=0) - print("***\nDetected blas info: %r" % blas_info) - blas_info = { - "define_macros": [("NO_ATLAS_INFO", 1), ("HAVE_CBLAS", None)], - "library_dirs": [ - os.sep.join( - [ - "C:", - "cibw", - "openblas", - "OpenBLAS.0.2.14.1", - "lib", - "native", - "lib", - ] - ) - ], - "include_dirs": [ - os.sep.join( - [ - "C:", - "cibw", - "openblas", - "OpenBLAS.0.2.14.1", - "lib", - "native", - "include", - ] - ) - ], - "language": "c", - } - return ["libopenblas"], blas_info + +# if on_cibw_win(): +# blas_info = get_info("blas_opt", notfound_action=0) +# print("***\nDetected blas info: %r" % blas_info) +# blas_info = { +# "define_macros": [("NO_ATLAS_INFO", 1), ("HAVE_CBLAS", None)], +# "library_dirs": [ +# os.sep.join( +# [ +# "C:", +# "cibw", +# "openblas", +# "OpenBLAS.0.2.14.1", +# "lib", +# "native", +# "lib", +# ] +# ) +# ], +# "include_dirs": [ +# os.sep.join( +# [ +# "C:", +# "cibw", +# "openblas", +# "OpenBLAS.0.2.14.1", +# "lib", +# "native", +# "include", +# ] +# ) +# ], +# "language": "c", +# } +# return ["libopenblas"], blas_info blas_info = get_info("blas_opt", notfound_action=2) print("\n\n*** blas_info: \n%r\n\n ***\n\n" % blas_info) @@ -183,41 +184,41 @@ def get_lapack_info(): return True return False - if on_cibw_win(): - lapack_info = get_info("lapack_opt", notfound_action=0) - print("***\nDetected lapack info: %r" % lapack_info) - lapack_info = { - "define_macros": [("NO_ATLAS_INFO", 1), ("HAVE_CBLAS", None)], - "library_dirs": [ - os.sep.join( - [ - "C:", - "cibw", - "openblas", - "OpenBLAS.0.2.14.1", - "lib", - "native", - "lib", - ] - ) - ], - "include_dirs": [ - os.sep.join( - [ - "C:", - "cibw", - "openblas", - "OpenBLAS.0.2.14.1", - "lib", - "native", - "include", - ] - ) - ], - "language": "c", - } - print("***\nDefined lapack info: %r" % lapack_info) - return ["libopenblas"], lapack_info +# if on_cibw_win(): +# lapack_info = get_info("lapack_opt", notfound_action=0) +# print("***\nDetected lapack info: %r" % lapack_info) +# lapack_info = { +# "define_macros": [("NO_ATLAS_INFO", 1), ("HAVE_CBLAS", None)], +# "library_dirs": [ +# os.sep.join( +# [ +# "C:", +# "cibw", +# "openblas", +# "OpenBLAS.0.2.14.1", +# "lib", +# "native", +# "lib", +# ] +# ) +# ], +# "include_dirs": [ +# os.sep.join( +# [ +# "C:", +# "cibw", +# "openblas", +# "OpenBLAS.0.2.14.1", +# "lib", +# "native", +# "include", +# ] +# ) +# ], +# "language": "c", +# } +# print("***\nDefined lapack info: %r" % lapack_info) +# return ["libopenblas"], lapack_info lapack_info = get_info("lapack_opt", notfound_action=2) print("\n\n*** lapack_info: \n%r\n\n ***\n\n" % lapack_info) -- cgit v1.2.3