Merge branch 'master' into 5.0

yambo-code · Jul 19, 2021 · 03fa628 · 03fa628
2 parents 260ce53 + 0e34dcc
commit 03fa628
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 35 deletions.
diff --git a/config/m4/acx_fortran_flags.m4 b/config/m4/acx_fortran_flags.m4
@@ -35,6 +35,8 @@ AC_ARG_ENABLE(debug-flags, AC_HELP_STRING([--enable-debug-flags],
               [Debug flags are set for compilation. Default is no.]))
 if test x"$enable_debug_flags" = "x"; then enable_debug_flags="no"; fi
 #
+HDF5_MODE="production";
+#
 def_compiler=
 #
 case "${host}" in
@@ -48,7 +50,16 @@ i?86*linux*)
     OMPFLAGS="-mp"
     NETCDFFLAGS="-DpgiFortran"
     def_compiler="-D_PGI"
-    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
+    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame -Mbackslash"
+    ;;
+  *nvfortran* )
+    SYSFLAGS="-O2 -g -fast -Munroll -Mnoframe -Mdalign -Mbackslash"
+    FUFLAGS="-O0 -Mbackslash"
+    FCMFLAG="-Mnomain"
+    OMPFLAGS="-mp"
+    NETCDFFLAGS="-DpgiFortran"
+    def_compiler="-D_PGI"
+    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame -Mbackslash"
     ;;
   *abf90*)
     SYSFLAGS="-B101 -YEXT_NAMES=LCS -YEXT_SFX=_"
@@ -130,6 +141,15 @@ i?86*linux*)
     NETCDFFLAGS="-DpgiFortran"
     DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
     ;;
+  *nvfortran* )
+    SYSFLAGS="-O2 -g -fast -Munroll -Mnoframe -Mdalign -Mbackslash"
+    FUFLAGS="-O0 -g -Mbackslash"
+    FCMFLAG="-Mnomain"
+    OMPFLAGS="-mp"
+    NETCDFFLAGS="-DpgiFortran"
+    def_compiler="-D_PGI"
+    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
+    ;;
   *gfortran*)
     SYSFLAGS="-O3 -g -mtune=native"
     FUFLAGS="-O0 -g -mtune=native"
@@ -179,6 +199,15 @@ ia64*linux* )
     def_compiler="-D_PGI"
     DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
     ;;
+  *nvfortran* )
+    SYSFLAGS="-O2 -g -fast -Munroll -Mnoframe -Mdalign -Mbackslash"
+    FUFLAGS="-O0 -g -Mbackslash"
+    FCMFLAG="-Mnomain"
+    OMPFLAGS="-mp"
+    NETCDFFLAGS="-DpgiFortran"
+    def_compiler="-D_PGI"
+    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
+    ;;
   *gfortran*)
     SYSFLAGS="-O3 -g -mtune=native"
     FUFLAGS="-O0 -g -mtune=native"
@@ -241,14 +270,15 @@ ia64*linux* )
   ;;
 *x86*64* )
   case "${FC}" in
-  *pgf9* | *ftn* | *pgfortran* )
-    SYSFLAGS="-O2 -g -fast -Munroll -Mnoframe -Mdalign -Mbackslash"
-    FUFLAGS="-O0 -g -Mbackslash"
+  *pgf9* | *ftn* | *pgfortran* | *nvfortran* )
+    SYSFLAGS="-O1 -gopt -Mnoframe -Mdalign -Mbackslash -cpp"
+    #SYSFLAGS="-O2 -g -Munroll -Mnoframe -Mdalign -Mbackslash -cpp"
+    FUFLAGS="-O0 -g -Mbackslash -cpp"
     FCMFLAG="-Mnomain"
     OMPFLAGS="-mp"
     def_compiler="-D_PGI"
     NETCDFFLAGS="-DpgiFortran"
-    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
+    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame  -Mbackslash -cpp"
     ;;
   *gfortran*)
     SYSFLAGS="-O3 -g -mtune=native"
@@ -301,7 +331,7 @@ ia64*linux* )
     SYSFLAGS="-assume bscc -O3 -g -ip ${CPU_FLAG}"
     FUFLAGS="-assume bscc -O0 -g ${CPU_FLAG}"
     NETCDFFLAGS="-DpgiFortran"
-    DEBUG_FLAGS="-CB -traceback"
+    DEBUG_FLAGS="-CB -traceback -debug full"
     ;;
   *openf9*)
     SYSFLAGS="-O2 -fno-second-underscore"
@@ -337,6 +367,15 @@ powerpc64*linux* )
     NETCDFFLAGS="-DpgiFortran"
     DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
     ;;
+  *nvfortran* )
+    SYSFLAGS="-O2 -g -fast -Munroll -Mnoframe -Mdalign -Mbackslash"
+    FUFLAGS="-O0 -g -Mbackslash"
+    FCMFLAG="-Mnomain"
+    OMPFLAGS="-mp"
+    def_compiler="-D_PGI"
+    NETCDFFLAGS="-DpgiFortran"
+    DEBUG_FLAGS="-g -Minform=inform -Mbounds -Mchkptr -Mchkstk -Meh_frame"
+    ;;
   *gfortran*)
     SYSFLAGS="-O3 -g -mtune=native"
     FUFLAGS="-O0 -g -mtune=native"
@@ -395,6 +434,7 @@ fi
 if test x"$enable_debug_flags" = "xyes"; then 
  FCFLAGS="$DEBUG_FLAGS"  
  FCUFLAGS="$DEBUG_FLAGS"  
+ HDF5_MODE="debug";
 fi
 #
 AC_MSG_CHECKING([for specific NETCDF flags])
@@ -408,6 +448,7 @@ AC_SUBST(FCMFLAG)
 AC_SUBST(OMPFLAGS)
 AC_SUBST(NETCDFFLAGS)
 AC_SUBST(DEBUG_FLAGS)
+AC_SUBST(HDF5_MODE)
 AC_SUBST(def_compiler)
 ])
 #
diff --git a/config/m4/acx_get_fc_kind.m4 b/config/m4/acx_get_fc_kind.m4
@@ -36,6 +36,10 @@ case "${FC}" in
       FCKIND="pgi"
       FCVERSION=`$FC --version`
       ;;
+    *nvfortran*)
+      FCKIND="nvfortran"
+      FCVERSION=`$FC --version`
+      ;;
     *gfortran*)
       FCKIND="gfortran" 
       FCVERSION=`$FC --version`

diff --git a/config/version/version.m4 b/config/version/version.m4
@@ -1,9 +1,9 @@
-AC_INIT(Yambo, 5.0.4 r.19756 h.b5172bcc8, [email protected])
+AC_INIT(Yambo, 5.0.4 r.19593 h.b030eead9, [email protected])
 SVERSION="5"
 SSUBVERSION="0"
 SPATCHLEVEL="4"
-SREVISION="19756"
-SHASH="b5172bcc8"
+SREVISION="19593"
+SHASH="b030eead9"
 AC_SUBST(SVERSION)
 AC_SUBST(SSUBVERSION)
 AC_SUBST(SPATCHLEVEL)