aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2019-12-05 17:49:58 +0000
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2019-12-05 17:49:58 +0000
commita3859e56ae446bec51d94624f83cc8f46887c915 (patch)
tree438608b8c33953cc286f07c806f33f9d66dd6a8c
parentchange to windows seps (diff)
downloadpygensvm-a3859e56ae446bec51d94624f83cc8f46887c915.tar.gz
pygensvm-a3859e56ae446bec51d94624f83cc8f46887c915.zip
autodetect now seems to work lets try that
-rw-r--r--setup.py139
1 files changed, 70 insertions, 69 deletions
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)