From cc315f36dd5116bc52af5724a8c97c8626e5eec8 Mon Sep 17 00:00:00 2001 From: Miro ILIAS Date: Mon, 24 Aug 2015 10:57:09 +0200 Subject: [PATCH] Adapt the BLAS test with the OpenBLAS library on MS Windows - both dynamic and static --- appveyor.yml | 8 ++++++++ test/test.py | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c3c5479..2d04151 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,6 +47,14 @@ build_script: # add compilers binary dir to path - set path=%path%;C:\software\mingw64\bin +# download and unpack the OpenBLAS library, integer*4 (or i32lp64) version +- ps: wget http://skylink.dl.sourceforge.net/project/openblas/v0.2.14/OpenBLAS-v0.2.14-Win64-int32.zip -OutFile OpenBLAS-v0.2.14-Win64-int32.zip +- 7z x OpenBLAS-v0.2.14-Win64-int32.zip > NUL + +# add both OpenBLAS dynamic (libopenblas.dll) and static (libopenblas.a) library files dir to path +- set path=%path%;C:\software\OpenBLAS-v0.2.14-Win64-int32\bin;C:\software\OpenBLAS-v0.2.14-Win64-int32\lib + + # download and upgrade pip - ps: wget https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py - python get-pip.py diff --git a/test/test.py b/test/test.py index 9f14a89..fce3ad9 100644 --- a/test/test.py +++ b/test/test.py @@ -176,14 +176,12 @@ def test_fc_static(): # ------------------------------------------------------------------------------ -@skip_on_windows def test_fc_blas(): - configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran') + configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') -@skip_on_windows def test_fc_blas_static(): - configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --static') + configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') # ------------------------------------------------------------------------------