Merge pull request pmodels#7297 from hzhou/2502_f08_ignore_d

binding/f08: add ignore_tkr(d) for nvfortran

Approved-by: Ken Raffenetti

Author: hzhou

confdb/aclocal_fc.m4

@@ -1268,6 +1268,44 @@ AC_DEFUN([PAC_FC_CHECK_IGNORE_TKR],[
     AC_LANG_POP(Fortran)
 ])
 
+dnl
+dnl PAC_FC_CHECK_IGNORE_TKR_D check directives to ignore "DEVICE" attribute.
+dnl set pac_fc_ignore_tkr_d to a type if supported, otherwise, no.
+dnl
+AC_DEFUN([PAC_FC_CHECK_IGNORE_TKR_D],[
+    AC_LANG_PUSH(Fortran)
+    AC_MSG_CHECKING([directives for Fortran compiler to ignore TKR(d) check])
+    pac_fc_ignore_tkr_d=no
+    for a in dir ; do
+        case $a in
+            dir)
+                # flang
+                decl='!DIR$ IGNORE_TKR(d) buf'
+                ;;
+        esac
+
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+            program main
+                IMPLICIT NONE
+                INTERFACE
+                  SUBROUTINE FUNC_A(buf)
+                    TYPE(*), DIMENSION(..) :: buf
+                    $decl
+                  END SUBROUTINE
+                END INTERFACE
+
+                REAL A(10)
+                CALL FUNC_A(A)
+            end
+        ])],[pac_fc_ignore_tkr_d=$a],[])
+        if test $pac_fc_ignore_tkr_d != no ; then
+            break
+        fi
+    done
+    AC_MSG_RESULT([$pac_fc_ignore_tkr_d])
+    AC_LANG_POP(Fortran)
+])
+
 dnl
 dnl PAC_FC_ISO_C_BINDING check whether ISO_C_BINDING is supported.
 dnl set pac_fc_iso_c_binding to yes if it's supported, otherwise, no.

configure.ac

@@ -4207,6 +4207,7 @@ fi
 
 if test "$enable_f08" = "yes" ; then
     PAC_FC_CHECK_REAL128
+    PAC_FC_CHECK_IGNORE_TKR_D
     if test -z "$PYTHON" ; then
         if test -f src/binding/fortran/use_mpi_f08/mpi_f08.f90 ; then
             AC_MSG_NOTICE([Using pre-generated Fortran mpi_f08 binding source. To prevent issues, install Python 3 and rerun configure.])
@@ -4218,6 +4219,9 @@ if test "$enable_f08" = "yes" ; then
         if test "$pac_fc_has_real128" = "no" ; then
             cmd_f08="$cmd_f08 -no-real128"
         fi
+        if test "$pac_fc_ignore_tkr_d" != "no" ; then
+            cmd_f08="$cmd_f08 -ignore-tkr-d=$pac_fc_ignore_tkr_d"
+        fi
         if test "$enable_romio" = "no" ; then
             cmd_f08="$cmd_f08 -no-mpiio"
         fi

maint/local_python/binding_f08.py

@@ -879,6 +879,10 @@ def dump_interface_function(func, name, c_name, is_large):
 def dump_mpi_f08(func, is_large):
     f08_mapping = get_kind_map('F08', is_large)
 
+    def dump_ignore_tkr_d(name, out):
+        if G.opts['ignore-tkr-d'] == 'dir': # e.g. nvfortran
+            out.append("!DIR$ IGNORE_TKR(d) " + name)
+
     uses = {}
     f_param_list = []
     decl_list = []
@@ -889,6 +893,8 @@ def dump_mpi_f08(func, is_large):
         f_param_list.append(p['name'])
         decl = get_F_decl(p, f08_mapping)
         decl_list.append(decl)
+        if 'ignore-tkr-d' in G.opts and p['kind'] == 'BUFFER':
+            dump_ignore_tkr_d(p['name'], decl_list)
         check_decl_uses(decl, uses)
     if 'return' not in func:
         f_param_list.append("ierror")

src/mpid/ch4/src/ch4_send.h

@@ -24,8 +24,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_isend(const void *buf,
 #ifdef MPIDI_CH4_DIRECT_NETMOD
     mpi_errno = MPIDI_NM_mpi_isend(buf, count, datatype, rank, tag, comm, attr, av, req);
 #else
-    int r;
-    if ((r = MPIDI_av_is_local(av)))
+    if ((MPIDI_av_is_local(av)))
         mpi_errno = MPIDI_SHM_mpi_isend(buf, count, datatype, rank, tag, comm, attr, av, req);
     else
         mpi_errno = MPIDI_NM_mpi_isend(buf, count, datatype, rank, tag, comm, attr, av, req);