AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88 from miroi/fc_lapack_openblas

Browse Source 
adapt fc_lapack test for MS Windows
This commit is contained in:
Radovan Bast 2015-08-30 10:30:24 +02:00
commit 4b3a3a0007
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/math_libs.cmake
View File

@ -122,15 +122,18 @@ set(ATLAS_BLAS_LIBS f77blas cblas atlas)
set(ATLAS_LAPACK_LIBS atlas lapack) set(ATLAS_LAPACK_LIBS atlas lapack)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# OPENBLAS (no LAPACK in OPENBLAS) # OPENBLAS (contains also LAPACK)
set(OPENBLAS_BLAS_INCLUDE_PATH_SUFFIXES) set(OPENBLAS_BLAS_INCLUDE_PATH_SUFFIXES)
set(OPENBLAS_LAPACK_INCLUDE_PATH_SUFFIXES)
set(OPENBLAS_BLAS_HEADERS cblas_openblas.h openblas_config.h cblas.h f77blas.h) set(OPENBLAS_BLAS_HEADERS cblas_openblas.h openblas_config.h cblas.h f77blas.h)
set(OPENBLAS_BLAS_LIBRARY_PATH_SUFFIXES openblas openblas-base) set(OPENBLAS_BLAS_LIBRARY_PATH_SUFFIXES openblas openblas-base)
set(OPENBLAS_LAPACK_LIBRARY_PATH_SUFFIXES openblas openblas-base)
set(OPENBLAS_BLAS_LIBS openblas) set(OPENBLAS_BLAS_LIBS openblas)
set(OPENBLAS_LAPACK_LIBS openblas)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# MKL # MKL

8
test/test.py
View File

@ -190,14 +190,14 @@ def test_fc_blas_static():
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@skip_on_windows
def test_fc_lapack(): def test_fc_lapack():
configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran') configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
@skip_on_windows
def test_fc_lapack_static(): def test_fc_lapack_static():
configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'ATLAS;MKL\'"') configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
# ------------------------------------------------------------------------------
def test_python_interpreter(): def test_python_interpreter():