Commit 8c8dfc61 authored by Lorenz Huedepohl's avatar Lorenz Huedepohl

Rename option to compile without MPI

In my humble opinion it is much more obvious to specify

  --with-mpi=no

instead of

  --enable-shared-memory-only

to configure without MPI
parent 3ce540b4
This diff is collapsed.
...@@ -68,25 +68,21 @@ if test x"${enable_openmp}" = x"yes"; then ...@@ -68,25 +68,21 @@ if test x"${enable_openmp}" = x"yes"; then
AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading]) AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading])
fi fi
AC_MSG_CHECKING(whether --enable-shared-memory-only is specified) dnl mpi
AC_ARG_ENABLE([shared-memory-only], AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi=[[yes|no]]], [compile with MPI. Default: yes])],,[with_mpi=yes])
AS_HELP_STRING([--enable-shared-memory-only], AM_CONDITIONAL([WITH_MPI],[test x"with_mpi" = x"yes"])
[do not use MPI; ELPA will be build for one node shared-memory runs only]), if test x"${with_mpi}" = x"yes"; then
[], AC_DEFINE([WITH_MPI], [1], [use MPI])
[enable_shared_memory_only=no])
AC_MSG_RESULT([${enable_shared_memory_only}])
AM_CONDITIONAL([WITH_MPI],[test x"$enable_shared_memory_only" = x"no"])
if test x"${enable_shared_memory_only}" = x"no"; then
AC_DEFINE([WITH_MPI], [1], [use MPI])
fi fi
dnl check whether mpi compilers are available;
dnl if not abort since it is mandatory
# C # C
AC_LANG([C]) AC_LANG([C])
AX_PROG_CC_MPI([test x"$enable_shared_memory_only" = xno],[use_mpi=yes],[use_mpi=no]) AX_PROG_CC_MPI([test x"$with_mpi" = x"yes"],[found_mpi_c=yes],[found_mpi_c=no])
if test x"$with_mpi" = x"yes"; then
if test x"$found_mpi_c" = x"no"; then
AC_MSG_ERROR([Could not compile an MPI C program])
fi
fi
if test x"${enable_openmp}" = x"yes"; then if test x"${enable_openmp}" = x"yes"; then
AX_ELPA_OPENMP AX_ELPA_OPENMP
...@@ -103,7 +99,12 @@ AM_PROG_AS ...@@ -103,7 +99,12 @@ AM_PROG_AS
# Fortran # Fortran
AC_LANG([Fortran]) AC_LANG([Fortran])
m4_include([m4/ax_prog_fc_mpi.m4]) m4_include([m4/ax_prog_fc_mpi.m4])
AX_PROG_FC_MPI([test x"$enable_shared_memory_only" = xno],[use_mpi=yes],[use_mpi=no]) AX_PROG_FC_MPI([test x"$with_mpi" = x"yes"],[found_mpi_f=yes],[found_mpi_f=no])
if test x"$with_mpi" = x"yes"; then
if test x"$found_mpi_f" = x"no"; then
AC_MSG_ERROR([Could not compile an MPI Fortran program])
fi
fi
if test x"${enable_openmp}" = x"yes"; then if test x"${enable_openmp}" = x"yes"; then
AX_ELPA_OPENMP AX_ELPA_OPENMP
if test "$ac_cv_prog_fc_openmp" = unsupported; then if test "$ac_cv_prog_fc_openmp" = unsupported; then
...@@ -467,7 +468,7 @@ else ...@@ -467,7 +468,7 @@ else
AC_MSG_ERROR([could not link with lapack: specify path]) AC_MSG_ERROR([could not link with lapack: specify path])
fi fi
if test x"${enable_shared_memory_only}" = x"no"; then if test x"${with_mpi}" = x"yes"; then
dnl test whether scalapack already contains blacs dnl test whether scalapack already contains blacs
scalapack_libs="mpiscalapack scalapack scalapack-openmpi" scalapack_libs="mpiscalapack scalapack scalapack-openmpi"
old_LIBS="$LIBS" old_LIBS="$LIBS"
......
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