Commit 411999c8 authored by Andreas Marek's avatar Andreas Marek

Change of versioning of ELPA lib and the API

Thanks to a comment to the Debian community, the versioning
of the ELPA library and its API are changed:

- the API version nummer starts now with 0.0.0 and not
  anymore with the version number of the first ELPA release,
  i.e. 2011.12

- if ELPA is installed as library, the files are now named
  elpa.so.API_VERSION. All references to the ELPA version
  and the used compiler vanished, since these are considered
  harmeful.

Note, that at a later stage, if neccessary, the library name might
also contain the uses MPI version.
parent b015b6e1
......@@ -7,19 +7,19 @@ AM_LDFLAGS = @AM_LDFLAGS@ @BLACS_LDFLAGS@
BLACS_LDFLAGS = @BLACS_LDFLAGS@
# libelpa
lib_LTLIBRARIES = libelpa-@ELPA_LIB_VERSION@.la
lib_LTLIBRARIES = libelpa.la
libelpa_@ELPA_LIB_VERSION@_la_SOURCES = src/elpa1.f90 src/elpa2.f90
libelpa_la_SOURCES = src/elpa1.f90 src/elpa2.f90
if WITH_BGP
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels_bg.f90
libelpa_la_SOURCES += src/elpa2_kernels_bg.f90
else
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels.f90
libelpa_la_SOURCES += src/elpa2_kernels.f90
endif
libelpa_@ELPA_LIB_VERSION@_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
libelpa_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
# install any .mod files in the include/ dir
elpa_includedir = $(includedir)/elpa-$(ELPA_LIB_VERSION)
elpa_includedir = $(includedir)/elpa
nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute
......@@ -36,23 +36,23 @@ files_DATA = \
# pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa-$(ELPA_LIB_VERSION).pc
pkgconfig_DATA = elpa.pc
# test programs
noinst_bindir = $(abs_top_builddir)
noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2
test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real_LDADD = libelpa.la
test_real2_SOURCES = test/test_real2.f90
test_real2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real2_LDADD = libelpa.la
test_complex_SOURCES = test/test_complex.f90
test_complex_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex_LDADD = libelpa.la
test_complex2_SOURCES = test/test_complex2.f90
test_complex2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex2_LDADD = libelpa.la
check_SCRIPTS = test_real.sh test_real2.sh test_complex.sh test_complex2.sh
......
......@@ -74,7 +74,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = elpa-${ELPA_LIB_VERSION}.pc
CONFIG_CLEAN_FILES = elpa.pc
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
......@@ -107,33 +107,31 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" \
"$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(elpa_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libelpa_@ELPA_LIB_VERSION@_la_LIBADD =
am__libelpa_@ELPA_LIB_VERSION@_la_SOURCES_DIST = src/elpa1.f90 \
src/elpa2.f90 src/elpa2_kernels_bg.f90 src/elpa2_kernels.f90
libelpa_la_LIBADD =
am__libelpa_la_SOURCES_DIST = src/elpa1.f90 src/elpa2.f90 \
src/elpa2_kernels_bg.f90 src/elpa2_kernels.f90
am__dirstamp = $(am__leading_dot)dirstamp
@WITH_BGP_TRUE@am__objects_1 = src/elpa2_kernels_bg.lo
@WITH_BGP_FALSE@am__objects_2 = src/elpa2_kernels.lo
am_libelpa_@ELPA_LIB_VERSION@_la_OBJECTS = src/elpa1.lo src/elpa2.lo \
$(am__objects_1) $(am__objects_2)
libelpa_@ELPA_LIB_VERSION@_la_OBJECTS = \
$(am_libelpa_@ELPA_LIB_VERSION@_la_OBJECTS)
libelpa_@ELPA_LIB_VERSION@_la_LINK = $(LIBTOOL) --tag=FC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) \
$(AM_FCFLAGS) $(FCFLAGS) \
$(libelpa_@ELPA_LIB_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@
am_libelpa_la_OBJECTS = src/elpa1.lo src/elpa2.lo $(am__objects_1) \
$(am__objects_2)
libelpa_la_OBJECTS = $(am_libelpa_la_OBJECTS)
libelpa_la_LINK = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
$(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(noinst_bin_PROGRAMS)
am_test_complex_OBJECTS = test/test_complex.$(OBJEXT)
test_complex_OBJECTS = $(am_test_complex_OBJECTS)
test_complex_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_complex_DEPENDENCIES = libelpa.la
am_test_complex2_OBJECTS = test/test_complex2.$(OBJEXT)
test_complex2_OBJECTS = $(am_test_complex2_OBJECTS)
test_complex2_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_complex2_DEPENDENCIES = libelpa.la
am_test_real_OBJECTS = test/test_real.$(OBJEXT)
test_real_OBJECTS = $(am_test_real_OBJECTS)
test_real_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_real_DEPENDENCIES = libelpa.la
am_test_real2_OBJECTS = test/test_real2.$(OBJEXT)
test_real2_OBJECTS = $(am_test_real2_OBJECTS)
test_real2_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_real2_DEPENDENCIES = libelpa.la
DEFAULT_INCLUDES = -I.@am__isrc@
FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
LTFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
......@@ -142,12 +140,12 @@ FCLD = $(FC)
FCLINK = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libelpa_@ELPA_LIB_VERSION@_la_SOURCES) \
$(test_complex_SOURCES) $(test_complex2_SOURCES) \
$(test_real_SOURCES) $(test_real2_SOURCES)
DIST_SOURCES = $(am__libelpa_@ELPA_LIB_VERSION@_la_SOURCES_DIST) \
$(test_complex_SOURCES) $(test_complex2_SOURCES) \
$(test_real_SOURCES) $(test_real2_SOURCES)
SOURCES = $(libelpa_la_SOURCES) $(test_complex_SOURCES) \
$(test_complex2_SOURCES) $(test_real_SOURCES) \
$(test_real2_SOURCES)
DIST_SOURCES = $(am__libelpa_la_SOURCES_DIST) $(test_complex_SOURCES) \
$(test_complex2_SOURCES) $(test_real_SOURCES) \
$(test_real2_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -311,13 +309,13 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
# libelpa
lib_LTLIBRARIES = libelpa-@ELPA_LIB_VERSION@.la
libelpa_@ELPA_LIB_VERSION@_la_SOURCES = src/elpa1.f90 src/elpa2.f90 \
$(am__append_1) $(am__append_2)
libelpa_@ELPA_LIB_VERSION@_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
lib_LTLIBRARIES = libelpa.la
libelpa_la_SOURCES = src/elpa1.f90 src/elpa2.f90 $(am__append_1) \
$(am__append_2)
libelpa_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
# install any .mod files in the include/ dir
elpa_includedir = $(includedir)/elpa-$(ELPA_LIB_VERSION)
elpa_includedir = $(includedir)/elpa
nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute
......@@ -335,18 +333,18 @@ files_DATA = \
# pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa-$(ELPA_LIB_VERSION).pc
pkgconfig_DATA = elpa.pc
# test programs
noinst_bindir = $(abs_top_builddir)
test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real_LDADD = libelpa.la
test_real2_SOURCES = test/test_real2.f90
test_real2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real2_LDADD = libelpa.la
test_complex_SOURCES = test/test_complex.f90
test_complex_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex_LDADD = libelpa.la
test_complex2_SOURCES = test/test_complex2.f90
test_complex2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex2_LDADD = libelpa.la
check_SCRIPTS = test_real.sh test_real2.sh test_complex.sh test_complex2.sh
TESTS = $(check_SCRIPTS)
CLEANFILES = test_real.sh test_real2.sh test_complex.sh test_complex2.sh
......@@ -404,7 +402,7 @@ $(srcdir)/config.h.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
elpa-${ELPA_LIB_VERSION}.pc: $(top_builddir)/config.status $(srcdir)/elpa.pc.in
elpa.pc: $(top_builddir)/config.status $(srcdir)/elpa.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
......@@ -452,8 +450,8 @@ src/elpa2_kernels_bg.lo: src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/elpa2_kernels.lo: src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
libelpa-@ELPA_LIB_VERSION@.la: $(libelpa_@ELPA_LIB_VERSION@_la_OBJECTS) $(libelpa_@ELPA_LIB_VERSION@_la_DEPENDENCIES) $(EXTRA_libelpa_@ELPA_LIB_VERSION@_la_DEPENDENCIES)
$(libelpa_@ELPA_LIB_VERSION@_la_LINK) -rpath $(libdir) $(libelpa_@ELPA_LIB_VERSION@_la_OBJECTS) $(libelpa_@ELPA_LIB_VERSION@_la_LIBADD) $(LIBS)
libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_DEPENDENCIES)
$(libelpa_la_LINK) -rpath $(libdir) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS)
install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \
......
......@@ -1415,7 +1415,7 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-BGP-kernek use kernel tuned for Bluegene/P
--with-BGP-kernel use kernel tuned for Bluegene/P
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
......@@ -4512,11 +4512,11 @@ fi
ELPA_LIB_VERSION=2011.12-${FC}
ELPA_LIB_VERSION=2011.12
# this is the version of the API, should be changed in the major revision
# if and only if the actual API changes
ELPA_SO_VERSION=2011:12:0
ELPA_SO_VERSION=0:0:0
ac_ext=${ac_fc_srcext-f}
......@@ -15534,7 +15534,7 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
mkdir modules
ac_config_files="$ac_config_files Makefile elpa-${ELPA_LIB_VERSION}.pc:elpa.pc.in"
ac_config_files="$ac_config_files Makefile elpa.pc:elpa.pc.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -16650,7 +16650,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"elpa-${ELPA_LIB_VERSION}.pc") CONFIG_FILES="$CONFIG_FILES elpa-${ELPA_LIB_VERSION}.pc:elpa.pc.in" ;;
"elpa.pc") CONFIG_FILES="$CONFIG_FILES elpa.pc:elpa.pc.in" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
......
......@@ -23,10 +23,10 @@ AX_PROG_FC_MPI([],[have_mpi=yes],[have_mpi=no
fi])
AC_SUBST([ELPA_LIB_VERSION], [2011.12-${FC}])
AC_SUBST([ELPA_LIB_VERSION], [2011.12])
# 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], [2011:12:0])
AC_SUBST([ELPA_SO_VERSION], [0:0:0])
AC_FC_FREEFORM
AC_FC_MODULE_FLAG
......@@ -178,6 +178,6 @@ mkdir modules
AC_CONFIG_FILES([
Makefile
elpa-${ELPA_LIB_VERSION}.pc:elpa.pc.in
elpa.pc:elpa.pc.in
])
AC_OUTPUT
......@@ -7,76 +7,76 @@ AM_LDFLAGS = @AM_LDFLAGS@ @BLACS_LDFLAGS@
BLACS_LDFLAGS = @BLACS_LDFLAGS@
# libelpa
lib_LTLIBRARIES = libelpa-@ELPA_LIB_VERSION@.la
lib_LTLIBRARIES = libelpa.la
##rule to produce fortran config file:
#config_f90.h: ./config.h
# grep "^#define" ./config.h > $@
libelpa_@ELPA_LIB_VERSION@_la_SOURCES = src/elpa1.f90 src/elpa2.F90
libelpa_la_SOURCES = src/elpa1.f90 src/elpa2.F90
if WITH_GENERIC_SIMPLE
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_simple.f90 \
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_simple.f90 \
src/elpa2_kernels/elpa2_kernels_real_simple.f90
endif
if WITH_GENERIC
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex.f90 \
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex.f90 \
src/elpa2_kernels/elpa2_kernels_real.f90
endif
if WITH_BGP
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgp.f90 \
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgp.f90 \
src/elpa2_kernels/elpa2_kernels_complex.f90
endif
if WITH_BGQ
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgq.f90 \
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgq.f90 \
src/elpa2_kernels/elpa2_kernels_complex.f90
endif
if WITH_SSE_AS
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
endif
if WITH_AVX_SANDYBRIDGE
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
endif
if WITH_AMD_BULLDOZER
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c \
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c \
src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
endif
if WITH_AVX_COMPLEX_BLOCK1
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
endif
if WITH_AVX_COMPLEX_BLOCK2
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp \
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp \
src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
endif
if WITH_AVX_REAL_BLOCK2
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
endif
if WITH_AVX_REAL_BLOCK4
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
endif
if WITH_AVX_REAL_BLOCK6
libelpa_@ELPA_LIB_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
libelpa_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
endif
libelpa_@ELPA_LIB_VERSION@_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
libelpa_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
# install any .mod files in the include/ dir
elpa_includedir = $(includedir)/elpa-$(ELPA_LIB_VERSION)
elpa_includedir = $(includedir)/elpa
nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute
......@@ -93,23 +93,23 @@ files_DATA = \
# pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa-$(ELPA_LIB_VERSION).pc
pkgconfig_DATA = elpa.pc
# test programs
noinst_bindir = $(abs_top_builddir)
noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2
test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real_LDADD = libelpa.la
test_real2_SOURCES = test/test_real2.f90
test_real2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real2_LDADD = libelpa.la
test_complex_SOURCES = test/test_complex.f90
test_complex_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex_LDADD = libelpa.la
test_complex2_SOURCES = test/test_complex2.f90
test_complex2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex2_LDADD = libelpa.la
check_SCRIPTS = test_real.sh test_real2.sh test_complex.sh test_complex2.sh
......
......@@ -86,8 +86,9 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) \
$(nobase_elpa_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/elpa.pc.in $(top_srcdir)/configure ar-lib compile \
config.guess config.sub depcomp install-sh ltmain.sh missing
$(srcdir)/elpa.pc.in $(top_srcdir)/configure INSTALL ar-lib \
compile config.guess config.sub depcomp install-sh ltmain.sh \
missing
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 \
......@@ -99,7 +100,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = elpa-${ELPA_LIB_VERSION}.pc
CONFIG_CLEAN_FILES = elpa.pc
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
......@@ -132,9 +133,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" \
"$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(elpa_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libelpa_@ELPA_LIB_VERSION@_la_LIBADD =
am__libelpa_@ELPA_LIB_VERSION@_la_SOURCES_DIST = src/elpa1.f90 \
src/elpa2.F90 \
libelpa_la_LIBADD =
am__libelpa_la_SOURCES_DIST = src/elpa1.f90 src/elpa2.F90 \
src/elpa2_kernels/elpa2_kernels_complex_simple.f90 \
src/elpa2_kernels/elpa2_kernels_real_simple.f90 \
src/elpa2_kernels/elpa2_kernels_complex.f90 \
......@@ -171,30 +171,28 @@ am__dirstamp = $(am__leading_dot)dirstamp
@WITH_AVX_REAL_BLOCK2_TRUE@am__objects_10 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.lo
@WITH_AVX_REAL_BLOCK4_TRUE@am__objects_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.lo
@WITH_AVX_REAL_BLOCK6_TRUE@am__objects_12 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo
am_libelpa_@ELPA_LIB_VERSION@_la_OBJECTS = src/elpa1.lo src/elpa2.lo \
$(am__objects_1) $(am__objects_2) $(am__objects_3) \
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
$(am__objects_7) $(am__objects_8) $(am__objects_9) \
$(am__objects_10) $(am__objects_11) $(am__objects_12)
libelpa_@ELPA_LIB_VERSION@_la_OBJECTS = \
$(am_libelpa_@ELPA_LIB_VERSION@_la_OBJECTS)
libelpa_@ELPA_LIB_VERSION@_la_LINK = $(LIBTOOL) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) \
$(libelpa_@ELPA_LIB_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@
am_libelpa_la_OBJECTS = src/elpa1.lo src/elpa2.lo $(am__objects_1) \
$(am__objects_2) $(am__objects_3) $(am__objects_4) \
$(am__objects_5) $(am__objects_6) $(am__objects_7) \
$(am__objects_8) $(am__objects_9) $(am__objects_10) \
$(am__objects_11) $(am__objects_12)
libelpa_la_OBJECTS = $(am_libelpa_la_OBJECTS)
libelpa_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(noinst_bin_PROGRAMS)
am_test_complex_OBJECTS = test/test_complex.$(OBJEXT)
test_complex_OBJECTS = $(am_test_complex_OBJECTS)
test_complex_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_complex_DEPENDENCIES = libelpa.la
am_test_complex2_OBJECTS = test/test_complex2.$(OBJEXT)
test_complex2_OBJECTS = $(am_test_complex2_OBJECTS)
test_complex2_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_complex2_DEPENDENCIES = libelpa.la
am_test_real_OBJECTS = test/test_real.$(OBJEXT)
test_real_OBJECTS = $(am_test_real_OBJECTS)
test_real_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_real_DEPENDENCIES = libelpa.la
am_test_real2_OBJECTS = test/test_real2.$(OBJEXT)
test_real2_OBJECTS = $(am_test_real2_OBJECTS)
test_real2_DEPENDENCIES = libelpa-@ELPA_LIB_VERSION@.la
test_real2_DEPENDENCIES = libelpa.la
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
......@@ -232,12 +230,12 @@ LTFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
SOURCES = $(libelpa_@ELPA_LIB_VERSION@_la_SOURCES) \
$(test_complex_SOURCES) $(test_complex2_SOURCES) \
$(test_real_SOURCES) $(test_real2_SOURCES)
DIST_SOURCES = $(am__libelpa_@ELPA_LIB_VERSION@_la_SOURCES_DIST) \
$(test_complex_SOURCES) $(test_complex2_SOURCES) \
$(test_real_SOURCES) $(test_real2_SOURCES)
SOURCES = $(libelpa_la_SOURCES) $(test_complex_SOURCES) \
$(test_complex2_SOURCES) $(test_real_SOURCES) \
$(test_real2_SOURCES)
DIST_SOURCES = $(am__libelpa_la_SOURCES_DIST) $(test_complex_SOURCES) \
$(test_complex2_SOURCES) $(test_real_SOURCES) \
$(test_real2_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -409,19 +407,19 @@ with_amd_bulldozer_kernel = @with_amd_bulldozer_kernel@
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
# libelpa
lib_LTLIBRARIES = libelpa-@ELPA_LIB_VERSION@.la
lib_LTLIBRARIES = libelpa.la
#config_f90.h: ./config.h
# grep "^#define" ./config.h > $@
libelpa_@ELPA_LIB_VERSION@_la_SOURCES = src/elpa1.f90 src/elpa2.F90 \
$(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4) $(am__append_5) $(am__append_6) \
$(am__append_7) $(am__append_8) $(am__append_9) \
$(am__append_10) $(am__append_11) $(am__append_12)
libelpa_@ELPA_LIB_VERSION@_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
libelpa_la_SOURCES = src/elpa1.f90 src/elpa2.F90 $(am__append_1) \
$(am__append_2) $(am__append_3) $(am__append_4) \
$(am__append_5) $(am__append_6) $(am__append_7) \
$(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12)
libelpa_la_LDFLAGS = -version-info $(ELPA_SO_VERSION)
# install any .mod files in the include/ dir
elpa_includedir = $(includedir)/elpa-$(ELPA_LIB_VERSION)
elpa_includedir = $(includedir)/elpa
nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute
......@@ -439,18 +437,18 @@ files_DATA = \
# pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa-$(ELPA_LIB_VERSION).pc
pkgconfig_DATA = elpa.pc
# test programs
noinst_bindir = $(abs_top_builddir)
test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real_LDADD = libelpa.la
test_real2_SOURCES = test/test_real2.f90
test_real2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_real2_LDADD = libelpa.la
test_complex_SOURCES = test/test_complex.f90
test_complex_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex_LDADD = libelpa.la
test_complex2_SOURCES = test/test_complex2.f90
test_complex2_LDADD = libelpa-@ELPA_LIB_VERSION@.la
test_complex2_LDADD = libelpa.la
check_SCRIPTS = test_real.sh test_real2.sh test_complex.sh test_complex2.sh
TESTS = $(check_SCRIPTS)
CLEANFILES = test_real.sh test_real2.sh test_complex.sh test_complex2.sh
......@@ -508,7 +506,7 @@ $(srcdir)/config.h.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
elpa-${ELPA_LIB_VERSION}.pc: $(top_builddir)/config.status $(srcdir)/elpa.pc.in
elpa.pc: $(top_builddir)/config.status $(srcdir)/elpa.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
......@@ -594,8 +592,8 @@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo: \
src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo: \
src/elpa2_kernels/$(am__dirstamp) \
src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp)
libelpa-@ELPA_LIB_VERSION@.la: $(libelpa_@ELPA_LIB_VERSION@_la_OBJECTS) $(libelpa_@ELPA_LIB_VERSION@_la_DEPENDENCIES) $(EXTRA_libelpa_@ELPA_LIB_VERSION@_la_DEPENDENCIES)
$(libelpa_@ELPA_LIB_VERSION@_la_LINK) -rpath $(libdir) $(libelpa_@ELPA_LIB_VERSION@_la_OBJECTS) $(libelpa_@ELPA_LIB_VERSION@_la_LIBADD) $(LIBS)
libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_DEPENDENCIES)
$(libelpa_la_LINK) -rpath $(libdir) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS)
install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for elpa 2013.02.
# Generated by GNU Autoconf 2.69 for elpa 2013.08.
#
# Report bugs to <elpa-library@rzg.mpg.de>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='elpa'
PACKAGE_TARNAME='elpa'
PACKAGE_VERSION='2013.02'
PACKAGE_STRING='elpa 2013.02'
PACKAGE_VERSION='2013.08'
PACKAGE_STRING='elpa 2013.08'
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.02 to adapt to many kinds of systems.
\`configure' configures elpa 2013.08 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.02:";;
short | recursive ) echo "Configuration of elpa 2013.08:";;
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.02
elpa configure 2013.08
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.02, which was
It was created by elpa $as_me 2013.08, 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.02'
VERSION='2013.08'
cat >>confdefs.h <<_ACEOF
......@@ -5230,11 +5230,11 @@ fi
ELPA_LIB_VERSION=2011.12-${FC}
ELPA_LIB_VERSION=2013.08
# this is the version of the API, should be changed in the major revision
# if and only if the actual API changes
ELPA_SO_VERSION=2011:12:0
ELPA_SO_VERSION=0:0:0
ac_ext=${ac_fc_srcext-f}
......@@ -19772,7 +19772,7 @@ mkdir modules
#define HIDDEN
#endif])
ac_config_files="$ac_config_files Makefile elpa-${ELPA_LIB_VERSION}.pc:elpa.pc.in"
ac_config_files="$ac_config_files Makefile elpa.pc:elpa.pc.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -20366,7 +20366,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.02, which was
This file was extended by elpa $as_me 2013.08, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -20432,7 +20432,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.02
elpa config.status 2013.08
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......@@ -21026,7 +21026,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"elpa-${ELPA_LIB_VERSION}.pc") CONFIG_FILES="$CONFIG_FILES elpa-${ELPA_LIB_VERSION}.pc:elpa.pc.in" ;;
"elpa.pc") CONFIG_FILES="$CONFIG_FILES elpa.pc:elpa.pc.in" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
......
......@@ -24,10 +24,10 @@ AX_PROG_FC_MPI([],[have_mpi=yes],[have_mpi=no
fi])
AC_SUBST([ELPA_LIB_VERSION], [2013.08-${FC}])
AC_SUBST([ELPA_LIB_VERSION], [2013.08])
# 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], [2011:12:0])
AC_SUBST([ELPA_SO_VERSION], [0:0:0])
AC_FC_FREEFORM
AC_FC_MODULE_FLAG
......@@ -246,7 +246,7 @@ mkdir modules
AC_CONFIG_FILES([
Makefile
elpa-${ELPA_LIB_VERSION}.pc:elpa.pc.in
elpa.pc:elpa.pc.in
])
AC_OUTPUT
grep "^#define" config.h > config-f90.h