aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2019-12-04 17:23:18 +0000
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2019-12-04 17:23:18 +0000
commit4ed38711101dd1ab0423aae12c0edacef9d7fafb (patch)
tree35f4c4314858f24620f09018a8fd96fad5ed020a
parentDebug if environment variables are present (diff)
downloadpygensvm-4ed38711101dd1ab0423aae12c0edacef9d7fafb.tar.gz
pygensvm-4ed38711101dd1ab0423aae12c0edacef9d7fafb.zip
Try to be more specific with library paths
-rw-r--r--.travis.yml6
-rw-r--r--setup.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 095a478..3310c63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,9 +39,9 @@ matrix:
- PATH=/c/Python36:/c/Python36/Scripts:/c/ProgramData/chocolatey/bin:$PATH
- PYTHON="python"
- PIP="pip"
- - CIBW_ENVIRONMENT="LAPACK=/c/cibw/lapacke/lapacke.0.1.0/lib BLAS=/c/cibw/lapacke/OpenBLAS.0.2.14.1/lib"
- - LAPACK="/c/cibw/lapacke/lapacke.0.1.0/lib"
- - BLAS="/c/cibw/lapacke/OpenBLAS.0.2.14.1/lib"
+ - CIBW_ENVIRONMENT="LAPACK=/c/cibw/lapacke/lapacke.0.1.0/lib/native/lib/x64 OPENBLAS=/c/cibw/lapacke/OpenBLAS.0.2.14.1/lib/native/lib/x64"
+ #- LAPACK="/c/cibw/lapacke/lapacke.0.1.0/lib"
+ #- BLAS="/c/cibw/lapacke/OpenBLAS.0.2.14.1/lib"
- CIBW_BEFORE_BUILD="/c/cibw/nuget.exe install lapacke -OutputDirectory /cibw/lapacke -Verbosity detailed && echo && find /c/cibw/lapacke -type f -maxdepth 8 && echo && pip install numpy Cython"
env:
diff --git a/setup.py b/setup.py
index d31adba..1f4990a 100644
--- a/setup.py
+++ b/setup.py
@@ -114,8 +114,8 @@ def _skl_get_blas_info():
blas_info = get_info("blas_opt", 0)
print("\n\n*** blas_info: \n%r\n\n ***\n\n" % blas_info)
print(
- "\n\n*** os.environ.get('BLAS') = %r ***\n\n"
- % (os.environ.get("BLAS", None))
+ "\n\n*** os.environ.get('OPENBLAS') = %r ***\n\n"
+ % (os.environ.get("OPENBLAS", None))
)
if (not blas_info) or atlas_not_found(blas_info):
cblas_libs = ["cblas"]