|
 |
4d73059 |
diff -up mpich/configure.ac.avx mpich/configure.ac
|
|
|
81a8f43 |
--- mpich/configure.ac.avx 2015-05-05 11:06:33.132304515 +0200
|
|
|
81a8f43 |
+++ mpich/configure.ac 2015-05-05 11:06:33.137304689 +0200
|
|
|
4d73059 |
@@ -213,6 +213,11 @@ dnl first test failed: try again after u
|
|
|
4d73059 |
[can_compile_avx=yes],
|
|
|
4d73059 |
[can_compile_avx=no]
|
|
|
4d73059 |
)
|
|
|
4d73059 |
+ if test x"${can_compile_avx}" = x"yes" ; then
|
|
|
4d73059 |
+ AVXCFLAGS="-mavx"
|
|
|
4d73059 |
+ fi
|
|
|
4d73059 |
+ CFLAGS=$save_CFLAGS
|
|
|
4d73059 |
+ CXXFLAGS=$save_CXXFLAGS
|
|
|
4d73059 |
fi
|
|
|
4d73059 |
AC_MSG_RESULT([${can_compile_avx}])
|
|
|
4d73059 |
|
|
|
4d73059 |
@@ -738,6 +743,7 @@ AC_SUBST([OPENMP_CFLAGS])
|
|
|
4d73059 |
AC_SUBST([OPENMP_FCFLAGS])
|
|
|
4d73059 |
AC_SUBST([OPENMP_LDFLAGS])
|
|
|
4d73059 |
#AC_SUBST(OPT_FCFLAGS)
|
|
|
4d73059 |
+AC_SUBST([AVXCFLAGS])
|
|
|
4d73059 |
|
|
|
4d73059 |
rm -rf modules/ .fortran_dependencies/
|
|
|
4d73059 |
mkdir modules
|
|
|
cdfc38c |
diff -up mpich/configure.avx mpich/configure
|
|
|
81a8f43 |
--- mpich/configure.avx 2015-05-05 11:06:33.136304654 +0200
|
|
|
81a8f43 |
+++ mpich/configure 2015-05-05 11:20:57.544768442 +0200
|
|
|
81a8f43 |
@@ -638,6 +638,7 @@ LTLIBOBJS
|
|
|
cdfc38c |
LIBOBJS
|
|
|
cdfc38c |
PKG_CONFIG_FILE
|
|
|
cdfc38c |
SUFFIX
|
|
|
cdfc38c |
+AVXCFLAGS
|
|
|
cdfc38c |
OPENMP_LDFLAGS
|
|
|
cdfc38c |
OPENMP_CFLAGS
|
|
|
cdfc38c |
with_amd_bulldozer_kernel
|
|
|
81a8f43 |
@@ -6049,14 +6050,14 @@ $as_echo_n "checking whether we can comp
|
|
|
81a8f43 |
}
|
|
|
81a8f43 |
|
|
|
81a8f43 |
_ACEOF
|
|
|
81a8f43 |
-if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
81a8f43 |
+if test x"${can_compile_sse}" = x"yes" && ac_fn_c_try_compile "$LINENO" ; then
|
|
|
81a8f43 |
can_compile_avx=yes
|
|
|
81a8f43 |
else
|
|
|
81a8f43 |
can_compile_avx=no
|
|
|
81a8f43 |
|
|
|
81a8f43 |
fi
|
|
|
81a8f43 |
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
81a8f43 |
- if test x"${can_compile_avx}" = x"no"; then
|
|
|
81a8f43 |
+ if test x"${can_compile_sse}" = x"yes" && test x"${can_compile_avx}" = x"no"; then
|
|
|
81a8f43 |
CFLAGS="$CFLAGS -mavx"
|
|
|
81a8f43 |
CXXFLAGS="$CXXFLAGS -mavx"
|
|
|
81a8f43 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
81a8f43 |
@@ -6076,6 +6077,11 @@ else
|
|
|
cdfc38c |
|
|
|
cdfc38c |
fi
|
|
|
cdfc38c |
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
cdfc38c |
+ if test x"${can_compile_avx}" = x"yes" ; then
|
|
|
cdfc38c |
+ AVXCFLAGS="-mavx"
|
|
|
cdfc38c |
+ fi
|
|
|
cdfc38c |
+ CFLAGS=$save_CFLAGS
|
|
|
cdfc38c |
+ CXXFLAGS=$save_CXXFLAGS
|
|
|
cdfc38c |
fi
|
|
|
cdfc38c |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx}" >&5
|
|
|
cdfc38c |
$as_echo "${can_compile_avx}" >&6; }
|
|
|
4d73059 |
diff -up mpich/Makefile.am.avx mpich/Makefile.am
|
|
|
81a8f43 |
--- mpich/Makefile.am.avx 2015-05-05 11:06:33.131304480 +0200
|
|
|
81a8f43 |
+++ mpich/Makefile.am 2015-05-05 11:06:33.141304828 +0200
|
|
|
4d73059 |
@@ -8,6 +8,8 @@ AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
|
|
|
4d73059 |
# libelpa
|
|
|
4d73059 |
lib_LTLIBRARIES = libelpa@SUFFIX@.la
|
|
|
4d73059 |
libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
|
|
|
4d73059 |
+libelpa@SUFFIX@_la_CFLAGS = $(AVXCFLAGS) $(AM_CFLAGS)
|
|
|
4d73059 |
+libelpa@SUFFIX@_la_CXXFLAGS = $(AVXCFLAGS) $(AM_CXXFLAGS)
|
|
|
4d73059 |
|
|
|
4d73059 |
libelpa@SUFFIX@_la_SOURCES = src/elpa_utilities.F90 \
|
|
|
4d73059 |
src/elpa1.F90 \
|
|
|
cdfc38c |
diff -up mpich/Makefile.in.avx mpich/Makefile.in
|
|
|
81a8f43 |
--- mpich/Makefile.in.avx 2015-05-05 11:06:33.131304480 +0200
|
|
|
81a8f43 |
+++ mpich/Makefile.in 2015-05-05 11:06:33.141304828 +0200
|
|
|
81a8f43 |
@@ -774,6 +774,7 @@ AR = @AR@
|
|
|
cdfc38c |
AUTOCONF = @AUTOCONF@
|
|
|
cdfc38c |
AUTOHEADER = @AUTOHEADER@
|
|
|
cdfc38c |
AUTOMAKE = @AUTOMAKE@
|
|
|
cdfc38c |
+AVXCFLAGS = @AVXCFLAGS@
|
|
|
cdfc38c |
AWK = @AWK@
|
|
|
cdfc38c |
CC = @CC@
|
|
|
cdfc38c |
CCAS = @CCAS@
|
|
|
81a8f43 |
@@ -918,6 +919,8 @@ AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
|
|
|
cdfc38c |
# libelpa
|
|
|
cdfc38c |
lib_LTLIBRARIES = libelpa@SUFFIX@.la
|
|
|
cdfc38c |
libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
|
|
|
cdfc38c |
+libelpa@SUFFIX@_la_CFLAGS = $(AVXCFLAGS) $(AM_CFLAGS)
|
|
|
cdfc38c |
+libelpa@SUFFIX@_la_CXXFLAGS = $(AVXCFLAGS) $(AM_CXXFLAGS)
|
|
|
cdfc38c |
libelpa@SUFFIX@_la_SOURCES = src/elpa_utilities.F90 src/elpa1.F90 \
|
|
|
cdfc38c |
src/elpa2_utilities.F90 src/elpa2.F90 src/elpa_c_interface.F90 \
|
|
|
cdfc38c |
src/elpa_qr/qr_utils.f90 src/elpa_qr/elpa_qrkernels.f90 \
|