Merge branch 'hotfix/5.8.2' of github.com:GlobalArrays/ga into hotfix…

…/5.8.2
GlobalArrays · Nov 2, 2022 · f7a3104 · f7a3104
2 parents 4b6b4f7 + f9f3bb7
commit f7a3104
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 36 deletions.
diff --git a/comex/src-mpi-pt/comex.c b/comex/src-mpi-pt/comex.c
@@ -457,7 +457,7 @@ int comex_finalize()
     free(fence_array);
 
     free(nb_state);
-#ifdef DEBUG
+#if DEBUG
     printf(" %d freed nb_state ptr %p \n", g_state.rank, nb_state);
 #endif
 

diff --git a/global/src/global.fh.in b/global/src/global.fh.in
@@ -3,6 +3,7 @@
       parameter (ga_max_dim = GA_MAX_DIM)
 !
       logical          ga_allocate
+      logical          ga_deallocate
       complex          ga_cdot
       complex          ga_cdot_patch
       integer          ga_cluster_nnodes
@@ -71,6 +72,7 @@
       double complex   ga_zdot
       double complex   ga_zdot_patch
       logical          nga_allocate
+      logical          nga_deallocate
       complex          nga_cdot
       complex          nga_cdot_patch
       integer          nga_cluster_nnodes
@@ -154,6 +156,7 @@
       double complex   nga_zdot_patch
 !
       external ga_allocate
+      external ga_deallocate
       external ga_cdot
       external ga_cdot_patch
       external ga_cluster_nnodes
@@ -222,6 +225,7 @@
       external ga_zdot
       external ga_zdot_patch
       external nga_allocate
+      external nga_deallocate
       external nga_cdot
       external nga_cdot_patch
       external nga_cluster_nnodes

diff --git a/pario/dra/drap.h b/pario/dra/drap.h
@@ -127,35 +127,35 @@ extern Integer ndrai_create_config(Integer *type, Integer *ndim, Integer dims[],
 #ifdef F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS
 extern Integer FATR dra_create_(Integer *type, Integer *dim1, Integer *dim2,
         char *name, char *filename, Integer *mode, Integer *reqdim1,
-        Integer *reqdim2, Integer *d_a, int nlen, int flen);
+        Integer *reqdim2, Integer *d_a, size_t nlen, size_t flen);
 extern Integer FATR ndra_create_(Integer *type, Integer *ndim, Integer dims[],
         char *name, char *filename, Integer *mode, Integer  reqdims[],
-        Integer *d_a, int nlen, int flen);
+        Integer *d_a, size_t nlen, size_t flen);
 extern Integer FATR dra_open_(char *filename, Integer *mode, Integer *d_a,
-        int flen);
+        size_t flen);
 extern Integer FATR dra_inquire_(Integer *d_a, Integer *type, Integer *dim1,
-        Integer *dim2, char *name, char *filename, int nlen, int flen);
+        Integer *dim2, char *name, char *filename, size_t nlen, size_t flen);
 extern Integer FATR ndra_inquire_(Integer *d_a, Integer *type, Integer *ndim,
-        Integer dims[], char *name, char *filename, int nlen, int flen);
+        Integer dims[], char *name, char *filename, size_t nlen, size_t flen);
 extern Integer ndra_create_config_(Integer *type, Integer *ndim,
         Integer dims[], char *name, char *filename, Integer *mode,
         Integer reqdims[], Integer *numfiles, Integer *numioprocs,
-        Integer *d_a, int nlen, int flen);
+        Integer *d_a, size_t nlen, size_t flen);
 #else /* F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS */
 extern Integer FATR dra_create_(Integer *type, Integer *dim1, Integer *dim2,
-        char *name, int nlen, char *filename, int flen, Integer *mode,
+        char *name, size_t nlen, char *filename, size_t flen, Integer *mode,
         Integer *reqdim1, Integer *reqdim2, Integer *d_a);
 extern Integer FATR ndra_create_(Integer *type, Integer *ndim, Integer  dims[],
-        char *name, int nlen, char *filename, int flen, Integer *mode,
+        char *name, size_t nlen, char *filename, size_t flen, Integer *mode,
         Integer  reqdims[], Integer *d_a);
-extern Integer FATR dra_open_(char *filename, int flen, Integer *mode,
+extern Integer FATR dra_open_(char *filename, size_t flen, Integer *mode,
         Integer *d_a);
 extern Integer FATR dra_inquire_(Integer *d_a, Integer *type, Integer *dim1,
-        Integer *dim2, char *name, int nlen, char *filename, int flen);
+        Integer *dim2, char *name, size_t nlen, char *filename, size_t flen);
 extern Integer FATR ndra_inquire_(Integer *d_a, Integer *type, Integer *ndim,
-        Integer dims[], char *name, int nlen, char *filename, int flen);
+        Integer dims[], char *name, size_t nlen, char *filename, size_t flen);
 extern Integer ndra_create_config_(Integer *type, Integer *ndim,
-        Integer dims[], char *name, int nlen, char *filename, int flen,
+        Integer dims[], char *name, size_t nlen, char *filename, size_t flen,
         Integer *mode, Integer reqdims[], Integer *numfiles,
         Integer *numioprocs, Integer *d_a);
 #endif /* F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS */

diff --git a/pario/dra/fortran.c b/pario/dra/fortran.c
@@ -25,16 +25,16 @@ Integer FATR dra_create_(
         Integer *reqdim1,
         Integer *reqdim2,
         Integer *d_a,
-        int  nlen,
-        int  flen
+        size_t  nlen,
+        size_t  flen
 #else
         Integer *type,
         Integer *dim1,
         Integer *dim2,
         char    *name,
-        int  nlen,
+        size_t  nlen,
         char    *filename,
-        int  flen,
+        size_t  flen,
         Integer *mode,
         Integer *reqdim1,
         Integer *reqdim2,
@@ -59,16 +59,16 @@ Integer FATR ndra_create_(
         Integer *mode,
         Integer  reqdims[],
         Integer *d_a,
-        int  nlen,
-        int  flen
+        size_t  nlen,
+        size_t  flen
 #else
         Integer *type,
         Integer *ndim,
         Integer  dims[],
         char    *name,
-        int  nlen,
+        size_t  nlen,
         char    *filename,
-        int  flen,
+        size_t  flen,
         Integer *mode,
         Integer  reqdims[],
         Integer *d_a
@@ -86,10 +86,10 @@ Integer FATR dra_open_(
         char    *filename,
         Integer *mode,
         Integer *d_a,
-        int      flen
+        size_t      flen
 #else
         char    *filename,
-        int      flen,
+        size_t      flen,
         Integer *mode,
         Integer *d_a
 #endif
@@ -108,17 +108,17 @@ Integer FATR dra_inquire_(
         Integer *dim2,
         char    *name,
         char    *filename,
-        int      nlen,
-        int      flen
+        size_t      nlen,
+        size_t      flen
 #else
         Integer *d_a,
         Integer *type,
         Integer *dim1,
         Integer *dim2,
         char    *name,
-        int      nlen,
+        size_t      nlen,
         char    *filename,
-        int      flen
+        size_t      flen
 #endif
         )
 {
@@ -138,17 +138,17 @@ Integer FATR ndra_inquire_(
         Integer  dims[],
         char    *name,
         char    *filename,
-        int      nlen,
-        int      flen
+        size_t      nlen,
+        size_t      flen
 #else
         Integer *d_a,
         Integer *type,
         Integer *ndim,
         Integer  dims[],
         char    *name,
-        int      nlen,
+        size_t      nlen,
         char    *filename,
-        int      flen
+        size_t      flen
 #endif
         )
 {
@@ -172,16 +172,16 @@ Integer ndra_create_config_(
         Integer *numfiles, 
         Integer *numioprocs,
         Integer *d_a,
-        int      nlen,
-        int      flen
+        size_t      nlen,
+        size_t      flen
 #else
         Integer *type,
         Integer *ndim,
         Integer  dims[],
         char    *name,
-        int      nlen,
+        size_t      nlen,
         char    *filename,
-        int      flen,
+        size_t      flen,
         Integer *mode, 
         Integer  reqdims[],
         Integer *numfiles, 

diff --git a/pario/dra/ntest.F b/pario/dra/ntest.F
@@ -133,7 +133,8 @@ subroutine test_io_int
       if (me.eq.0) print*,' '
 c
       if(me.eq.0) print *, 'Opening Existing Disk Array'
-      if(dra_open(FNAME ,DRA_R, d_a).ne.0)
+      if(dra_open(FNAME ,
+     D     DRA_R, d_a).ne.0)
      &            call ga_error('dra_open failed',0)
 c     
       if(ndra_inquire(d_a, type, ndim, dims, name, filename).ne.0)