Skip to content

Commit f7a3104

Browse files
author
Bruce J Palmer
committed
Merge branch 'hotfix/5.8.2' of github.com:GlobalArrays/ga into hotfix/5.8.2
2 parents 4b6b4f7 + f9f3bb7 commit f7a3104

File tree

5 files changed

+41
-36
lines changed

5 files changed

+41
-36
lines changed

‎comex/src-mpi-pt/comex.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ int comex_finalize()
457457
free(fence_array);
458458

459459
free(nb_state);
460-
#ifdef DEBUG
460+
#if DEBUG
461461
printf(" %d freed nb_state ptr %p \n", g_state.rank, nb_state);
462462
#endif
463463

‎global/src/global.fh.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
parameter (ga_max_dim = GA_MAX_DIM)
44
!
55
logical ga_allocate
6+
logical ga_deallocate
67
complex ga_cdot
78
complex ga_cdot_patch
89
integer ga_cluster_nnodes
@@ -71,6 +72,7 @@
7172
double complex ga_zdot
7273
double complex ga_zdot_patch
7374
logical nga_allocate
75+
logical nga_deallocate
7476
complex nga_cdot
7577
complex nga_cdot_patch
7678
integer nga_cluster_nnodes
@@ -154,6 +156,7 @@
154156
double complex nga_zdot_patch
155157
!
156158
external ga_allocate
159+
external ga_deallocate
157160
external ga_cdot
158161
external ga_cdot_patch
159162
external ga_cluster_nnodes
@@ -222,6 +225,7 @@
222225
external ga_zdot
223226
external ga_zdot_patch
224227
external nga_allocate
228+
external nga_deallocate
225229
external nga_cdot
226230
external nga_cdot_patch
227231
external nga_cluster_nnodes

‎pario/dra/drap.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,35 +127,35 @@ extern Integer ndrai_create_config(Integer *type, Integer *ndim, Integer dims[],
127127
#ifdef F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS
128128
extern Integer FATR dra_create_(Integer *type, Integer *dim1, Integer *dim2,
129129
char *name, char *filename, Integer *mode, Integer *reqdim1,
130-
Integer *reqdim2, Integer *d_a, int nlen, int flen);
130+
Integer *reqdim2, Integer *d_a, size_t nlen, size_t flen);
131131
extern Integer FATR ndra_create_(Integer *type, Integer *ndim, Integer dims[],
132132
char *name, char *filename, Integer *mode, Integer reqdims[],
133-
Integer *d_a, int nlen, int flen);
133+
Integer *d_a, size_t nlen, size_t flen);
134134
extern Integer FATR dra_open_(char *filename, Integer *mode, Integer *d_a,
135-
int flen);
135+
size_t flen);
136136
extern Integer FATR dra_inquire_(Integer *d_a, Integer *type, Integer *dim1,
137-
Integer *dim2, char *name, char *filename, int nlen, int flen);
137+
Integer *dim2, char *name, char *filename, size_t nlen, size_t flen);
138138
extern Integer FATR ndra_inquire_(Integer *d_a, Integer *type, Integer *ndim,
139-
Integer dims[], char *name, char *filename, int nlen, int flen);
139+
Integer dims[], char *name, char *filename, size_t nlen, size_t flen);
140140
extern Integer ndra_create_config_(Integer *type, Integer *ndim,
141141
Integer dims[], char *name, char *filename, Integer *mode,
142142
Integer reqdims[], Integer *numfiles, Integer *numioprocs,
143-
Integer *d_a, int nlen, int flen);
143+
Integer *d_a, size_t nlen, size_t flen);
144144
#else /* F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS */
145145
extern Integer FATR dra_create_(Integer *type, Integer *dim1, Integer *dim2,
146-
char *name, int nlen, char *filename, int flen, Integer *mode,
146+
char *name, size_t nlen, char *filename, size_t flen, Integer *mode,
147147
Integer *reqdim1, Integer *reqdim2, Integer *d_a);
148148
extern Integer FATR ndra_create_(Integer *type, Integer *ndim, Integer dims[],
149-
char *name, int nlen, char *filename, int flen, Integer *mode,
149+
char *name, size_t nlen, char *filename, size_t flen, Integer *mode,
150150
Integer reqdims[], Integer *d_a);
151-
extern Integer FATR dra_open_(char *filename, int flen, Integer *mode,
151+
extern Integer FATR dra_open_(char *filename, size_t flen, Integer *mode,
152152
Integer *d_a);
153153
extern Integer FATR dra_inquire_(Integer *d_a, Integer *type, Integer *dim1,
154-
Integer *dim2, char *name, int nlen, char *filename, int flen);
154+
Integer *dim2, char *name, size_t nlen, char *filename, size_t flen);
155155
extern Integer FATR ndra_inquire_(Integer *d_a, Integer *type, Integer *ndim,
156-
Integer dims[], char *name, int nlen, char *filename, int flen);
156+
Integer dims[], char *name, size_t nlen, char *filename, size_t flen);
157157
extern Integer ndra_create_config_(Integer *type, Integer *ndim,
158-
Integer dims[], char *name, int nlen, char *filename, int flen,
158+
Integer dims[], char *name, size_t nlen, char *filename, size_t flen,
159159
Integer *mode, Integer reqdims[], Integer *numfiles,
160160
Integer *numioprocs, Integer *d_a);
161161
#endif /* F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS */

‎pario/dra/fortran.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ Integer FATR dra_create_(
2525
Integer *reqdim1,
2626
Integer *reqdim2,
2727
Integer *d_a,
28-
int nlen,
29-
int flen
28+
size_t nlen,
29+
size_t flen
3030
#else
3131
Integer *type,
3232
Integer *dim1,
3333
Integer *dim2,
3434
char *name,
35-
int nlen,
35+
size_t nlen,
3636
char *filename,
37-
int flen,
37+
size_t flen,
3838
Integer *mode,
3939
Integer *reqdim1,
4040
Integer *reqdim2,
@@ -59,16 +59,16 @@ Integer FATR ndra_create_(
5959
Integer *mode,
6060
Integer reqdims[],
6161
Integer *d_a,
62-
int nlen,
63-
int flen
62+
size_t nlen,
63+
size_t flen
6464
#else
6565
Integer *type,
6666
Integer *ndim,
6767
Integer dims[],
6868
char *name,
69-
int nlen,
69+
size_t nlen,
7070
char *filename,
71-
int flen,
71+
size_t flen,
7272
Integer *mode,
7373
Integer reqdims[],
7474
Integer *d_a
@@ -86,10 +86,10 @@ Integer FATR dra_open_(
8686
char *filename,
8787
Integer *mode,
8888
Integer *d_a,
89-
int flen
89+
size_t flen
9090
#else
9191
char *filename,
92-
int flen,
92+
size_t flen,
9393
Integer *mode,
9494
Integer *d_a
9595
#endif
@@ -108,17 +108,17 @@ Integer FATR dra_inquire_(
108108
Integer *dim2,
109109
char *name,
110110
char *filename,
111-
int nlen,
112-
int flen
111+
size_t nlen,
112+
size_t flen
113113
#else
114114
Integer *d_a,
115115
Integer *type,
116116
Integer *dim1,
117117
Integer *dim2,
118118
char *name,
119-
int nlen,
119+
size_t nlen,
120120
char *filename,
121-
int flen
121+
size_t flen
122122
#endif
123123
)
124124
{
@@ -138,17 +138,17 @@ Integer FATR ndra_inquire_(
138138
Integer dims[],
139139
char *name,
140140
char *filename,
141-
int nlen,
142-
int flen
141+
size_t nlen,
142+
size_t flen
143143
#else
144144
Integer *d_a,
145145
Integer *type,
146146
Integer *ndim,
147147
Integer dims[],
148148
char *name,
149-
int nlen,
149+
size_t nlen,
150150
char *filename,
151-
int flen
151+
size_t flen
152152
#endif
153153
)
154154
{
@@ -172,16 +172,16 @@ Integer ndra_create_config_(
172172
Integer *numfiles,
173173
Integer *numioprocs,
174174
Integer *d_a,
175-
int nlen,
176-
int flen
175+
size_t nlen,
176+
size_t flen
177177
#else
178178
Integer *type,
179179
Integer *ndim,
180180
Integer dims[],
181181
char *name,
182-
int nlen,
182+
size_t nlen,
183183
char *filename,
184-
int flen,
184+
size_t flen,
185185
Integer *mode,
186186
Integer reqdims[],
187187
Integer *numfiles,

‎pario/dra/ntest.F‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ subroutine test_io_int
133133
if (me.eq.0) print*,' '
134134
c
135135
if(me.eq.0) print *, 'Opening Existing Disk Array'
136-
if(dra_open(FNAME ,DRA_R, d_a).ne.0)
136+
if(dra_open(FNAME ,
137+
D DRA_R, d_a).ne.0)
137138
& call ga_error('dra_open failed',0)
138139
c
139140
if(ndra_inquire(d_a, type, ndim, dims, name, filename).ne.0)

0 commit comments

Comments
 (0)