From bed8a429458d212e75d30306d9e0546c254aec57 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Thu, 17 Sep 2015 10:06:52 +0200 Subject: [PATCH] remove static linking from tests this will be implemented and tested externally see #134 --- test/cc_lapacke/cmake/autocmake.cfg | 3 --- test/cxx/cmake/autocmake.cfg | 3 --- test/fc/cmake/autocmake.cfg | 3 --- test/fc_blas/cmake/autocmake.cfg | 3 --- test/fc_blas/src/CMakeLists.txt | 6 ------ test/fc_lapack/cmake/autocmake.cfg | 3 --- test/fc_lapack/src/CMakeLists.txt | 5 ----- test/test.py | 25 ------------------------- 8 files changed, 51 deletions(-) diff --git a/test/cc_lapacke/cmake/autocmake.cfg b/test/cc_lapacke/cmake/autocmake.cfg index d90fc83..c715391 100644 --- a/test/cc_lapacke/cmake/autocmake.cfg +++ b/test/cc_lapacke/cmake/autocmake.cfg @@ -5,9 +5,6 @@ min_cmake_version: 2.8 [cc] source: ../../../modules/cc.cmake -[static] -source: ../../../modules/static_linking.cmake - [math_libs] source: ../../../modules/math_libs.cmake diff --git a/test/cxx/cmake/autocmake.cfg b/test/cxx/cmake/autocmake.cfg index 7e392cb..ce3bf11 100644 --- a/test/cxx/cmake/autocmake.cfg +++ b/test/cxx/cmake/autocmake.cfg @@ -5,9 +5,6 @@ min_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake -[static] -source: ../../../modules/static_linking.cmake - [default_build_paths] source: ../../../modules/default_build_paths.cmake diff --git a/test/fc/cmake/autocmake.cfg b/test/fc/cmake/autocmake.cfg index 813b62d..ca40fb4 100644 --- a/test/fc/cmake/autocmake.cfg +++ b/test/fc/cmake/autocmake.cfg @@ -5,9 +5,6 @@ min_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake -[static] -source: ../../../modules/static_linking.cmake - [default_build_paths] source: ../../../modules/default_build_paths.cmake diff --git a/test/fc_blas/cmake/autocmake.cfg b/test/fc_blas/cmake/autocmake.cfg index d1bc157..4fa1306 100644 --- a/test/fc_blas/cmake/autocmake.cfg +++ b/test/fc_blas/cmake/autocmake.cfg @@ -5,9 +5,6 @@ min_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake -[static] -source: ../../../modules/static_linking.cmake - [int64] source: ../../../modules/int64.cmake diff --git a/test/fc_blas/src/CMakeLists.txt b/test/fc_blas/src/CMakeLists.txt index 61fe45e..7c5b934 100644 --- a/test/fc_blas/src/CMakeLists.txt +++ b/test/fc_blas/src/CMakeLists.txt @@ -3,12 +3,6 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES PGI) list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-rdynamic") endif() -if(CMAKE_Fortran_COMPILER_ID MATCHES Intel AND ENABLE_STATIC_LINKING) - # prevent "ifort: ... warning #10121: overriding '-static-intel' with - # '-i_dynamic'" - list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic") -endif() - if(BLAS_FOUND) add_executable(example example.f90) target_link_libraries(example ${MATH_LIBS}) diff --git a/test/fc_lapack/cmake/autocmake.cfg b/test/fc_lapack/cmake/autocmake.cfg index d1bc157..4fa1306 100644 --- a/test/fc_lapack/cmake/autocmake.cfg +++ b/test/fc_lapack/cmake/autocmake.cfg @@ -5,9 +5,6 @@ min_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake -[static] -source: ../../../modules/static_linking.cmake - [int64] source: ../../../modules/int64.cmake diff --git a/test/fc_lapack/src/CMakeLists.txt b/test/fc_lapack/src/CMakeLists.txt index b80d7f7..4d16410 100644 --- a/test/fc_lapack/src/CMakeLists.txt +++ b/test/fc_lapack/src/CMakeLists.txt @@ -3,11 +3,6 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES PGI) list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-rdynamic") endif() -if(CMAKE_Fortran_COMPILER_ID MATCHES Intel AND ENABLE_STATIC_LINKING) - # prevent "ifort: ... warning #10121: overriding '-static-intel' with '-i_dynamic'" - list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic") -endif() - if(LAPACK_FOUND) add_executable(example example.F90) target_link_libraries(example ${MATH_LIBS}) diff --git a/test/test.py b/test/test.py index 251cd54..b83cba0 100644 --- a/test/test.py +++ b/test/test.py @@ -105,11 +105,6 @@ def test_extra_cmake_options(): def test_cxx(): configure_build_and_exe('cxx', 'python setup.py --cxx=g++') - -@skip_on_osx -def test_cxx_static(): - configure_build_and_exe('cxx', 'python setup.py --cxx=g++ --static') - # ------------------------------------------------------------------------------ @@ -152,11 +147,6 @@ def test_fc_omp(): os.environ['OMP_NUM_THREADS'] = '2' configure_build_and_exe('fc_omp', 'python setup.py --omp --fc=gfortran') - -@skip_on_osx -def test_fc_static(): - configure_build_and_exe('fc', 'python setup.py --fc=gfortran --static') - # ------------------------------------------------------------------------------ @@ -164,11 +154,6 @@ def test_fc_blas(): configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') -@skip_on_osx -def test_fc_blas_static(): - configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') - - def test_cxx_cblas(): configure_build_and_exe('cxx_cblas', 'python setup.py --cxx=g++ --cblas') @@ -179,20 +164,10 @@ def test_fc_lapack(): configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') -@skip_on_osx -def test_fc_lapack_static(): - configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') - - @skip_on_osx def test_cc_lapacke(): configure_build_and_exe('cc_lapacke', 'python setup.py --cc=gcc --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') - -@skip_on_osx -def test_cc_lapacke_static(): - configure_build_and_exe('cc_lapacke', 'python setup.py --cc=gcc --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') - # ------------------------------------------------------------------------------