There is a maintenance of MPCDF Gitlab on Thursday, April 22st 2020, 9:00 am CEST - Expect some service interruptions during this time

Commit b366e867 authored by Andreas Marek's avatar Andreas Marek

ELPA 2011.12.001

- install (if build) test binaries in installdir/bin
- finish the test examples with a clean blacs_grid_exit

ELPA 2013.08.002

- install (if build) test binaries in installdir/bin
- finish the test examples with a clean blacs_grid_exit

ELPA_development_version_OPENMP
- install (if build) test binaries in installdir/bin
- rename files from *.f90 to *.F90 (later needed)
parent bf34eb3b
...@@ -39,8 +39,8 @@ pkgconfigdir = $(libdir)/pkgconfig ...@@ -39,8 +39,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa.pc pkgconfig_DATA = elpa.pc
# test programs # test programs
noinst_bindir = $(abs_top_builddir) #bindir = $(abs_top_builddir)
noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2 bin_PROGRAMS = test_real test_real2 test_complex test_complex2
test_real_SOURCES = test/test_real.f90 test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa.la test_real_LDADD = libelpa.la
......
...@@ -55,7 +55,7 @@ build_triplet = @build@ ...@@ -55,7 +55,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
@WITH_BGP_TRUE@am__append_1 = src/elpa2_kernels_bg.f90 @WITH_BGP_TRUE@am__append_1 = src/elpa2_kernels_bg.f90
@WITH_BGP_FALSE@am__append_2 = src/elpa2_kernels.f90 @WITH_BGP_FALSE@am__append_2 = src/elpa2_kernels.f90
noinst_bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \ bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \
test_complex$(EXEEXT) test_complex2$(EXEEXT) test_complex$(EXEEXT) test_complex2$(EXEEXT)
subdir = . subdir = .
DIST_COMMON = README $(am__configure_deps) \ DIST_COMMON = README $(am__configure_deps) \
...@@ -103,7 +103,7 @@ am__uninstall_files_from_dir = { \ ...@@ -103,7 +103,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \ $(am__cd) "$$dir" && rm -f $$files; }; \
} }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(elpa_includedir)" "$(DESTDIR)$(elpa_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
...@@ -119,7 +119,7 @@ libelpa_la_OBJECTS = $(am_libelpa_la_OBJECTS) ...@@ -119,7 +119,7 @@ libelpa_la_OBJECTS = $(am_libelpa_la_OBJECTS)
libelpa_la_LINK = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) \ libelpa_la_LINK = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
$(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@ $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(noinst_bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_test_complex_OBJECTS = test/test_complex.$(OBJEXT) am_test_complex_OBJECTS = test/test_complex.$(OBJEXT)
test_complex_OBJECTS = $(am_test_complex_OBJECTS) test_complex_OBJECTS = $(am_test_complex_OBJECTS)
test_complex_DEPENDENCIES = libelpa.la test_complex_DEPENDENCIES = libelpa.la
...@@ -333,9 +333,6 @@ files_DATA = \ ...@@ -333,9 +333,6 @@ files_DATA = \
# pkg-config stuff # pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa.pc pkgconfig_DATA = elpa.pc
# test programs
noinst_bindir = $(abs_top_builddir)
test_real_SOURCES = test/test_real.f90 test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa.la test_real_LDADD = libelpa.la
test_real2_SOURCES = test/test_real2.f90 test_real2_SOURCES = test/test_real2.f90
...@@ -451,12 +448,12 @@ src/elpa2_kernels.lo: src/$(am__dirstamp) \ ...@@ -451,12 +448,12 @@ src/elpa2_kernels.lo: src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_DEPENDENCIES) libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_DEPENDENCIES)
$(libelpa_la_LINK) -rpath $(libdir) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS) $(libelpa_la_LINK) -rpath $(libdir) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS)
install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
if test -n "$$list"; then \ if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(noinst_bindir)'"; \ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
$(MKDIR_P) "$(DESTDIR)$(noinst_bindir)" || exit 1; \ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
fi; \ fi; \
for p in $$list; do echo "$$p $$p"; done | \ for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \ sed 's/$(EXEEXT)$$//' | \
...@@ -474,23 +471,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) ...@@ -474,23 +471,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS)
while read type dir files; do \ while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \ test -z "$$files" || { \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(noinst_bindir)$$dir'"; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(noinst_bindir)$$dir" || exit $$?; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \ } \
; done ; done
uninstall-noinst_binPROGRAMS: uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \ files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-e 's/$$/$(EXEEXT)/' `; \ -e 's/$$/$(EXEEXT)/' `; \
test -n "$$list" || exit 0; \ test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(noinst_bindir)' && rm -f" $$files ")"; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(noinst_bindir)" && rm -f $$files cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-noinst_binPROGRAMS: clean-binPROGRAMS:
@list='$(noinst_bin_PROGRAMS)'; test -n "$$list" || exit 0; \ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \ echo " rm -f" $$list; \
rm -f $$list || exit $$?; \ rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \ test -n "$(EXEEXT)" || exit 0; \
...@@ -958,8 +955,10 @@ check-am: all-am ...@@ -958,8 +955,10 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
config.h config.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"; do \ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: install-am install: install-am
...@@ -999,8 +998,8 @@ maintainer-clean-generic: ...@@ -999,8 +998,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
clean-noinst_binPROGRAMS mostlyclean-am clean-libtool mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f $(am__CONFIG_DISTCLEAN_FILES)
...@@ -1021,13 +1020,13 @@ info: info-am ...@@ -1021,13 +1020,13 @@ info: info-am
info-am: info-am:
install-data-am: install-filesDATA install-nobase_elpa_includeHEADERS \ install-data-am: install-filesDATA install-nobase_elpa_includeHEADERS \
install-noinst_binPROGRAMS install-pkgconfigDATA install-pkgconfigDATA
install-dvi: install-dvi-am install-dvi: install-dvi-am
install-dvi-am: install-dvi-am:
install-exec-am: install-libLTLIBRARIES install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
install-html: install-html-am install-html: install-html-am
...@@ -1068,33 +1067,33 @@ ps: ps-am ...@@ -1068,33 +1067,33 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-filesDATA uninstall-libLTLIBRARIES \ uninstall-am: uninstall-binPROGRAMS uninstall-filesDATA \
uninstall-nobase_elpa_includeHEADERS \ uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \
uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA uninstall-pkgconfigDATA
.MAKE: all check-am install-am install-strip .MAKE: all check-am install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
clean clean-cscope clean-generic clean-libLTLIBRARIES \ clean clean-binPROGRAMS clean-cscope clean-generic \
clean-libtool clean-noinst_binPROGRAMS cscope cscopelist ctags \ clean-libLTLIBRARIES clean-libtool cscope cscopelist ctags \
dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
dist-tarZ dist-xz dist-zip distcheck distclean \ dist-tarZ dist-xz dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \ distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \ distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \ distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \ install install-am install-binPROGRAMS install-data \
install-dvi-am install-exec install-exec-am install-filesDATA \ install-data-am install-dvi install-dvi-am install-exec \
install-html install-html-am install-info install-info-am \ install-exec-am install-filesDATA install-html install-html-am \
install-libLTLIBRARIES install-man \ install-info install-info-am install-libLTLIBRARIES \
install-nobase_elpa_includeHEADERS install-noinst_binPROGRAMS \ install-man install-nobase_elpa_includeHEADERS install-pdf \
install-pdf install-pdf-am install-pkgconfigDATA install-ps \ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
install-ps-am install-strip installcheck installcheck-am \ install-strip installcheck installcheck-am installdirs \
installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-am uninstall-filesDATA uninstall-libLTLIBRARIES \ uninstall-binPROGRAMS uninstall-filesDATA \
uninstall-nobase_elpa_includeHEADERS \ uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \
uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA uninstall-pkgconfigDATA
test_real.sh: test_real.sh:
......
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for elpa 2011.12. # Generated by GNU Autoconf 2.69 for elpa 2011.12.001.
# #
# Report bugs to <elpa-library@rzg.mpg.de>. # Report bugs to <elpa-library@rzg.mpg.de>.
# #
...@@ -590,8 +590,8 @@ MAKEFLAGS= ...@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='elpa' PACKAGE_NAME='elpa'
PACKAGE_TARNAME='elpa' PACKAGE_TARNAME='elpa'
PACKAGE_VERSION='2011.12' PACKAGE_VERSION='2011.12.001'
PACKAGE_STRING='elpa 2011.12' PACKAGE_STRING='elpa 2011.12.001'
PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de' PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de'
PACKAGE_URL='' PACKAGE_URL=''
...@@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures elpa 2011.12 to adapt to many kinds of systems. \`configure' configures elpa 2011.12.001 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1394,7 +1394,7 @@ fi ...@@ -1394,7 +1394,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of elpa 2011.12:";; short | recursive ) echo "Configuration of elpa 2011.12.001:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1500,7 +1500,7 @@ fi ...@@ -1500,7 +1500,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
elpa configure 2011.12 elpa configure 2011.12.001
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -1862,7 +1862,7 @@ cat >config.log <<_ACEOF ...@@ -1862,7 +1862,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by elpa $as_me 2011.12, which was It was created by elpa $as_me 2011.12.001, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -2688,7 +2688,7 @@ fi ...@@ -2688,7 +2688,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='elpa' PACKAGE='elpa'
VERSION='2011.12' VERSION='2011.12.001'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -4512,7 +4512,7 @@ fi ...@@ -4512,7 +4512,7 @@ fi
ELPA_LIB_VERSION=2011.12 ELPA_LIB_VERSION=2011.12.001
# this is the version of the API, should be changed in the major revision # this is the version of the API, should be changed in the major revision
# if and only if the actual API changes # if and only if the actual API changes
...@@ -16074,7 +16074,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -16074,7 +16074,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by elpa $as_me 2011.12, which was This file was extended by elpa $as_me 2011.12.001, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -16140,7 +16140,7 @@ _ACEOF ...@@ -16140,7 +16140,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
elpa config.status 2011.12 elpa config.status 2011.12.001
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
......
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([elpa],[2011.12], elpa-library@rzg.mpg.de) AC_INIT([elpa],[2011.12.001], elpa-library@rzg.mpg.de)
AC_CONFIG_SRCDIR([src/elpa1.f90]) AC_CONFIG_SRCDIR([src/elpa1.f90])
AM_INIT_AUTOMAKE([foreign -Wall subdir-objects]) AM_INIT_AUTOMAKE([foreign -Wall subdir-objects])
...@@ -23,7 +23,7 @@ AX_PROG_FC_MPI([],[have_mpi=yes],[have_mpi=no ...@@ -23,7 +23,7 @@ AX_PROG_FC_MPI([],[have_mpi=yes],[have_mpi=no
fi]) fi])
AC_SUBST([ELPA_LIB_VERSION], [2011.12]) AC_SUBST([ELPA_LIB_VERSION], [2011.12.001])
# this is the version of the API, should be changed in the major revision # this is the version of the API, should be changed in the major revision
# if and only if the actual API changes # if and only if the actual API changes
AC_SUBST([ELPA_SO_VERSION], [0:0:0]) AC_SUBST([ELPA_SO_VERSION], [0:0:0])
......
...@@ -294,7 +294,7 @@ program test_complex ...@@ -294,7 +294,7 @@ program test_complex
deallocate(tmp1) deallocate(tmp1)
deallocate(tmp2) deallocate(tmp2)
deallocate(ev) deallocate(ev)
call blacs_gridexit(my_blacs_ctxt)
call mpi_finalize(mpierr) call mpi_finalize(mpierr)
call EXIT(STATUS) call EXIT(STATUS)
end end
......
...@@ -267,7 +267,7 @@ program test_complex2 ...@@ -267,7 +267,7 @@ program test_complex2
deallocate(tmp1) deallocate(tmp1)
deallocate(tmp2) deallocate(tmp2)
deallocate(ev) deallocate(ev)
call blacs_gridexit(my_blacs_ctxt)
call mpi_finalize(mpierr) call mpi_finalize(mpierr)
call EXIT(STATUS) call EXIT(STATUS)
end end
......
...@@ -291,6 +291,8 @@ program test_real ...@@ -291,6 +291,8 @@ program test_real
deallocate(tmp2) deallocate(tmp2)
deallocate(ev) deallocate(ev)
call blacs_gridexit(my_blacs_ctxt)
call mpi_finalize(mpierr) call mpi_finalize(mpierr)
call EXIT(STATUS) call EXIT(STATUS)
......
...@@ -292,7 +292,7 @@ program test_real2 ...@@ -292,7 +292,7 @@ program test_real2
deallocate(tmp1) deallocate(tmp1)
deallocate(tmp2) deallocate(tmp2)
deallocate(ev) deallocate(ev)
call blacs_gridexit(my_blacs_ctxt)
call mpi_finalize(mpierr) call mpi_finalize(mpierr)
call EXIT(STATUS) call EXIT(STATUS)
end end
......
...@@ -96,8 +96,8 @@ pkgconfigdir = $(libdir)/pkgconfig ...@@ -96,8 +96,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa.pc pkgconfig_DATA = elpa.pc
# test programs # test programs
noinst_bindir = $(abs_top_builddir) #noinst_bindir = $(abs_top_builddir)
noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2 bin_PROGRAMS = test_real test_real2 test_complex test_complex2
test_real_SOURCES = test/test_real.f90 test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa.la test_real_LDADD = libelpa.la
......
...@@ -80,7 +80,7 @@ host_triplet = @host@ ...@@ -80,7 +80,7 @@ host_triplet = @host@
@WITH_AVX_REAL_BLOCK2_TRUE@am__append_10 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c @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 @WITH_AVX_REAL_BLOCK4_TRUE@am__append_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
@WITH_AVX_REAL_BLOCK6_TRUE@am__append_12 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c @WITH_AVX_REAL_BLOCK6_TRUE@am__append_12 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
noinst_bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \ bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \
test_complex$(EXEEXT) test_complex2$(EXEEXT) test_complex$(EXEEXT) test_complex2$(EXEEXT)
subdir = . subdir = .
DIST_COMMON = README $(am__configure_deps) \ DIST_COMMON = README $(am__configure_deps) \
...@@ -129,7 +129,7 @@ am__uninstall_files_from_dir = { \ ...@@ -129,7 +129,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \ $(am__cd) "$$dir" && rm -f $$files; }; \
} }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(elpa_includedir)" "$(DESTDIR)$(elpa_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
...@@ -180,7 +180,7 @@ libelpa_la_OBJECTS = $(am_libelpa_la_OBJECTS) ...@@ -180,7 +180,7 @@ libelpa_la_OBJECTS = $(am_libelpa_la_OBJECTS)
libelpa_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ libelpa_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@ $(CXXFLAGS) $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(noinst_bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_test_complex_OBJECTS = test/test_complex.$(OBJEXT) am_test_complex_OBJECTS = test/test_complex.$(OBJEXT)
test_complex_OBJECTS = $(am_test_complex_OBJECTS) test_complex_OBJECTS = $(am_test_complex_OBJECTS)
test_complex_DEPENDENCIES = libelpa.la test_complex_DEPENDENCIES = libelpa.la
...@@ -438,9 +438,6 @@ files_DATA = \ ...@@ -438,9 +438,6 @@ files_DATA = \
# pkg-config stuff # pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elpa.pc pkgconfig_DATA = elpa.pc
# test programs
noinst_bindir = $(abs_top_builddir)
test_real_SOURCES = test/test_real.f90 test_real_SOURCES = test/test_real.f90
test_real_LDADD = libelpa.la test_real_LDADD = libelpa.la
test_real2_SOURCES = test/test_real2.f90 test_real2_SOURCES = test/test_real2.f90
...@@ -594,12 +591,12 @@ src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo: \ ...@@ -594,12 +591,12 @@ src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo: \
src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp) src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp)
libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_DEPENDENCIES) libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_DEPENDENCIES)
$(libelpa_la_LINK) -rpath $(libdir) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS) $(libelpa_la_LINK) -rpath $(libdir) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS)
install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
if test -n "$$list"; then \ if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(noinst_bindir)'"; \ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
$(MKDIR_P) "$(DESTDIR)$(noinst_bindir)" || exit 1; \ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
fi; \ fi; \
for p in $$list; do echo "$$p $$p"; done | \ for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \ sed 's/$(EXEEXT)$$//' | \
...@@ -617,23 +614,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) ...@@ -617,23 +614,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS)
while read type dir files; do \ while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \ test -z "$$files" || { \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(noinst_bindir)$$dir'"; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(noinst_bindir)$$dir" || exit $$?; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \ } \
; done ; done
uninstall-noinst_binPROGRAMS: uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \ files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-e 's/$$/$(EXEEXT)/' `; \ -e 's/$$/$(EXEEXT)/' `; \
test -n "$$list" || exit 0; \ test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(noinst_bindir)' && rm -f" $$files ")"; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(noinst_bindir)" && rm -f $$files cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-noinst_binPROGRAMS: clean-binPROGRAMS:
@list='$(noinst_bin_PROGRAMS)'; test -n "$$list" || exit 0; \ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \ echo " rm -f" $$list; \
rm -f $$list || exit $$?; \ rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \ test -n "$(EXEEXT)" || exit 0; \
...@@ -1194,8 +1191,10 @@ check-am: all-am ...@@ -1194,8 +1191,10 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
config.h config.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"; do \ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done