Merge remote-tracking branch 'yambo-gpl/tech-gpu' into tech-ydiago

yambo-code · Oct 12, 2024 · 8db05ff · 8db05ff
2 parents 58a2a54 + 30f7480
commit 8db05ff
Show file tree

Hide file tree

Showing 24 changed files with 1,478 additions and 513 deletions.
diff --git a/config/m4/acx_fpp.m4 b/config/m4/acx_fpp.m4
@@ -20,6 +20,9 @@ case "${FC}" in
   *gfortran | *g95)
      if test -z "$FPP";    then FPP="${FC} -E -P -cpp"; fi
      ;;
+  *nvfortran*)
+     if test -z "$FPP";    then FPP="${FC} -Mpreprocess -E"; fi
+     ;;
   #
   # some of the following could be uncommented once explicitly checked
   #

diff --git a/config/m4/mpi.m4 b/config/m4/mpi.m4
@@ -52,6 +52,10 @@ if test "$mpibuild" = "yes"; then
   def_mpi="-D_MPI"
   ACX_GET_MPI_KIND()
   MPI_PATH=`which $CC |sed "s/bin\/$CC//g"`
+  if ! test -d "$MPI_PATH/include"; then
+    MPI_PATH=`$CC -show | sed "s/.*-I//g"` ;
+    MPI_PATH=`echo ${MPI_PATH} | sed "s/\/include.*//g"` ;
+  fi
   #
 else
   #