From b366e867302c1f922aab45937cb8ca7e0ca5a96e Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Fri, 8 Nov 2013 15:28:47 +0100 Subject: [PATCH] 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) --- ELPA_2011.12/Makefile.am | 4 +- ELPA_2011.12/Makefile.in | 81 +++++++++-------- ELPA_2011.12/configure | 22 ++--- ELPA_2011.12/configure.ac | 4 +- ELPA_2011.12/test/test_complex.f90 | 2 +- ELPA_2011.12/test/test_complex2.f90 | 2 +- ELPA_2011.12/test/test_real.f90 | 2 + ELPA_2011.12/test/test_real2.f90 | 2 +- ELPA_2013.08/Makefile.am | 4 +- ELPA_2013.08/Makefile.in | 81 +++++++++-------- ELPA_2013.08/configure | 22 ++--- ELPA_2013.08/configure.ac | 4 +- ELPA_2013.08/test/test_complex.f90 | 2 +- ELPA_2013.08/test/test_complex2.f90 | 2 +- ELPA_2013.08/test/test_real.f90 | 2 +- ELPA_2013.08/test/test_real2.f90 | 2 +- ELPA_development_version_OpenMP/Makefile.am | 13 +-- ELPA_development_version_OpenMP/Makefile.in | 87 ++++++++++--------- .../test/{read_real.f90 => read_real.F90} | 0 .../{read_real_gen.f90 => read_real_gen.F90} | 0 ...t_complex_gen.f90 => test_complex_gen.F90} | 0 .../{test_real_gen.f90 => test_real_gen.F90} | 0 22 files changed, 170 insertions(+), 168 deletions(-) rename ELPA_development_version_OpenMP/test/{read_real.f90 => read_real.F90} (100%) rename ELPA_development_version_OpenMP/test/{read_real_gen.f90 => read_real_gen.F90} (100%) rename ELPA_development_version_OpenMP/test/{test_complex_gen.f90 => test_complex_gen.F90} (100%) rename ELPA_development_version_OpenMP/test/{test_real_gen.f90 => test_real_gen.F90} (100%) diff --git a/ELPA_2011.12/Makefile.am b/ELPA_2011.12/Makefile.am index d5fd0a55..69d31605 100644 --- a/ELPA_2011.12/Makefile.am +++ b/ELPA_2011.12/Makefile.am @@ -39,8 +39,8 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = elpa.pc # test programs -noinst_bindir = $(abs_top_builddir) -noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2 +#bindir = $(abs_top_builddir) +bin_PROGRAMS = test_real test_real2 test_complex test_complex2 test_real_SOURCES = test/test_real.f90 test_real_LDADD = libelpa.la diff --git a/ELPA_2011.12/Makefile.in b/ELPA_2011.12/Makefile.in index cac83adc..275a05cf 100644 --- a/ELPA_2011.12/Makefile.in +++ b/ELPA_2011.12/Makefile.in @@ -55,7 +55,7 @@ build_triplet = @build@ host_triplet = @host@ @WITH_BGP_TRUE@am__append_1 = src/elpa2_kernels_bg.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) subdir = . DIST_COMMON = README $(am__configure_deps) \ @@ -103,7 +103,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( 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)$(elpa_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -119,7 +119,7 @@ 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) +PROGRAMS = $(bin_PROGRAMS) am_test_complex_OBJECTS = test/test_complex.$(OBJEXT) test_complex_OBJECTS = $(am_test_complex_OBJECTS) test_complex_DEPENDENCIES = libelpa.la @@ -333,9 +333,6 @@ files_DATA = \ # pkg-config stuff pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = elpa.pc - -# test programs -noinst_bindir = $(abs_top_builddir) test_real_SOURCES = test/test_real.f90 test_real_LDADD = libelpa.la test_real2_SOURCES = test/test_real2.f90 @@ -451,12 +448,12 @@ src/elpa2_kernels.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) 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) +install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - @list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(noinst_bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(noinst_bindir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ @@ -474,23 +471,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(noinst_bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(noinst_bindir)$$dir" || exit $$?; \ + 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)$(bindir)$$dir" || exit $$?; \ } \ ; done -uninstall-noinst_binPROGRAMS: +uninstall-binPROGRAMS: @$(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 | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -e 's/$$/$(EXEEXT)/' `; \ test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(noinst_bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(noinst_bindir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files -clean-noinst_binPROGRAMS: - @list='$(noinst_bin_PROGRAMS)'; test -n "$$list" || exit 0; \ +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ rm -f $$list || exit $$?; \ test -n "$(EXEEXT)" || exit 0; \ @@ -958,8 +955,10 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ config.h +install-binPROGRAMS: install-libLTLIBRARIES + 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"; \ done install: install-am @@ -999,8 +998,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinst_binPROGRAMS mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1021,13 +1020,13 @@ info: info-am info-am: install-data-am: install-filesDATA install-nobase_elpa_includeHEADERS \ - install-noinst_binPROGRAMS install-pkgconfigDATA + install-pkgconfigDATA install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-html: install-html-am @@ -1068,33 +1067,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-filesDATA uninstall-libLTLIBRARIES \ - uninstall-nobase_elpa_includeHEADERS \ - uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA +uninstall-am: uninstall-binPROGRAMS uninstall-filesDATA \ + uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \ + uninstall-pkgconfigDATA .MAKE: all check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ - clean clean-cscope clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinst_binPROGRAMS cscope cscopelist ctags \ + clean clean-binPROGRAMS clean-cscope clean-generic \ + clean-libLTLIBRARIES clean-libtool cscope cscopelist ctags \ dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-filesDATA \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ - install-nobase_elpa_includeHEADERS install-noinst_binPROGRAMS \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-filesDATA uninstall-libLTLIBRARIES \ - uninstall-nobase_elpa_includeHEADERS \ - uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-filesDATA install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-nobase_elpa_includeHEADERS install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-filesDATA \ + uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \ + uninstall-pkgconfigDATA test_real.sh: diff --git a/ELPA_2011.12/configure b/ELPA_2011.12/configure index 7b3c47a3..cbfd6695 100755 --- a/ELPA_2011.12/configure +++ b/ELPA_2011.12/configure @@ -1,6 +1,6 @@ #! /bin/sh # 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 . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='elpa' PACKAGE_TARNAME='elpa' -PACKAGE_VERSION='2011.12' -PACKAGE_STRING='elpa 2011.12' +PACKAGE_VERSION='2011.12.001' +PACKAGE_STRING='elpa 2011.12.001' PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de' PACKAGE_URL='' @@ -1324,7 +1324,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 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]... @@ -1394,7 +1394,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elpa 2011.12:";; + short | recursive ) echo "Configuration of elpa 2011.12.001:";; esac cat <<\_ACEOF @@ -1500,7 +1500,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elpa configure 2011.12 +elpa configure 2011.12.001 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1862,7 +1862,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 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 $ $0 $@ @@ -2688,7 +2688,7 @@ fi # Define the identity of the package. PACKAGE='elpa' - VERSION='2011.12' + VERSION='2011.12.001' cat >>confdefs.h <<_ACEOF @@ -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 # if and only if the actual API changes @@ -16074,7 +16074,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 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 CONFIG_FILES = $CONFIG_FILES @@ -16140,7 +16140,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 2011.12 +elpa config.status 2011.12.001 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/ELPA_2011.12/configure.ac b/ELPA_2011.12/configure.ac index cda50369..799c8011 100644 --- a/ELPA_2011.12/configure.ac +++ b/ELPA_2011.12/configure.ac @@ -1,5 +1,5 @@ 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]) AM_INIT_AUTOMAKE([foreign -Wall subdir-objects]) @@ -23,7 +23,7 @@ AX_PROG_FC_MPI([],[have_mpi=yes],[have_mpi=no 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 # if and only if the actual API changes AC_SUBST([ELPA_SO_VERSION], [0:0:0]) diff --git a/ELPA_2011.12/test/test_complex.f90 b/ELPA_2011.12/test/test_complex.f90 index 38f16a60..9cb71c04 100644 --- a/ELPA_2011.12/test/test_complex.f90 +++ b/ELPA_2011.12/test/test_complex.f90 @@ -294,7 +294,7 @@ program test_complex deallocate(tmp1) deallocate(tmp2) deallocate(ev) - + call blacs_gridexit(my_blacs_ctxt) call mpi_finalize(mpierr) call EXIT(STATUS) end diff --git a/ELPA_2011.12/test/test_complex2.f90 b/ELPA_2011.12/test/test_complex2.f90 index 59d48525..ee3f8216 100644 --- a/ELPA_2011.12/test/test_complex2.f90 +++ b/ELPA_2011.12/test/test_complex2.f90 @@ -267,7 +267,7 @@ program test_complex2 deallocate(tmp1) deallocate(tmp2) deallocate(ev) - + call blacs_gridexit(my_blacs_ctxt) call mpi_finalize(mpierr) call EXIT(STATUS) end diff --git a/ELPA_2011.12/test/test_real.f90 b/ELPA_2011.12/test/test_real.f90 index 0580fb18..280de15d 100644 --- a/ELPA_2011.12/test/test_real.f90 +++ b/ELPA_2011.12/test/test_real.f90 @@ -291,6 +291,8 @@ program test_real deallocate(tmp2) deallocate(ev) + call blacs_gridexit(my_blacs_ctxt) + call mpi_finalize(mpierr) call EXIT(STATUS) diff --git a/ELPA_2011.12/test/test_real2.f90 b/ELPA_2011.12/test/test_real2.f90 index 9ee6b70f..5bfc156a 100644 --- a/ELPA_2011.12/test/test_real2.f90 +++ b/ELPA_2011.12/test/test_real2.f90 @@ -292,7 +292,7 @@ program test_real2 deallocate(tmp1) deallocate(tmp2) deallocate(ev) - + call blacs_gridexit(my_blacs_ctxt) call mpi_finalize(mpierr) call EXIT(STATUS) end diff --git a/ELPA_2013.08/Makefile.am b/ELPA_2013.08/Makefile.am index 77803dc5..980f7cea 100644 --- a/ELPA_2013.08/Makefile.am +++ b/ELPA_2013.08/Makefile.am @@ -96,8 +96,8 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = elpa.pc # test programs -noinst_bindir = $(abs_top_builddir) -noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2 +#noinst_bindir = $(abs_top_builddir) +bin_PROGRAMS = test_real test_real2 test_complex test_complex2 test_real_SOURCES = test/test_real.f90 test_real_LDADD = libelpa.la diff --git a/ELPA_2013.08/Makefile.in b/ELPA_2013.08/Makefile.in index f4f74bf6..598db371 100644 --- a/ELPA_2013.08/Makefile.in +++ b/ELPA_2013.08/Makefile.in @@ -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_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 -noinst_bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \ +bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \ test_complex$(EXEEXT) test_complex2$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) \ @@ -129,7 +129,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( 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)$(elpa_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -180,7 +180,7 @@ 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) +PROGRAMS = $(bin_PROGRAMS) am_test_complex_OBJECTS = test/test_complex.$(OBJEXT) test_complex_OBJECTS = $(am_test_complex_OBJECTS) test_complex_DEPENDENCIES = libelpa.la @@ -438,9 +438,6 @@ files_DATA = \ # pkg-config stuff pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = elpa.pc - -# test programs -noinst_bindir = $(abs_top_builddir) test_real_SOURCES = test/test_real.f90 test_real_LDADD = libelpa.la test_real2_SOURCES = test/test_real2.f90 @@ -594,12 +591,12 @@ src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo: \ src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp) 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) +install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - @list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(noinst_bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(noinst_bindir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ @@ -617,23 +614,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(noinst_bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(noinst_bindir)$$dir" || exit $$?; \ + 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)$(bindir)$$dir" || exit $$?; \ } \ ; done -uninstall-noinst_binPROGRAMS: +uninstall-binPROGRAMS: @$(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 | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -e 's/$$/$(EXEEXT)/' `; \ test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(noinst_bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(noinst_bindir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files -clean-noinst_binPROGRAMS: - @list='$(noinst_bin_PROGRAMS)'; test -n "$$list" || exit 0; \ +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ rm -f $$list || exit $$?; \ test -n "$(EXEEXT)" || exit 0; \ @@ -1194,8 +1191,10 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ config.h +install-binPROGRAMS: install-libLTLIBRARIES + 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"; \ done install: install-am @@ -1237,8 +1236,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinst_binPROGRAMS mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1260,13 +1259,13 @@ info: info-am info-am: install-data-am: install-filesDATA install-nobase_elpa_includeHEADERS \ - install-noinst_binPROGRAMS install-pkgconfigDATA + install-pkgconfigDATA install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-html: install-html-am @@ -1308,33 +1307,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-filesDATA uninstall-libLTLIBRARIES \ - uninstall-nobase_elpa_includeHEADERS \ - uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA +uninstall-am: uninstall-binPROGRAMS uninstall-filesDATA \ + uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \ + uninstall-pkgconfigDATA .MAKE: all check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ - clean clean-cscope clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinst_binPROGRAMS cscope cscopelist ctags \ + clean clean-binPROGRAMS clean-cscope clean-generic \ + clean-libLTLIBRARIES clean-libtool cscope cscopelist ctags \ dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-filesDATA \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ - install-nobase_elpa_includeHEADERS install-noinst_binPROGRAMS \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-filesDATA uninstall-libLTLIBRARIES \ - uninstall-nobase_elpa_includeHEADERS \ - uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-filesDATA install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-nobase_elpa_includeHEADERS install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-filesDATA \ + uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \ + uninstall-pkgconfigDATA test_real.sh: diff --git a/ELPA_2013.08/configure b/ELPA_2013.08/configure index 6fc3148d..85838bca 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.001. +# Generated by GNU Autoconf 2.69 for elpa 2013.08.002. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='elpa' PACKAGE_TARNAME='elpa' -PACKAGE_VERSION='2013.08.001' -PACKAGE_STRING='elpa 2013.08.001' +PACKAGE_VERSION='2013.08.002' +PACKAGE_STRING='elpa 2013.08.002' 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.001 to adapt to many kinds of systems. +\`configure' configures elpa 2013.08.002 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.001:";; + short | recursive ) echo "Configuration of elpa 2013.08.002:";; 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.001 +elpa configure 2013.08.002 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.001, which was +It was created by elpa $as_me 2013.08.002, 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.001' + VERSION='2013.08.002' cat >>confdefs.h <<_ACEOF @@ -5230,7 +5230,7 @@ fi -ELPA_LIB_VERSION=2013.08.001 +ELPA_LIB_VERSION=2013.08.002 # 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.001, which was +This file was extended by elpa $as_me 2013.08.002, 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.001 +elpa config.status 2013.08.002 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 b2ddaa80..31530d36 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.001], elpa-library@rzg.mpg.de) +AC_INIT([elpa],[2013.08.002], 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.001]) +AC_SUBST([ELPA_LIB_VERSION], [2013.08.002]) # 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/test/test_complex.f90 b/ELPA_2013.08/test/test_complex.f90 index c26738ac..2472bf24 100644 --- a/ELPA_2013.08/test/test_complex.f90 +++ b/ELPA_2013.08/test/test_complex.f90 @@ -339,7 +339,7 @@ program test_complex deallocate(tmp1) deallocate(tmp2) deallocate(ev) - + call blacs_gridexit(my_blacs_ctxt) call mpi_finalize(mpierr) call EXIT(STATUS) end diff --git a/ELPA_2013.08/test/test_complex2.f90 b/ELPA_2013.08/test/test_complex2.f90 index b14c3e52..7adc1717 100644 --- a/ELPA_2013.08/test/test_complex2.f90 +++ b/ELPA_2013.08/test/test_complex2.f90 @@ -317,7 +317,7 @@ program test_complex2 deallocate(tmp1) deallocate(tmp2) deallocate(ev) - + call blacs_gridexit(my_blacs_ctxt) call mpi_finalize(mpierr) call EXIT(STATUS) end diff --git a/ELPA_2013.08/test/test_real.f90 b/ELPA_2013.08/test/test_real.f90 index 177d3015..89d4b2fb 100644 --- a/ELPA_2013.08/test/test_real.f90 +++ b/ELPA_2013.08/test/test_real.f90 @@ -338,7 +338,7 @@ program test_real deallocate(tmp1) deallocate(tmp2) deallocate(ev) - + call blacs_gridexit(my_blacs_ctxt) call mpi_finalize(mpierr) call EXIT(STATUS) diff --git a/ELPA_2013.08/test/test_real2.f90 b/ELPA_2013.08/test/test_real2.f90 index 2e16648d..70e0e29c 100644 --- a/ELPA_2013.08/test/test_real2.f90 +++ b/ELPA_2013.08/test/test_real2.f90 @@ -335,7 +335,7 @@ program test_real2 deallocate(tmp1) deallocate(tmp2) deallocate(ev) - + call blacs_gridexit(my_blacs_ctxt) call mpi_finalize(mpierr) call EXIT(STATUS) end diff --git a/ELPA_development_version_OpenMP/Makefile.am b/ELPA_development_version_OpenMP/Makefile.am index f5ff9b2f..69cd1f05 100644 --- a/ELPA_development_version_OpenMP/Makefile.am +++ b/ELPA_development_version_OpenMP/Makefile.am @@ -147,14 +147,14 @@ nobase_elpa_include_HEADERS = $(wildcard modules/*) # other files to distribute filesdir = $(datarootdir) files_DATA = \ - test/read_real.f90 \ - test/read_real_gen.f90 \ + test/read_real.F90 \ + test/read_real_gen.F90 \ test/test_complex2.F90 \ test/test_complex.F90 \ - test/test_complex_gen.f90 \ + test/test_complex_gen.F90 \ test/test_real2.F90 \ test/test_real.F90 \ - test/test_real_gen.f90 + test/test_real_gen.F90 # pkg-config stuff pkgconfigdir = $(libdir)/pkgconfig @@ -166,8 +166,9 @@ build_lib = libelpa_mt.la else build_lib = libelpa.la endif -noinst_bindir = $(abs_top_builddir) -noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2 + +#bindir = $(abs_top_builddir) +bin_PROGRAMS = test_real test_real2 test_complex test_complex2 test_real_SOURCES = test/test_real.F90 test_real_LDADD = $(build_lib) diff --git a/ELPA_development_version_OpenMP/Makefile.in b/ELPA_development_version_OpenMP/Makefile.in index 8d1cfc9f..bf10893b 100644 --- a/ELPA_development_version_OpenMP/Makefile.in +++ b/ELPA_development_version_OpenMP/Makefile.in @@ -107,7 +107,7 @@ host_triplet = @host@ @WITH_AVX_REAL_BLOCK4_TRUE@@WITH_OPENMP_FALSE@am__append_22 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c @WITH_AVX_REAL_BLOCK6_TRUE@@WITH_OPENMP_TRUE@am__append_23 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c @WITH_AVX_REAL_BLOCK6_TRUE@@WITH_OPENMP_FALSE@am__append_24 = 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) subdir = . DIST_COMMON = README $(am__configure_deps) \ @@ -156,7 +156,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( 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)$(elpa_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -253,7 +253,7 @@ libelpa_mt_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libelpa_mt_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_OPENMP_TRUE@am_libelpa_mt_la_rpath = -rpath $(libdir) -PROGRAMS = $(noinst_bin_PROGRAMS) +PROGRAMS = $(bin_PROGRAMS) am_test_complex_OBJECTS = test/test_complex.$(OBJEXT) test_complex_OBJECTS = $(am_test_complex_OBJECTS) test_complex_DEPENDENCIES = $(build_lib) @@ -511,14 +511,14 @@ nobase_elpa_include_HEADERS = $(wildcard modules/*) # other files to distribute filesdir = $(datarootdir) files_DATA = \ - test/read_real.f90 \ - test/read_real_gen.f90 \ + test/read_real.F90 \ + test/read_real_gen.F90 \ test/test_complex2.F90 \ test/test_complex.F90 \ - test/test_complex_gen.f90 \ + test/test_complex_gen.F90 \ test/test_real2.F90 \ test/test_real.F90 \ - test/test_real_gen.f90 + test/test_real_gen.F90 # pkg-config stuff @@ -528,7 +528,6 @@ pkgconfig_DATA = elpa.pc # test programs @WITH_OPENMP_TRUE@build_lib = libelpa_mt.la -noinst_bindir = $(abs_top_builddir) test_real_SOURCES = test/test_real.F90 test_real_LDADD = $(build_lib) test_real2_SOURCES = test/test_real2.F90 @@ -684,12 +683,12 @@ libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_ $(libelpa_la_LINK) $(am_libelpa_la_rpath) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS) libelpa_mt.la: $(libelpa_mt_la_OBJECTS) $(libelpa_mt_la_DEPENDENCIES) $(EXTRA_libelpa_mt_la_DEPENDENCIES) $(libelpa_mt_la_LINK) $(am_libelpa_mt_la_rpath) $(libelpa_mt_la_OBJECTS) $(libelpa_mt_la_LIBADD) $(LIBS) -install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) +install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - @list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(noinst_bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(noinst_bindir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ @@ -707,23 +706,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(noinst_bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(noinst_bindir)$$dir" || exit $$?; \ + 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)$(bindir)$$dir" || exit $$?; \ } \ ; done -uninstall-noinst_binPROGRAMS: +uninstall-binPROGRAMS: @$(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 | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -e 's/$$/$(EXEEXT)/' `; \ test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(noinst_bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(noinst_bindir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files -clean-noinst_binPROGRAMS: - @list='$(noinst_bin_PROGRAMS)'; test -n "$$list" || exit 0; \ +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ rm -f $$list || exit $$?; \ test -n "$(EXEEXT)" || exit 0; \ @@ -1284,8 +1283,10 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ config.h +install-binPROGRAMS: install-libLTLIBRARIES + 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"; \ done install: install-am @@ -1327,8 +1328,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinst_binPROGRAMS mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1350,13 +1351,13 @@ info: info-am info-am: install-data-am: install-filesDATA install-nobase_elpa_includeHEADERS \ - install-noinst_binPROGRAMS install-pkgconfigDATA + install-pkgconfigDATA install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-html: install-html-am @@ -1398,33 +1399,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-filesDATA uninstall-libLTLIBRARIES \ - uninstall-nobase_elpa_includeHEADERS \ - uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA +uninstall-am: uninstall-binPROGRAMS uninstall-filesDATA \ + uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \ + uninstall-pkgconfigDATA .MAKE: all check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ - clean clean-cscope clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinst_binPROGRAMS cscope cscopelist ctags \ + clean clean-binPROGRAMS clean-cscope clean-generic \ + clean-libLTLIBRARIES clean-libtool cscope cscopelist ctags \ dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-filesDATA \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ - install-nobase_elpa_includeHEADERS install-noinst_binPROGRAMS \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-filesDATA uninstall-libLTLIBRARIES \ - uninstall-nobase_elpa_includeHEADERS \ - uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-filesDATA install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-nobase_elpa_includeHEADERS install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-filesDATA \ + uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \ + uninstall-pkgconfigDATA test_real.sh: diff --git a/ELPA_development_version_OpenMP/test/read_real.f90 b/ELPA_development_version_OpenMP/test/read_real.F90 similarity index 100% rename from ELPA_development_version_OpenMP/test/read_real.f90 rename to ELPA_development_version_OpenMP/test/read_real.F90 diff --git a/ELPA_development_version_OpenMP/test/read_real_gen.f90 b/ELPA_development_version_OpenMP/test/read_real_gen.F90 similarity index 100% rename from ELPA_development_version_OpenMP/test/read_real_gen.f90 rename to ELPA_development_version_OpenMP/test/read_real_gen.F90 diff --git a/ELPA_development_version_OpenMP/test/test_complex_gen.f90 b/ELPA_development_version_OpenMP/test/test_complex_gen.F90 similarity index 100% rename from ELPA_development_version_OpenMP/test/test_complex_gen.f90 rename to ELPA_development_version_OpenMP/test/test_complex_gen.F90 diff --git a/ELPA_development_version_OpenMP/test/test_real_gen.f90 b/ELPA_development_version_OpenMP/test/test_real_gen.F90 similarity index 100% rename from ELPA_development_version_OpenMP/test/test_real_gen.f90 rename to ELPA_development_version_OpenMP/test/test_real_gen.F90 -- GitLab