From 5dcdcb8dabee143b2a2c422d5830ff43ef571e23 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 5 Dec 2019 16:31:27 +0000 Subject: Remove 'libraries' from dict --- setup.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bc5adfc..9bc6e7d 100644 --- a/setup.py +++ b/setup.py @@ -122,7 +122,6 @@ def _skl_get_blas_info(): if on_cibw_win(): blas_info = { "define_macros": [("NO_ATLAS_INFO", 1), ("HAVE_CBLAS", None)], - "libraries": ["openblas"], "library_dirs": [ "/c/cibw/openblas/OpenBLAS.0.2.14.1/lib/native/lib/" ], @@ -131,7 +130,7 @@ def _skl_get_blas_info(): ], "language": "c", } - return ["cblas"], blas_info + return ["openblas"], blas_info blas_info = get_info("blas_opt", notfound_action=2) print("\n\n*** blas_info: \n%r\n\n ***\n\n" % blas_info) @@ -163,9 +162,8 @@ def get_lapack_info(): return False if on_cibw_win(): - blas_info = { + lapack_info = { "define_macros": [("NO_ATLAS_INFO", 1), ("HAVE_CBLAS", None)], - "libraries": ["openblas"], "library_dirs": [ "/c/cibw/openblas/OpenBLAS.0.2.14.1/lib/native/lib/" ], @@ -174,7 +172,7 @@ def get_lapack_info(): ], "language": "c", } - return ["cblas"], blas_info + return ["openblas"], 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