Merge branch 'master' into ELPA_GPU

.gitlab-ci.yml

+jobs:
+  script: ./autogen.sh && ./configure && make && make check TEST_FLAGS='1500 50 16'

INSTALL

@@ -9,7 +9,7 @@ Debian, and OpenSuse. More, will hopefully follow in the future.
 
 If you want to build (or have to since no packages are available) ELPA yourself,
 please note that ELPA is shipped with a typical "configure" and "make"
-procedure. This is the only supported way how to build and install ELPA.
+autotools procedure. This is the only supported way how to build and install ELPA.
 
 If you obtained ELPA from the official git repository, you will not find
 the needed configure script! Please look at the "INSTALL_FROM_GIT_VERSION" file
@@ -17,9 +17,16 @@ for the documentation how to proceed.
 
 
 If --- against our recommendations --- you do not want to install ELPA as
-library, but to include it in your source code you will have to find a solution
-by yourself. If you do this anyway, please distribute then all files of ELPA
-with your code.
+library, or you do not want to use the autotools you will have to find a solution
+by yourself. This approach is NOT supported by us in any way and we strongly discourage
+this approach.
+
+If you do this, because you want to include ELPA within your code project (i.e. use
+ELPA not as an external library but "assimilate" it in your projects ),
+please distribute then _ALL_ files (as obtained from an official release tar-ball)
+of ELPA with your code. Note, however, that including the ELPA source files in your
+code projects (and not using ELPA as external library) is only allowed under the terms of
+the LGPL license if your code is ALSO under LGPL.
 
 
 (A): Installing ELPA as library with configure
@@ -34,7 +41,31 @@ The configure installation is best done in four steps
    elpa2-kernel, each is optimized and tuned for a different
    architecture.
 
-1.1) Choice of ELPA2 kernels
+1.1) Choice of MPI compiler (wrappers)
+
+   It is mandatory that the C and C++ parts are compiled with the
+   GNU C, C++ compilers. Thus, all ELPA test programs which are written
+   in C must be compiled and linked with the MPI compiler (wrapper) which uses
+   the GNU C compilers.
+
+   The Fortran parts of ELPA can be compiled with any Fortran compiler of
+   your choice. It is for example quite common to compile the Fortran part
+   with the Intel Fortran compiler but the C,C++ parts must be compiled with
+   the GNU compilers.
+
+   Thus special care has to be taken that the correct MPI compiler (wrappers)
+   are found by the autotools! The configure script tries to find the correct
+   wrappers automatically, but sometimes it will fail.
+
+   In these cases it is necessary to set these compilers by hand:
+
+   ../configure FC=fortran_compiler_wrapper_of_your_choice CC=gnu_compiler_wrapper
+
+   will tell autotools which wrappers to take.
+
+
+
+1.2) Choice of ELPA2 kernels
 
    With the release of ELPA (2014.06 or newer) it is _not_
    mandatory any more to define the (real and complex) kernels
@@ -52,7 +83,7 @@ The configure installation is best done in four steps
    file "./src/elpa2_kernels/README_elpa2_kernels.txt".
 
 
-1.2 Setting up Blacs/Scalapack
+1.3) Setting up Blacs/Scalapack
 
    The configure script tries to auto-detect an installed Blacs/Scalapack
    library. If this is successful, you do not have to specify anything
@@ -86,7 +117,7 @@ The configure installation is best done in four steps
    the configure procedure will check whether Blacs/Scalapack is available
    at build-time and try to link with it.
 
-1.3 Setting optimizations
+1.4) Setting optimizations
 
 
    Please set the optimisation that you prefer with the
@@ -108,6 +139,9 @@ The configure installation is best done in four steps
    if the hardware does. If you already included "-mAVX" in the
    flags, you can skip "-march=native".
 
+   If you want to use the newer AVX2 instructions, assuming they are supported on
+   your hardware, please set CFLAGS="-march=avx2 -mfma" and CXXFLAGS="-march=avx2 -mfma".
+
 
    Setting the optimization flags for the AVX kernels can be a hassle. If AVX
    kernels are build for your system, you can set the configure option
@@ -119,19 +153,22 @@ The configure installation is best done in four steps
 
    ./configure CFLAGS="-O2" CXXFLAGS="-O2" FCFLAGS="-O2"
 
+   An istallation with AVX2 and best-optimizations could thus look like this:
+
+   ./configure  CFLAGS="-O2 -mavx2 -mfma" CXXFLAGS="-O2 -mavx2 -mfma" FCFLAGS="-O2" --with-avx-optimization
 
-1.4 Installation location
+1.5) Installation location
 
    Set the "--prefix" flag if you wish another installation location than
    the default "/usr/local/".
 
-1.5 Hybrid OpenMP support
+1.6) Hybrid OpenMP support
 
    If you want to use the hybrid MPI/OpenMP version of ELPA please specify
    "--enable-openmp". Note that the ELPA library will then contain a "_mt" in
    it's name to indicate multi threading support.
 
-1.6 Other
+1.7) Other
 
    Note, that at the moment we do not officially support "cross compilation"
    although it should work.
@@ -161,6 +198,10 @@ The configure installation is best done in four steps
    new feature. With the same thought in mind, a binary "elpa2_print_kernels"
    is provided, which is rather self-explanatory.
 
+   Also some of the above mentioned tests are provided as C source files.
+   These should demonstrate, how to call ELPA from a C program (i.e. which headers to include
+   and call the ELPA functions). They are NOT intended as a copy and paste solution!
+
 
 4) run "make install"
 

LIBRARY_INTERFACE

@@ -24,3 +24,11 @@ https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 
   The state of release 2015.02.002 defines this interface
 
+- 4
+  Incompatible API change. The Fortran versions of the library functions return
+  a logical indicating success or failure. The C versions of the library functions
+  return an integer {0,1} for success and failure.
+  Some interface need an extra argument, specifying the number of matrix columns
+  (see the documentation)
+
+

RELEASE_NOTES

-This file contains the release notes for the ELPA 2015.02.001 version
+This file contains the release notes for the ELPA 2015.11.001 version
 
 
 

configure.ac

 AC_PREREQ([2.69])
 
-AC_INIT([elpa],[2015.05.001], [elpa-library@rzg.mpg.de])
+AC_INIT([elpa],[2015.11.001], [elpa-library@mpcdf.mpg.de])
 AC_SUBST([PACKAGE_VERSION])
 
 AC_CONFIG_SRCDIR([src/elpa1.F90])
@@ -34,7 +34,7 @@ rm -rf config.h config-f90.h
 #    by the current interface, as they are ABI compatible (e.g. only new symbols
 #    were added by the new interface)
 #
-AC_SUBST([ELPA_SO_VERSION], [3:1:0])
+AC_SUBST([ELPA_SO_VERSION], [5:0:1])
 #
 
 
@@ -101,8 +101,6 @@ if test x"${enable_openmp}" = x"yes"; then
 	FCFLAGS="$OPENMP_FCFLAGS $FCFLAGS"
 fi
 
-
-
 # C++
 AC_LANG([C++])
 AC_PROG_CXX
@@ -233,6 +231,43 @@ if test "${can_compile_avx}" = "yes" ; then
   fi
 fi
 
+AC_MSG_CHECKING([whether we can compile AVX2 intrinsics in C])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <x86intrin.h>
+ int main(int argc, char **argv){
+ double* q;
+ __m256d q1 = _mm256_load_pd(q);
+ __m256d y1 = _mm256_fmadd_pd(q1, q1, q1);
+ return 0;
+ }
+ ])],
+ [can_compile_avx2=yes],
+ [can_compile_avx2=no]
+)
+AC_MSG_RESULT([${can_compile_avx2}])
+if test "${can_compile_avx2}" = "yes" ; then
+  AC_MSG_CHECKING([whether we can compile AVX2 intrinsics in C++])
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+   #include <x86intrin.h>
+   int main(int argc, char **argv){
+   double* q;
+   __m256d q1 = _mm256_load_pd(q);
+   __m256d y1 = _mm256_fmadd_pd(q1, q1, q1);
+   return 0;
+   }
+   ])],
+   [can_compile_avx2=yes],
+   [can_compile_avx2=no]
+  )
+  AC_LANG_POP([C++])
+  AC_MSG_RESULT([${can_compile_avx2}])
+  if test "${can_compile_avx2}" = "no" ; then
+    AC_MSG_WARN([Cannot compile C++ with AVX2!])
+  fi
+fi
+
+
 if test "${can_compile_avx}" = "yes" ; then
   install_real_avx_block2=yes
   install_real_avx_block4=yes
@@ -507,8 +542,8 @@ AC_MSG_CHECKING([whether we can compile with BGQ intrinsics])
 
 AC_LINK_IFELSE([AC_LANG_SOURCE([
   program test_bgq
-    VECTOR(REAL(8))::QPX_x2
-    real*8 :: hh(10,2))
+    VECTOR(REAL(8))::QPX_h2
+    real*8         :: hh(10,2)
     QPX_h2 = VEC_SPLATS(hh(2,2))
 
   end program
@@ -670,16 +705,22 @@ if test x"${install_real_bgq}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_BGQ_KERNEL],[1],[can use real BGQ kernel])
 fi
 
-if test x"${use_specific_complex_kernel}" = x"yes" ; then
- AC_DEFINE([WITH_ONE_SPECIFIC_COMPLEX_KERNEL],[1],[use only one specific complex kernel (set at compile time)])
+if test x"${use_specific_complex_kernel}" = x"no" ; then
+	AC_DEFINE([WITH_NO_SPECIFIC_COMPLEX_KERNEL],[1],[do not use only one specific complex kernel (set at compile time)])
 fi
 
-if test x"${use_specific_real_kernel}" = x"yes" ; then
- AC_DEFINE([WITH_ONE_SPECIFIC_REAL_KERNEL],[1],[use only one specific real kernel (set at compile time)])
+if test x"${use_specific_real_kernel}" = x"no" ; then
+	AC_DEFINE([WITH_NO_SPECIFIC_REAL_KERNEL],[1],[do not use only one specific real kernel (set at compile time)])
 fi
 
 LT_INIT
 
+DX_PDF_FEATURE(OFF)
+DX_PS_FEATURE(OFF)
+DX_MAN_FEATURE(ON)
+DX_HTML_FEATURE(ON)
+DX_INIT_DOXYGEN([ELPA], [Doxyfile], [docs])
+
 AC_SUBST([WITH_MKL])
 AC_SUBST([WITH_BLACS])
 AC_SUBST([with_amd_bulldozer_kernel])
@@ -689,6 +730,7 @@ AC_SUBST([OPENMP_CFLAGS])
 AC_SUBST([OPENMP_FCFLAGS])
 AC_SUBST([OPENMP_LDFLAGS])
 #AC_SUBST(OPT_FCFLAGS)
+AC_SUBST([DOXYGEN_OUTPUT_DIR], [docs])
 
 rm -rf modules/ .fortran_dependencies/
 mkdir modules
@@ -722,6 +764,7 @@ AC_SUBST([PKG_CONFIG_FILE],[elpa${SUFFIX}-${PACKAGE_VERSION}.pc])
 
 AC_CONFIG_FILES([
   Makefile
+  Doxyfile
   ${PKG_CONFIG_FILE}:elpa.pc.in
 ])
 
@@ -737,10 +780,19 @@ fi
 
 echo "Generating elpa/elpa_generated.h..."
 mkdir -p elpa
-grep "^ *!c>" $srcdir/src/elpa_c_interface.F90 | sed 's/^ *!c>//;' > elpa/elpa_generated.h || exit 1
+grep -h "^ *!c>" $srcdir/src/elpa_c_interface.F90 | sed 's/^ *!c>//;' > elpa/elpa_generated.h || exit 1
+
+echo "Generating test/shared_sources/generated.h..."
+mkdir -p test/shared_sources
+grep -h "^ *!c>" $srcdir/test/shared_sources/*.F90 | sed 's/^ *!c>//;' > test/shared_sources/generated.h || exit 1
 
 if test "${can_compile_avx}" = "no" ; then
   if test x"${want_avx}" = x"yes" ; then
     AC_MSG_WARN([Could not compile AVX instructions])
   fi
 fi
+if test "${can_compile_avx2}" = "no" ; then
+  if test x"${want_avx}" = x"yes" ; then
+    AC_MSG_WARN([Could not compile AVX2 instructions])
+  fi
+fi

doxygen.am

+## --------------------------------- ##
+## Format-independent Doxygen rules. ##
+## --------------------------------- ##
+
+if DX_COND_doc
+
+## ------------------------------- ##
+## Rules specific for HTML output. ##
+## ------------------------------- ##
+
+if DX_COND_html
+
+DX_CLEAN_HTML = @DX_DOCDIR@/html
+
+endif DX_COND_html
+
+## ------------------------------ ##
+## Rules specific for CHM output. ##
+## ------------------------------ ##
+
+if DX_COND_chm
+
+DX_CLEAN_CHM = @DX_DOCDIR@/chm
+
+if DX_COND_chi
+
+DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
+
+endif DX_COND_chi
+
+endif DX_COND_chm
+
+## ------------------------------ ##
+## Rules specific for MAN output. ##
+## ------------------------------ ##
+
+if DX_COND_man
+
+DX_CLEAN_MAN = @DX_DOCDIR@/man
+
+endif DX_COND_man
+
+## ------------------------------ ##
+## Rules specific for RTF output. ##
+## ------------------------------ ##
+
+if DX_COND_rtf
+
+DX_CLEAN_RTF = @DX_DOCDIR@/rtf
+
+endif DX_COND_rtf
+
+## ------------------------------ ##
+## Rules specific for XML output. ##
+## ------------------------------ ##
+
+if DX_COND_xml
+
+DX_CLEAN_XML = @DX_DOCDIR@/xml
+
+endif DX_COND_xml
+
+## ----------------------------- ##
+## Rules specific for PS output. ##
+## ----------------------------- ##
+
+if DX_COND_ps
+
+DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
+
+DX_PS_GOAL = doxygen-ps
+
+doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
+
+@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
+	cd @DX_DOCDIR@/latex; \
+	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
+	$(DX_LATEX) refman.tex; \
+	$(MAKEINDEX_PATH) refman.idx; \
+	$(DX_LATEX) refman.tex; \
+	countdown=5; \
+	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
+	                  refman.log > /dev/null 2>&1 \
+	   && test $$countdown -gt 0; do \
+	    $(DX_LATEX) refman.tex; \
+	    countdown=`expr $$countdown - 1`; \
+	done; \
+	$(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
+
+endif DX_COND_ps
+
+## ------------------------------ ##
+## Rules specific for PDF output. ##
+## ------------------------------ ##
+
+if DX_COND_pdf
+
+DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
+
+DX_PDF_GOAL = doxygen-pdf
+
+doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
+
+@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
+	cd @DX_DOCDIR@/latex; \
+	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
+	$(DX_PDFLATEX) refman.tex; \
+	$(DX_MAKEINDEX) refman.idx; \
+	$(DX_PDFLATEX) refman.tex; \
+	countdown=5; \
+	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
+	                  refman.log > /dev/null 2>&1 \
+	   && test $$countdown -gt 0; do \
+	    $(DX_PDFLATEX) refman.tex; \
+	    countdown=`expr $$countdown - 1`; \
+	done; \
+	mv refman.pdf ../@PACKAGE@.pdf
+
+endif DX_COND_pdf
+
+## ------------------------------------------------- ##
+## Rules specific for LaTeX (shared for PS and PDF). ##
+## ------------------------------------------------- ##
+
+if DX_COND_latex
+
+DX_CLEAN_LATEX = @DX_DOCDIR@/latex
+
+endif DX_COND_latex
+
+.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
+
+doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
+	rm -rf @DX_DOCDIR@
+	$(DX_ENV) $(DX_DOXYGEN) $(DX_CONFIG)
+
+DX_CLEANFILES = \
+	@DX_DOCDIR@/@PACKAGE@.tag \
+	-r \
+	$(DX_CLEAN_HTML) \
+	$(DX_CLEAN_CHM) \
+	$(DX_CLEAN_CHI) \
+	$(DX_CLEAN_MAN) \
+	$(DX_CLEAN_RTF) \
+	$(DX_CLEAN_XML) \
+	$(DX_CLEAN_PS) \
+	$(DX_CLEAN_PDF) \
+	$(DX_CLEAN_LATEX)
+
+endif DX_COND_doc

fdep/fortran_dependencies.m4

+dnl Copyright 2015 Lorenz Hüdepohl
+dnl
+dnl This file is part of fdep and licensed under the MIT license
+dnl see the file LICENSE for more information
+dnl
 AC_DEFUN([FDEP_F90_GNU_MAKE_DEPS],[
 AC_MSG_CHECKING([for GNU make])
 for a in "$MAKE" make gmake gnumake ; do

fdep/fortran_dependencies.mk

+# Copyright 2015 Lorenz Hüdepohl
+#
+# This file is part of fdep and licensed under the MIT license
+# see the file LICENSE for more information
+#
+
+define translate_name
+$(subst -,_,$(subst .,_,$1))
+endef
+
 _f90_verbose = $(_f90_verbose_$(V))
 _f90_verbose_ = $(_f90_verbose_$(AM_DEFAULT_VERBOSITY))
 _f90_verbose_0 = @echo "  $1";
-_f90_targets = $(subst -,_,$(patsubst %.la,%_la,$(patsubst %.a,%_a,$(patsubst %.so,%_so,$(PROGRAMS) $(LTLIBRARIES)))))
+_f90_targets = $(call translate_name,$(PROGRAMS) $(LTLIBRARIES))
+
 FORTRAN_CPP ?= cpp -P -traditional -Wall -Werror
 
 # $1 source files
@@ -36,17 +47,27 @@ define object_extension
 $(if $(filter $1,$(PROGRAMS)),o,lo)
 endef
 
+# $1 source file
+# $2 stem
+# $3 program
+# $4 kind of file ('use' or 'def')
+define modinfo_name
+$(dir $1)$(2)$(call strip_fortran_ext,$(notdir $1)).$4_mods_$(patsubst .,_,$3).$(call object_extension,$3)
+endef
+
 # $1 source_file
 # $2 stem
 # $3 program
 define module_targets
-$(eval _$3_use_mods += $(dir $1)$2$(call strip_fortran_ext,$(notdir $1)).use_mods.$3.$(call object_extension,$3))
-$(dir $1)$2$(call strip_fortran_ext,$(notdir $1)).use_mods.$3.$(call object_extension,$3): $1 $(dir $1)$(am__dirstamp)
-	$(call _f90_verbose,F90 USE  [$3] $$<)$(FORTRAN_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $($p_CPPFLAGS) $(CPPFLAGS) -o /dev/stdout $$< | grep -i -o '^ *use [^ ,!:]*' | sort -u > $$@
+$(eval _$(3)_use_mods += $(call modinfo_name,$1,$2,$3,use))
+$(call modinfo_name,$1,$2,$3,use): $1 $(dir $1)$(am__dirstamp)
+	$(call _f90_verbose,F90 USE  [$3] $$<)$(FORTRAN_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $($p_CPPFLAGS) $(CPPFLAGS) -o /dev/stdout $$< | \
+		grep -i -o '^ *use [^ ,!:]*' | sed 's/^[[:space:]]*//;' | tr '[:upper:]' '[:lower:]' | sort -u > $$@
 
-$(eval _$3_def_mods += $(dir $1)$2$(call strip_fortran_ext,$(notdir $1)).def_mods.$3.$(call object_extension,$3))
-$(dir $1)$2$(call strip_fortran_ext,$(notdir $1)).def_mods.$3.$(call object_extension,$3): $1 $(dir $1)$(am__dirstamp)
-	$(call _f90_verbose,F90 MOD  [$3] $$<)$(FORTRAN_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $($p_CPPFLAGS) $(CPPFLAGS) -o /dev/stdout $$< | grep -i -o '^ *module [^!]*' | grep -v "\<procedure\>" > $$@ || true
+$(eval _$(3)_def_mods += $(call modinfo_name,$1,$2,$3,def))
+$(call modinfo_name,$1,$2,$3,def): $1 $(dir $1)$(am__dirstamp)
+	$(call _f90_verbose,F90 MOD  [$3] $$<)$(FORTRAN_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $($p_CPPFLAGS) $(CPPFLAGS) -o /dev/stdout $$< | \
+		grep -i -o '^ *module [^!]*' | sed 's/^[[:space:]]*//;' | tr '[:upper:]' '[:lower:]' | grep -v "\<procedure\>\|\<intrinsic\>" > $$@ || true
 
 endef
 $(foreach p,$(_f90_targets),$(if $(call is_per_target,$p),$(foreach s,$(call fortran_sources,$p),$(eval $(call module_targets,$s,$p-,$p))),$(foreach s,$(call fortran_sources,$p),$(eval $(call module_targets,$s,,$p)))))
@@ -54,20 +75,20 @@ $(foreach p,$(_f90_targets),$(if $(call is_per_target,$p),$(foreach s,$(call for
 _f90_depdir=$(abs_builddir)/.fortran_dependencies
 _f90_depfile = $(_f90_depdir)/dependencies.mk
 
-define is_clean
-$(if $(filter-out mostlyclean clean distclean maintainer-clean,$(MAKECMDGOALS)),0,1)
+# $1 target-name
+define recursive_lib_deps
+$(foreach l,$(call translate_name,$($1_LDADD) $($1_LIBADD)),$l $(call recursive_lib_deps,$l))
 endef
 
-define _fdep_newline
-
-
+define is_clean
+$(if $(filter-out mostlyclean clean distclean maintainer-clean,$(MAKECMDGOALS)),0,1)
 endef
 
 ifneq ($(call is_clean),1)
 include $(_f90_depfile)
 endif
 $(_f90_depfile): $(top_srcdir)/fdep/fortran_dependencies.pl $(foreach p,$(_f90_targets),$(_$p_use_mods) $(_$p_def_mods)) | $(foreach p,$(_f90_targets),$(_f90_depdir)/$p)
-	$(call _f90_verbose,F90 DEPS $@)echo > $@; $(foreach p,$(_f90_targets),$(top_srcdir)/fdep/fortran_dependencies.pl $p $(_$p_use_mods) $(_$p_def_mods) >> $@ || { rm $@; exit 1; } ;$(_fdep_newline))
+	$(call _f90_verbose,F90 DEPS $@)echo > $@; $(foreach p,$(_f90_targets),$(top_srcdir)/fdep/fortran_dependencies.pl $p $(_$p_use_mods) $(_$p_def_mods) $(foreach l,$(call recursive_lib_deps,$p),$(_$l_use_mods) $(_$l_def_mods)) >> $@; )
 
 $(_f90_depdir):
 	@mkdir $@

fdep/fortran_dependencies.pl

 #!/usr/bin/perl -w
+#
+# Copyright 2015 Lorenz Hüdepohl
+#
+# This file is part of fdep and licensed under the MIT license
+# see the file LICENSE for more information
+#
 
 use strict;
 
 my %defs = ();
 my %uses = ();
+my %files = ();
 
 my $use_re = qr/^\s*use\s+(\S+)\s*$/;
 my $def_re = qr/^\s*module\s+(\S+)\s*$/;
@@ -33,25 +40,30 @@ sub add_def {
 	}
 }
 
-my $p = shift;
+my $target = shift;
 
 foreach my $file (@ARGV) {
+	if (exists $files{$file}) {
+		next;
+	} else {
+		$files{$file} = 1;
+	}
 	my $re;
 	my $add;
 	my $object;
 	if (defined($ENV{V}) && $ENV{V} ge "2") {
-		print STDERR "fdep: Considering file $file\n";
+		print STDERR "fdep: Considering file $file for target $target\n";
 	}
-	if ($file =~ /^(.*)\.def_mods.$p(\..*)$/) {
+	if ($file =~ /^(.*)\.def_mods_[^.]*(\..*)$/) {
 		$re = $def_re;
 		$add = \&add_def;
 		$object = $1 . $2;
-	} elsif ($file =~ /^(.*)\.use_mods.$p(\..*)$/) {
+	} elsif ($file =~ /^(.*)\.use_mods_[^.]*(\..*)$/) {
 		$re = $use_re;
 		$add = \&add_use;
 		$object = $1 . $2;
 	} else {
-		die "Unrecognized file extension for '$file'\nExpected (.*)\.def_mods.$p(\..*) or (.*)\.use_mods.$p(\..*)";
+		die "Unrecognized file extension for '$file'";
 	}
 	open(FILE,"<",$file) || die "\nCan't open $file: $!\n\n";
 	while(<FILE>) {
@@ -60,7 +72,7 @@ foreach my $file (@ARGV) {
 		if ($_ =~ $re) {
 			&$add($object, $1);
 		} else {
-			die "Cannot parse module statement '$_', was expecting $re";
+			die "At $file:$.\nCannot parse module statement '$_', was expecting $re";
 		}
 	}
 	close(FILE)
@@ -71,7 +83,7 @@ foreach my $object (sort keys %uses) {
 		if (defined $defs{$m}) {
 			print "$object: ", $defs{$m}, "\n";
 		} elsif (defined($ENV{V}) && $ENV{V} ge "1") {
-			print STDERR "fdep: Warning: Cannot find definition of module $m in files for program $p, might be external\n";
+			print STDERR "Warning: Cannot find definition of module $m in files for current target $target, might be external\n";
 		}
 	}
 }

fdep/test_project/.gitignore

+*.def_mods
+*.la
+*.lo
+*.o
+*.use_mods
+*~
+.deps
+.dirstamp
+.fortran_dependencies
+.libs
+Makefile
+Makefile.in
+aclocal.m4
+ar-lib
+autom4te.cache
+bar
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+foo
+fortran_mod_files
+install-sh
+libtool
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
+stamp-h1
+test_bar
+test_baz

fdep/test_project/Makefile.am

+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+AM_CFLAGS = @AM_CFLAGS@
+AM_LDFLAGS = @AM_LDFLAGS@
+