Merge pull request #82 from miroi/windows-openblas-detection

Adapt the BLAS test with the OpenBLAS library on MS Windows
This commit is contained in:
Radovan Bast 2015-08-24 18:56:16 +02:00
commit c893636c33
2 changed files with 10 additions and 4 deletions

View File

@ -47,6 +47,14 @@ build_script:
# add compilers binary dir to path # add compilers binary dir to path
- set path=%path%;C:\software\mingw64\bin - 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 # download and upgrade pip
- ps: wget https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py - ps: wget https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py
- python get-pip.py - python get-pip.py

View File

@ -176,14 +176,12 @@ def test_fc_static():
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@skip_on_windows
def test_fc_blas(): 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(): 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\'"')
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------