79 lines
2.6 KiB
Diff
79 lines
2.6 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/configure.avx mpich/configure
|
|
--- mpich/configure.avx 2015-03-18 10:49:42.000000000 +0100
|
|
+++ mpich/configure 2015-05-04 12:03:18.861651356 +0200
|
|
@@ -638,6 +638,7 @@
|
|
LIBOBJS
|
|
PKG_CONFIG_FILE
|
|
SUFFIX
|
|
+AVXCFLAGS
|
|
OPENMP_LDFLAGS
|
|
OPENMP_CFLAGS
|
|
with_amd_bulldozer_kernel
|
|
@@ -6076,6 +5965,11 @@
|
|
|
|
fi
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+ if test x"${can_compile_avx}" = x"yes" ; then
|
|
+ AVXCFLAGS="-mavx"
|
|
+ fi
|
|
+ CFLAGS=$save_CFLAGS
|
|
+ CXXFLAGS=$save_CXXFLAGS
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx}" >&5
|
|
$as_echo "${can_compile_avx}" >&6; }
|
|
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 \
|
|
diff -up mpich/Makefile.in.avx mpich/Makefile.in
|
|
--- mpich/Makefile.in.avx 2015-03-18 10:49:43.000000000 +0100
|
|
+++ mpich/Makefile.in 2015-05-04 12:03:19.989659664 +0200
|
|
@@ -774,6 +764,7 @@
|
|
AUTOCONF = @AUTOCONF@
|
|
AUTOHEADER = @AUTOHEADER@
|
|
AUTOMAKE = @AUTOMAKE@
|
|
+AVXCFLAGS = @AVXCFLAGS@
|
|
AWK = @AWK@
|
|
CC = @CC@
|
|
CCAS = @CCAS@
|
|
@@ -918,6 +909,8 @@
|
|
# 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 \
|
|
src/elpa2_utilities.F90 src/elpa2.F90 src/elpa_c_interface.F90 \
|
|
src/elpa_qr/qr_utils.f90 src/elpa_qr/elpa_qrkernels.f90 \
|