diff --git a/ELPA_2013.08/Makefile.in b/ELPA_2013.08/Makefile.in index 0ba64fb48e0e7cd071b957f8db7d0cacd3dbf04e..f4f74bf633b13ff69b1b86bfe67f1df2148eed4f 100644 --- a/ELPA_2013.08/Makefile.in +++ b/ELPA_2013.08/Makefile.in @@ -54,28 +54,28 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @WITH_GENERIC_SIMPLE_TRUE@am__append_1 = src/elpa2_kernels/elpa2_kernels_complex_simple.f90 \ -@WITH_GENERIC_SIMPLE_TRUE@ src/elpa2_kernels/elpa2_kernels_real_simple.f90 +@WITH_GENERIC_SIMPLE_TRUE@ src/elpa2_kernels/elpa2_kernels_real_simple.f90 @WITH_GENERIC_TRUE@am__append_2 = src/elpa2_kernels/elpa2_kernels_complex.f90 \ -@WITH_GENERIC_TRUE@ src/elpa2_kernels/elpa2_kernels_real.f90 +@WITH_GENERIC_TRUE@ src/elpa2_kernels/elpa2_kernels_real.f90 @WITH_BGP_TRUE@am__append_3 = src/elpa2_kernels/elpa2_kernels_real_bgp.f90 \ -@WITH_BGP_TRUE@ src/elpa2_kernels/elpa2_kernels_complex.f90 +@WITH_BGP_TRUE@ src/elpa2_kernels/elpa2_kernels_complex.f90 @WITH_BGQ_TRUE@am__append_4 = src/elpa2_kernels/elpa2_kernels_real_bgq.f90 \ -@WITH_BGQ_TRUE@ src/elpa2_kernels/elpa2_kernels_complex.f90 +@WITH_BGQ_TRUE@ src/elpa2_kernels/elpa2_kernels_complex.f90 @WITH_SSE_AS_TRUE@am__append_5 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.s @WITH_AVX_SANDYBRIDGE_TRUE@am__append_6 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \ -@WITH_AVX_SANDYBRIDGE_TRUE@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp +@WITH_AVX_SANDYBRIDGE_TRUE@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp @WITH_AMD_BULLDOZER_TRUE@am__append_7 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c \ -@WITH_AMD_BULLDOZER_TRUE@ src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \ -@WITH_AMD_BULLDOZER_TRUE@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp +@WITH_AMD_BULLDOZER_TRUE@ src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \ +@WITH_AMD_BULLDOZER_TRUE@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp @WITH_AVX_COMPLEX_BLOCK1_TRUE@am__append_8 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp @WITH_AVX_COMPLEX_BLOCK2_TRUE@am__append_9 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp \ -@WITH_AVX_COMPLEX_BLOCK2_TRUE@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp +@WITH_AVX_COMPLEX_BLOCK2_TRUE@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp @WITH_AVX_REAL_BLOCK2_TRUE@am__append_10 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c @WITH_AVX_REAL_BLOCK4_TRUE@am__append_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c diff --git a/ELPA_2013.08/configure b/ELPA_2013.08/configure index 7157e876504c5ea71dd5823913f886bdf6cc1808..6fc3148d502824bc6dcd7da2b0f21e13cccbc44d 100755 --- a/ELPA_2013.08/configure +++ b/ELPA_2013.08/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for elpa 2013.08. +# Generated by GNU Autoconf 2.69 for elpa 2013.08.001. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='elpa' PACKAGE_TARNAME='elpa' -PACKAGE_VERSION='2013.08' -PACKAGE_STRING='elpa 2013.08' +PACKAGE_VERSION='2013.08.001' +PACKAGE_STRING='elpa 2013.08.001' PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de' PACKAGE_URL='' @@ -1376,7 +1376,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures elpa 2013.08 to adapt to many kinds of systems. +\`configure' configures elpa 2013.08.001 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1446,7 +1446,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elpa 2013.08:";; + short | recursive ) echo "Configuration of elpa 2013.08.001:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elpa configure 2013.08 +elpa configure 2013.08.001 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2063,7 +2063,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by elpa $as_me 2013.08, which was +It was created by elpa $as_me 2013.08.001, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2889,7 +2889,7 @@ fi # Define the identity of the package. PACKAGE='elpa' - VERSION='2013.08' + VERSION='2013.08.001' cat >>confdefs.h <<_ACEOF @@ -5230,7 +5230,7 @@ fi -ELPA_LIB_VERSION=2013.08 +ELPA_LIB_VERSION=2013.08.001 # this is the version of the API, should be changed in the major revision # if and only if the actual API changes @@ -20364,7 +20364,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by elpa $as_me 2013.08, which was +This file was extended by elpa $as_me 2013.08.001, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20430,7 +20430,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -elpa config.status 2013.08 +elpa config.status 2013.08.001 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/ELPA_2013.08/configure.ac b/ELPA_2013.08/configure.ac index 61279bb1e05f5ec39d25df383b27d80b3fb34859..b2ddaa801863d299f650e6072df191f400251478 100644 --- a/ELPA_2013.08/configure.ac +++ b/ELPA_2013.08/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([elpa],[2013.08], elpa-library@rzg.mpg.de) +AC_INIT([elpa],[2013.08.001], elpa-library@rzg.mpg.de) AC_CONFIG_SRCDIR([src/elpa1.f90]) AM_INIT_AUTOMAKE([foreign -Wall subdir-objects]) @@ -24,7 +24,7 @@ AX_PROG_FC_MPI([],[have_mpi=yes],[have_mpi=no fi]) -AC_SUBST([ELPA_LIB_VERSION], [2013.08]) +AC_SUBST([ELPA_LIB_VERSION], [2013.08.001]) # this is the version of the API, should be changed in the major revision # if and only if the actual API changes AC_SUBST([ELPA_SO_VERSION], [0:0:0]) diff --git a/ELPA_2013.08/src/elpa2.F90 b/ELPA_2013.08/src/elpa2.F90 index de3a248fd71127de20f36c1119a34383c71b6bb9..922344edf2ea4925f5836931ac6e1cbab44478d6 100644 --- a/ELPA_2013.08/src/elpa2.F90 +++ b/ELPA_2013.08/src/elpa2.F90 @@ -1774,7 +1774,7 @@ contains #endif -#if defined(WITH_BGPG) || defined(WITH_BGQ) +#if defined(WITH_BGP) || defined(WITH_BGQ) !FORTRAN CODE / X86 INRINISIC CODE / BG ASSEMBLER USING 2 HOUSEHOLDER VECTORS do j = ncols, 2, -2 w(:,1) = bcast_buffer(1:nbw,j+off)