Commit 15dcc76b authored by Andreas Marek's avatar Andreas Marek

Elpa_development_version_qr

Removed a forgotten C-preprocessor error flag.
Futhermore, describe in the documentation why at the moment a
build of Bluegene P/Q kernels and OpenMP is not allowed.
parent e0df8de4
......@@ -52,7 +52,9 @@ The configure installation is best done in four steps
the default "/usr/local/".
If you want to use the hybrid MPI/OpenMP version of ELPA please specify
"--enable-openmp" or "--with-openmp"
"--enable-openmp" or "--with-openmp". Note that the Bluegene P/Q kernels
are not yet tested in the combination with OpenMP and thus at the moment
this combination is switched of. Please see ./src/elpa2_kernels/README_elpa2_kernels.txt for more details and a hint how to use it anyway.
Note, that at the moment we do not officially support "cross compilation"
allthough it should work.
......
......@@ -148,9 +148,10 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
ar-lib compile config.guess config.sub install-sh missing \
ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/fdep/fortran_dependencies.m4 \
$(top_srcdir)/m4/ax_prog_fc_mpi.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
......@@ -787,6 +788,7 @@ host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
ifGNUmake = @ifGNUmake@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
......
......@@ -1148,6 +1148,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/ax_check_gnu_make.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
......
......@@ -741,6 +741,7 @@ CFLAGS
CC
FORTRAN_MODULE_DEPS
CPP_FOUND
ifGNUmake
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
......@@ -3044,7 +3045,32 @@ fi
AM_BACKSLASH='\'
AX_CHECK_GNU_MAKE()
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
$as_echo_n "checking for GNU make... " >&6; }
if ${_cv_gnu_make_command+:} false; then :
$as_echo_n "(cached) " >&6
else
_cv_gnu_make_command='' ;
for a in "$MAKE" make gmake gnumake ; do
if test -z "$a" ; then continue ; fi ;
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
_cv_gnu_make_command=$a ;
break;
fi
done ;
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
$as_echo "$_cv_gnu_make_command" >&6; } ;
if test "x$_cv_gnu_make_command" != "x" ; then
ifGNUmake='' ;
else
ifGNUmake='#' ;
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"Not found\"" >&5
$as_echo "\"Not found\"" >&6; };
fi
if test x$_cv_gnu_make_command = x ; then
as_fn_error $? "Need GNU Make" "$LINENO" 5
fi
......
......@@ -2560,9 +2560,6 @@ subroutine trans_ev_tridi_to_band_real(na, nev, nblk, nbw, q, ldq, mpi_comm_rows
#if (defined(WITH_AVX_REAL_BLOCK6) && defined(WITH_AVX_REAL_BLOCK4) && defined(WITH_AVX_REAL_BLOCK2))
#ifdef WITH_OPENMP
#error "AVX optimization and OPENMP ??"
#endif
! X86 INTRINSIC CODE, USING 6 HOUSEHOLDER VECTORS
do j = ncols, 6, -6
w(:,1) = bcast_buffer(1:nbw,j+off)
......
......@@ -54,7 +54,14 @@ Currently we offer the following alternatives for the ELPA2 kernels:
eigenvalue problem the "elpa2_kernels_complex.f90"
is recommended. The configure option
"--with-generic-bgp" uses these
kernels.
kernels. Note that the OpenMP functionality of
this kernel is not yet tested and thus an
preprocessor error is thrown in the combination
of this kernel with OpenMP. By manually editing
the file src/elpa2.F90 one can avoid this and
test the OpenMP functionality. The ELPA
developers would welcome every feedback
to this subject.
* elpa2_kernels_real_bgq.f90
- Fortran code enhanced with assembler calls
......@@ -62,7 +69,14 @@ Currently we offer the following alternatives for the ELPA2 kernels:
eigenvalue problem the "elpa2_kernels_complex.f90"
is recommended. The configure option
"--with-generic-bgq" uses these
kernels.
kernels. Note that the OpenMP functionality of
this kernel is not yet tested and thus an
preprocessor error is thrown in the combination
of this kernel with OpenMP. By manually editing
the file src/elpa2.F90 one can avoid this and
test the OpenMP functionality. The ELPA
developers would welcome every feedback
to this subject.
* elpa2_kernels_asm_x86_64.s
- Fortran code enhanced with assembler
......
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