Merge branch 'loh/master' into 'master'

fdep per subtree, fixed wrong argument order



See merge request !1

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@
+
+# programs
+bin_PROGRAMS = foo test_bar test_baz
+
+foo_SOURCES = src/foo.F90 src2/baz.F90 src/bar.F90
+foo_CPPFLAGS = -DPROGRAM_foo
+foo_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/foo $(FC_MODINC)./fortran_mod_files/foo
+
+test_bar_SOURCES = src/bar.F90
+test_bar_CPPFLAGS = -DPROGRAM_test_bar
+test_bar_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/test_bar $(FC_MODINC)./fortran_mod_files/test_bar
+
+test_baz_SOURCES = src2/baz.F90 src/bar.F90
+test_baz_CPPFLAGS = -DPROGRAM_test_baz
+test_baz_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/test_baz $(FC_MODINC)./fortran_mod_files/test_baz
+
+# a library
+lib_LTLIBRARIES = libdings-2.la
+
+libdings_2_la_SOURCES = src2/baz.F90 src/bar.F90
+libdings_2_la_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/libdings-2.la $(FC_MODINC)./fortran_mod_files/libdings-2.la
+
+CLEANFILES = fortran_mod_files/*/*
+
+@FORTRAN_MODULE_DEPS@

fdep/test_project/autogen.sh

+#!/bin/sh -e
+
+mkdir -p m4/
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+autoreconf --force --install --verbose "$srcdir"

fdep/test_project/configure.ac

+AC_INIT([fdep_test], [0.1])
+AC_PREREQ([2.59])
+AM_INIT_AUTOMAKE([foreign -Wall subdir-objects])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
+AM_SILENT_RULES([yes])
+
+# gnu-make fortran module dependencies
+m4_include([fdep/fortran_dependencies.m4])
+FDEP_F90_GNU_MAKE_DEPS
+
+# necessary tools
+AC_PROG_FC
+AC_PROG_INSTALL
+AM_PROG_CC_C_O
+AM_PROG_AR
+
+# fortran stuff
+AC_FC_MODULE_FLAG
+AC_FC_MODULE_OUTPUT_FLAG
+AC_FC_FREEFORM
+
+# libtool
+LT_INIT
+
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_LDFLAGS])
+AC_SUBST([FC_MODINC])
+AC_SUBST([FC_MODOUT])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+
+for target in foo test_bar test_baz libdings-2.la; do
+	mkdir -p fortran_mod_files/$target
+done

fdep/test_project/fdep

+..
\ No newline at end of file

fdep/test_project/src/bar.F90

+module bar
+  implicit none
+  contains
+  function two() result(t)
+    integer :: t
+    t = 2
+  end function
+end module
+
+#ifdef PROGRAM_test_bar
+program test_bar
+  use bar, only : two
+  if (two() /= 2) then
+    stop 1
+  endif
+end program
+#endif

fdep/test_project/src/foo.F90

+program foo
+  use bar
+  use baz
+  write(*,*) "Nop"
+end program

fdep/test_project/src2/baz.F90

+module baz
+  use bar
+  implicit none
+  contains
+  function two_times_two() result(t)
+    integer :: t
+    t = 2 * two()
+  end function
+end module
+
+#ifdef PROGRAM_test_baz
+program test_bar
+  use baz
+  if (two_times_two() /= 4) then
+    stop 1
+  endif
+end program
+#endif

test/shared_sources/call_elpa1.c

@@ -46,23 +46,14 @@
 #include <elpa/elpa.h>
 #include <complex.h>
 
-int call_elpa1_real_solver_from_c(int na, int nev, int ncols, double *a, int lda, double *ev, double *q, int ldq, int nblk, int mpi_comm_rows, int mpi_comm_cols) {
-  int result;
-  result = elpa_solve_evp_real_1stage(na, nev, a, lda, ev, q, ldq, nblk, ncols, mpi_comm_rows, mpi_comm_cols);
-  return result;
+int call_elpa1_real_solver_from_c(int na, int nev, double *a, int lda, double *ev, double *q, int ldq, int nblk, int ncols, int mpi_comm_rows, int mpi_comm_cols) {
+  return elpa_solve_evp_real_1stage(na, nev, a, lda, ev, q, ldq, nblk, ncols, mpi_comm_rows, mpi_comm_cols);
 }
 
-int call_elpa1_complex_solver_from_c(int na, int nev, int ncols, complex double *a, int lda, double *ev, complex double *q, int ldq, int nblk, int mpi_comm_rows, int mpi_comm_cols) {
-  int result;
-  result = elpa_solve_evp_complex_1stage(na, nev, a, lda, ev, q, ldq, nblk, ncols, mpi_comm_rows, mpi_comm_cols);
-  return result;
+int call_elpa1_complex_solver_from_c(int na, int nev, complex double *a, int lda, double *ev, complex double *q, int ldq, int nblk, int ncols, int mpi_comm_rows, int mpi_comm_cols) {
+  return elpa_solve_evp_complex_1stage(na, nev, a, lda, ev, q, ldq, nblk, ncols, mpi_comm_rows, mpi_comm_cols);
 }
 
-int call_elpa_get_comm_from_c(int mpi_comm_world, int my_prow, int my_pcol, int *mpi_comm_rows, int *mpi_comm_cols){
-  int mpierr;
-
-  mpierr = elpa_get_communicators(mpi_comm_world, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols);
-
-  return mpierr;
+int call_elpa_get_comm_from_c(int mpi_comm_world, int my_prow, int my_pcol, int *mpi_comm_rows, int *mpi_comm_cols) {
+  return elpa_get_communicators(mpi_comm_world, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols);
 }
-