elpa/elpa-no-avx.patch
Dominik 'Rathann' Mierzejewski 4d73059e53 don't use AVX instructions in test binaries
also, drop disable-tests.patch committed by mistake
2015-03-20 15:38:56 +01:00

36 lines
1.2 KiB
Diff

diff -up mpich/configure.ac.avx mpich/configure.ac
--- mpich/configure.ac.avx 2015-03-20 15:26:06.535080683 +0100
+++ mpich/configure.ac 2015-03-20 15:26:06.536080688 +0100
@@ -213,6 +213,11 @@ dnl first test failed: try again after u
[can_compile_avx=yes],
[can_compile_avx=no]
)
+ if test x"${can_compile_avx}" = x"yes" ; then
+ AVXCFLAGS="-mavx"
+ fi
+ CFLAGS=$save_CFLAGS
+ CXXFLAGS=$save_CXXFLAGS
fi
AC_MSG_RESULT([${can_compile_avx}])
@@ -738,6 +743,7 @@ AC_SUBST([OPENMP_CFLAGS])
AC_SUBST([OPENMP_FCFLAGS])
AC_SUBST([OPENMP_LDFLAGS])
#AC_SUBST(OPT_FCFLAGS)
+AC_SUBST([AVXCFLAGS])
rm -rf modules/ .fortran_dependencies/
mkdir modules
diff -up mpich/Makefile.am.avx mpich/Makefile.am
--- mpich/Makefile.am.avx 2015-03-20 15:26:06.534080677 +0100
+++ mpich/Makefile.am 2015-03-20 15:31:55.590089898 +0100
@@ -8,6 +8,8 @@ AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
# libelpa
lib_LTLIBRARIES = libelpa@SUFFIX@.la
libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
+libelpa@SUFFIX@_la_CFLAGS = $(AVXCFLAGS) $(AM_CFLAGS)
+libelpa@SUFFIX@_la_CXXFLAGS = $(AVXCFLAGS) $(AM_CXXFLAGS)
libelpa@SUFFIX@_la_SOURCES = src/elpa_utilities.F90 \
src/elpa1.F90 \