Commit 701a7cff authored by Andreas Marek's avatar Andreas Marek
Browse files

Cleanup of configure.ac

Remove variables which are not needed (anymore)
parent 93c19c5e
...@@ -119,42 +119,20 @@ fi ...@@ -119,42 +119,20 @@ fi
dnl variables needed for the tests dnl variables needed for the tests
dnl these test will cause an abort of configure if not dnl do NOT remove any variables here, until
dnl successful. However, if MKL is found then the blas, blacs, dnl 1. you know 100% what you are doing
dnl lapack, and scalapack test can fail and vice versa dnl 2. you tested ALL configure functionality afterwards
have_blas=no dnl Otherwise, you most likely break some functionality
have_blacs=no
have_mkl=no dnl as default always define the generic kernels to be build
have_lapack=no dnl this is only unset if gpu_support_only is defined, or
have_scalapack=no dnl other specific real/complex kernels are wanted
dnl these tests will decide which kernels can be build
dnl the usual case is all except the BlueGene (bg) kernels
can_compile_sse=no
can_compile_bgp=no
can_compile_bqq=no
fortran_can_check_environment=no
use_specific_real_kernel=no
use_specific_complex_kernel=no
install_real_generic=yes install_real_generic=yes
install_real_generic_simple=yes install_real_generic_simple=yes
install_real_sse=no
install_real_bgp=no
install_real_bgq=no
install_real_avx_block2=no
install_real_avx_block4=no
install_real_avx_block6=no
install_complex_generic=yes install_complex_generic=yes
install_complex_generic_simple=yes install_complex_generic_simple=yes
install_complex_sse=no
install_complex_bgp=no
install_complex_bgq=no
install_complex_avx_block1=no
install_complex_avx_block2=no
AC_LANG([C]) AC_LANG([C])
...@@ -262,6 +240,17 @@ if test "${can_compile_avx}" = "yes" ; then ...@@ -262,6 +240,17 @@ if test "${can_compile_avx}" = "yes" ; then
install_complex_avx_block1=yes install_complex_avx_block1=yes
install_complex_avx_block2=yes install_complex_avx_block2=yes
want_avx=yes
else
install_real_avx_block2=no
install_real_avx_block4=no
install_real_avx_block6=no
install_complex_avx_block1=no
install_complex_avx_block2=no
want_avx=yes
fi fi
dnl set the AVX optimization flags if this option is specified dnl set the AVX optimization flags if this option is specified
...@@ -437,7 +426,6 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ...@@ -437,7 +426,6 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
) )
AC_MSG_RESULT([${fortran_can_check_environment}]) AC_MSG_RESULT([${fortran_can_check_environment}])
dnl now check which kernels can be compiled dnl now check which kernels can be compiled
dnl the checks for SSE were already done before dnl the checks for SSE were already done before
...@@ -462,6 +450,9 @@ AC_MSG_RESULT([${can_compile_bgp}]) ...@@ -462,6 +450,9 @@ AC_MSG_RESULT([${can_compile_bgp}])
if test x"${can_compile_bgp}" = x"yes" ; then if test x"${can_compile_bgp}" = x"yes" ; then
install_real_bgp=yes install_real_bgp=yes
install_complex_bgp=yes install_complex_bgp=yes
else
install_real_bgp=no
install_complex_bgp=no
fi fi
dnl check BGQ kernel dnl check BGQ kernel
...@@ -483,6 +474,9 @@ AC_MSG_RESULT([${can_compile_bgq}]) ...@@ -483,6 +474,9 @@ AC_MSG_RESULT([${can_compile_bgq}])
if test x"${can_compile_bgq}" = x"yes" ; then if test x"${can_compile_bgq}" = x"yes" ; then
install_real_bgq=yes install_real_bgq=yes
install_complex_bgq=yes install_complex_bgq=yes
else
install_real_bgq=no
install_complex_bgq=no
fi fi
...@@ -497,6 +491,8 @@ dnl ...@@ -497,6 +491,8 @@ dnl
m4_include([m4/ax_elpa_specific_kernels.m4]) m4_include([m4/ax_elpa_specific_kernels.m4])
dnl real kernels dnl real kernels
dnl do not remove this variable it is needed in the macros
use_specific_real_kernel=no
dnl generic kernel dnl generic kernel
DEFINE_OPTION_SPECIFIC_REAL_KERNEL([real-generic-kernel-only],[generic-kernel],[install_real_generic]) DEFINE_OPTION_SPECIFIC_REAL_KERNEL([real-generic-kernel-only],[generic-kernel],[install_real_generic])
...@@ -522,6 +518,12 @@ dnl real kernels ...@@ -522,6 +518,12 @@ dnl real kernels
dnl real-avx-block6 kernel dnl real-avx-block6 kernel
DEFINE_OPTION_SPECIFIC_REAL_KERNEL([real-avx-block6-kernel-only],[real-avx-block6-kernel],[install_real_avx_block6]) DEFINE_OPTION_SPECIFIC_REAL_KERNEL([real-avx-block6-kernel-only],[real-avx-block6-kernel],[install_real_avx_block6])
dnl complex kernels
dnl do not remove this variable it is needed in the macros
use_specific_complex_kernel=no
dnl generic kernel dnl generic kernel
DEFINE_OPTION_SPECIFIC_COMPLEX_KERNEL([complex-generic-kernel-only],[generic-kernel],[install_complex_generic]) DEFINE_OPTION_SPECIFIC_COMPLEX_KERNEL([complex-generic-kernel-only],[generic-kernel],[install_complex_generic])
...@@ -684,6 +686,8 @@ mkdir -p elpa ...@@ -684,6 +686,8 @@ mkdir -p elpa
grep "^ *!c>" $srcdir/src/elpa_c_interface.F90 | sed 's/^ *!c>//;' > elpa/elpa_generated.h || exit 1 grep "^ *!c>" $srcdir/src/elpa_c_interface.F90 | sed 's/^ *!c>//;' > elpa/elpa_generated.h || exit 1
if test "${can_compile_avx}" = "no" ; then if test "${can_compile_avx}" = "no" ; then
AC_MSG_WARN([Could not compile AVX instructions]) if test x"${want_avx}" = x"yes" ; then
AC_MSG_WARN([Could not compile AVX instructions])
fi
fi fi
...@@ -32,6 +32,8 @@ AC_DEFUN([DEFINE_OPTION_GPU_SUPPORT_ONLY],[ ...@@ -32,6 +32,8 @@ AC_DEFUN([DEFINE_OPTION_GPU_SUPPORT_ONLY],[
install_gpu=yes install_gpu=yes
want_avx=no
build_with_gpu_support_only=yes build_with_gpu_support_only=yes
use_specific_complex_kernel=yes use_specific_complex_kernel=yes
use_specific_real_kernel=yes use_specific_real_kernel=yes
...@@ -39,6 +41,8 @@ AC_DEFUN([DEFINE_OPTION_GPU_SUPPORT_ONLY],[ ...@@ -39,6 +41,8 @@ AC_DEFUN([DEFINE_OPTION_GPU_SUPPORT_ONLY],[
$3=yes $3=yes
AC_MSG_NOTICE([ELPA will be build only with $1]) AC_MSG_NOTICE([ELPA will be build only with $1])
else
build_with_gpu_support_only=no
fi fi
]) ])
...@@ -22,6 +22,7 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_REAL_KERNEL],[ ...@@ -22,6 +22,7 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_REAL_KERNEL],[
install_real_avx_block2=no install_real_avx_block2=no
install_real_avx_block4=no install_real_avx_block4=no
install_real_avx_block6=no install_real_avx_block6=no
want_avx=no
install_gpu=no install_gpu=no
use_specific_real_kernel=yes use_specific_real_kernel=yes
...@@ -38,22 +39,27 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_REAL_KERNEL],[ ...@@ -38,22 +39,27 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_REAL_KERNEL],[
if test x"${install_real_avx_block2}" = x"yes" ; then if test x"${install_real_avx_block2}" = x"yes" ; then
if test x"${can_compile_avx}" = x"no" ; then if test x"${can_compile_avx}" = x"no" ; then
AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!]) AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!])
else
want_avx=yes
fi fi
fi fi
if test x"${install_real_avx_block4}" = x"yes" ; then if test x"${install_real_avx_block4}" = x"yes" ; then
if test x"${can_compile_avx}" = x"no" ; then if test x"${can_compile_avx}" = x"no" ; then
AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!]) AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!])
else
want_avx=yes
fi fi
fi fi
if test x"${install_real_avx_block6}" = x"yes" ; then if test x"${install_real_avx_block6}" = x"yes" ; then
if test x"${can_compile_avx}" = x"no" ; then if test x"${can_compile_avx}" = x"no" ; then
AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!]) AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!])
else
want_avx=yes
fi fi
fi fi
AC_MSG_NOTICE([$1 will be the only compiled kernel for real case]) AC_MSG_NOTICE([$1 will be the only compiled kernel for real case])
if test x"${want_gpu}" = x"yes" ; then if test x"${want_gpu}" = x"yes" ; then
AC_MSG_WARN([At the moment this disables GPU support!]) AC_MSG_WARN([At the moment this disables GPU support!])
...@@ -83,6 +89,7 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_COMPLEX_KERNEL],[ ...@@ -83,6 +89,7 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_COMPLEX_KERNEL],[
install_complex_bgq=no install_complex_bgq=no
install_complex_avx_block1=no install_complex_avx_block1=no
install_complex_avx_block2=no install_complex_avx_block2=no
want_avx=no
install_gpu=no install_gpu=no
use_specific_complex_kernel=yes use_specific_complex_kernel=yes
...@@ -99,12 +106,16 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_COMPLEX_KERNEL],[ ...@@ -99,12 +106,16 @@ AC_DEFUN([DEFINE_OPTION_SPECIFIC_COMPLEX_KERNEL],[
if test x"${install_complex_avx_block1}" = x"yes" ; then if test x"${install_complex_avx_block1}" = x"yes" ; then
if test x"${can_compile_avx}" = x"no" ; then if test x"${can_compile_avx}" = x"no" ; then
AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!]) AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!])
else
want_avx=yes
fi fi
fi fi
if test x"${install_complex_avx_block2}" = x"yes" ; then if test x"${install_complex_avx_block2}" = x"yes" ; then
if test x"${can_compile_avx}" = x"no" ; then if test x"${can_compile_avx}" = x"no" ; then
AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!]) AC_MSG_ERROR([$2 kernel was set, but cannot be compiled!])
else
want_avx=yes
fi fi
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment