aboutsummaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2019-12-05 18:10:14 +0000
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2019-12-05 18:10:14 +0000
commitf6e971d92de52ea83923aef6cf6473794c12019d (patch)
tree0a7ff9133c6c6efbca61b7c7eae994f6060b69c4 /setup.py
parentUpdate submodule (diff)
downloadpygensvm-f6e971d92de52ea83923aef6cf6473794c12019d.tar.gz
pygensvm-f6e971d92de52ea83923aef6cf6473794c12019d.zip
Reset defined info dicts
The detected ones don't seem to find the include directories.
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py139
1 files changed, 69 insertions, 70 deletions
diff --git a/setup.py b/setup.py
index 6b10d0c..5014570 100644
--- a/setup.py
+++ b/setup.py
@@ -119,41 +119,40 @@ 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)
@@ -184,41 +183,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)