From d3d056c05b4a22f58fcbd04ddee7da7fae666fca Mon Sep 17 00:00:00 2001 From: Miro ILIAS Date: Tue, 25 Aug 2015 22:11:43 +0200 Subject: [PATCH] adapt the fc_lapack test for MS Windows with OpenBLAS library --- modules/math_libs.cmake | 5 ++++- test/test.py | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/math_libs.cmake b/modules/math_libs.cmake index 86267ce..fbf0fa2 100644 --- a/modules/math_libs.cmake +++ b/modules/math_libs.cmake @@ -122,15 +122,18 @@ set(ATLAS_BLAS_LIBS f77blas cblas atlas) set(ATLAS_LAPACK_LIBS atlas lapack) #------------------------------------------------------------------------------- -# OPENBLAS (no LAPACK in OPENBLAS) +# OPENBLAS (contains also LAPACK) 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_LIBRARY_PATH_SUFFIXES openblas openblas-base) +set(OPENBLAS_LAPACK_LIBRARY_PATH_SUFFIXES openblas openblas-base) set(OPENBLAS_BLAS_LIBS openblas) +set(OPENBLAS_LAPACK_LIBS openblas) #------------------------------------------------------------------------------- # MKL diff --git a/test/test.py b/test/test.py index cc6a6a4..edf540c 100644 --- a/test/test.py +++ b/test/test.py @@ -190,14 +190,14 @@ def test_fc_blas_static(): # ------------------------------------------------------------------------------ -@skip_on_windows 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(): - 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():