Skip to content

Commit 655382d

Browse files
langoulangou
authored
Merge pull request #139 from hughcars/master
Fix function declaration argument error
2 parents 95f8481 + 0cd017a commit 655382d

27 files changed

+704
-691
lines changed

‎REDIST/SRC/pcgemr.c

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "redist.h"
2+
#include <stddef.h>
23
/** $Id: pcgemr.c,v 1.1.1.1 2000/02/15 18:04:09 susan Exp $
34
------------------------------------------------------------------------
45
@@ -155,11 +156,11 @@
155156
#define ccopy_ ccopy
156157
#define clacpy_ clacpy
157158
#endif
158-
#define Clacpy Ccgelacpy
159-
void Clacpy();
160159
typedef struct {
161160
float r, i;
162161
} complex;
162+
#define Clacpy Ccgelacpy
163+
void Clacpy( Int m, Int n, complex *a, Int lda, complex *b, Int ldb );
163164
typedef struct {
164165
Int desctype;
165166
Int ctxt;
@@ -187,35 +188,35 @@ typedef struct {
187188
#define realloc myrealloc
188189
#endif
189190
/* Cblacs */
190-
extern void Cblacs_pcoord();
191-
extern Int Cblacs_pnum();
191+
extern void Cblacs_pcoord( Int context, Int pnum, Int* prow, Int* pcol );
192+
extern Int Cblacs_pnum( Int context, Int prow, Int pcol );
192193
extern void Csetpvmtids();
193-
extern void Cblacs_get();
194-
extern void Cblacs_pinfo();
195-
extern void Cblacs_gridinfo();
196-
extern void Cblacs_gridinit();
197-
extern void Cblacs_exit();
198-
extern void Cblacs_gridexit();
199-
extern void Cblacs_setup();
200-
extern void Cigebs2d();
201-
extern void Cigebr2d();
202-
extern void Cigesd2d();
203-
extern void Cigerv2d();
204-
extern void Cigsum2d();
205-
extern void Cigamn2d();
206-
extern void Cigamx2d();
207-
extern void Ccgesd2d();
208-
extern void Ccgerv2d();
194+
extern void Cblacs_get( Int context, Int what, Int* val );
195+
extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
196+
extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
197+
extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
198+
extern void Cblacs_exit( Int continue_blacs );
199+
extern void Cblacs_gridexit( Int context );
200+
extern void Cblacs_setup( Int* mypnum, Int* nprocs );
201+
extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
202+
extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
203+
extern void Cigesd2d( Int context, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
204+
extern void Cigerv2d( Int context, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
205+
extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
206+
extern void Cigamn2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int* RA, Int* CA, Int rcflag, Int rdest, Int cdest );
207+
extern void Cigamx2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int* RA, Int* CA, Int rcflag, Int rdest, Int cdest );
208+
extern void Ccgesd2d( Int context, Int m, Int n, complex* A, Int lda, Int rdest, Int cdest );
209+
extern void Ccgerv2d( Int context, Int m, Int n, complex* A, Int lda, Int rsrc, Int csrc );
209210
/* lapack */
210211
void clacpy_();
211212
/* aux fonctions */
212-
extern Int localindice();
213-
extern void *mr2d_malloc();
214-
extern Int ppcm();
215-
extern Int localsize();
216-
extern Int memoryblocksize();
217-
extern Int changeorigin();
218-
extern void paramcheck();
213+
extern Int localindice( Int ig, Int jg, Int templateheight, Int templatewidth, MDESC *a );
214+
extern void *mr2d_malloc( size_t n );
215+
extern Int ppcm( Int a, Int b );
216+
extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
217+
extern Int memoryblocksize( MDESC *a );
218+
extern Int changeorigin( Int myp, Int sp, Int p, Int bs, Int i, Int *decal, Int *newsp );
219+
extern void paramcheck( MDESC *a, Int i, Int j, Int m, Int n, Int p, Int q, Int gcontext );
219220
/* tools and others function */
220221
#define scanD0 cgescanD0
221222
#define dispmat cgedispmat
@@ -224,11 +225,11 @@ extern void paramcheck();
224225
#define scan_intervals cgescan_intervals
225226
extern void scanD0();
226227
extern void dispmat();
227-
extern void setmemory();
228-
extern void freememory();
229-
extern Int scan_intervals();
230-
extern void Cpcgemr2do();
231-
extern void Cpcgemr2d();
228+
extern void setmemory( complex** ptr, Int size );
229+
extern void freememory( char* ptr );
230+
extern Int scan_intervals( char type, Int ja, Int jb, Int n, MDESC *ma, MDESC *mb, Int q0, Int q1, Int col0, Int col1, IDESC *result );
231+
extern void Cpcgemr2do( Int m, Int n, complex *ptrmyblock, Int ia, Int ja, MDESC *ma, complex *ptrmynewblock, Int ib, Int jb, MDESC *mb );
232+
extern void Cpcgemr2d( Int m, Int n, complex *ptrmyblock, Int ia, Int ja, MDESC *ma, complex *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
232233
/* some defines for Cpcgemr2do */
233234
#define SENDBUFF 0
234235
#define RECVBUFF 1
@@ -259,11 +260,11 @@ fortran_mr2dnew(Int *m, Int *n, complex *A, Int *ia, Int *ja, Int desc_A[DESCLEN
259260
B, *ib, *jb, (MDESC *) desc_B, *gcontext);
260261
return;
261262
}
262-
static2 void init_chenille();
263-
static2 Int inter_len();
264-
static2 Int block2buff();
265-
static2 void buff2block();
266-
static2 void gridreshape();
263+
static2 void init_chenille( Int mypnum, Int nprocs, Int n0, Int *proc0, Int n1, Int *proc1, Int **psend, Int **precv, Int *myrang );
264+
static2 Int inter_len( Int hinb, IDESC *hi, Int vinb, IDESC *vi );
265+
static2 Int block2buff( IDESC *vi, Int vinb, IDESC *hi, Int hinb, complex *ptra, MDESC *ma, complex *buff );
266+
static2 void buff2block( IDESC *vi, Int vinb, IDESC *hi, Int hinb, complex *buff, complex *ptrb, MDESC *mb );
267+
static2 void gridreshape( Int *ctxtp );
267268
void
268269
Cpcgemr2do(m, n,
269270
ptrmyblock, ia, ja, ma,

‎REDIST/SRC/pcgemr2.c

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "redist.h"
2+
#include <stddef.h>
23
/* $Id: pcgemr2.c,v 1.1.1.1 2000/02/15 18:04:09 susan Exp $
34
*
45
* some functions used by the pcgemr2d routine see file pcgemr.c for more
@@ -20,11 +21,11 @@
2021
#define ccopy_ ccopy
2122
#define clacpy_ clacpy
2223
#endif
23-
#define Clacpy Ccgelacpy
24-
void Clacpy();
2524
typedef struct {
2625
float r, i;
2726
} complex;
27+
#define Clacpy Ccgelacpy
28+
void Clacpy( Int m, Int n, complex *a, Int lda, complex *b, Int ldb );
2829
typedef struct {
2930
Int desctype;
3031
Int ctxt;
@@ -52,35 +53,35 @@ typedef struct {
5253
#define realloc myrealloc
5354
#endif
5455
/* Cblacs */
55-
extern void Cblacs_pcoord();
56-
extern Int Cblacs_pnum();
56+
extern void Cblacs_pcoord( Int context, Int pnum, Int* prow, Int* pcol );
57+
extern Int Cblacs_pnum( Int context, Int prow, Int pcol );
5758
extern void Csetpvmtids();
58-
extern void Cblacs_get();
59-
extern void Cblacs_pinfo();
60-
extern void Cblacs_gridinfo();
61-
extern void Cblacs_gridinit();
62-
extern void Cblacs_exit();
63-
extern void Cblacs_gridexit();
64-
extern void Cblacs_setup();
65-
extern void Cigebs2d();
66-
extern void Cigebr2d();
67-
extern void Cigesd2d();
68-
extern void Cigerv2d();
69-
extern void Cigsum2d();
70-
extern void Cigamn2d();
71-
extern void Cigamx2d();
72-
extern void Ccgesd2d();
73-
extern void Ccgerv2d();
59+
extern void Cblacs_get( Int context, Int what, Int* val );
60+
extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
61+
extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
62+
extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
63+
extern void Cblacs_exit( Int continue_blacs );
64+
extern void Cblacs_gridexit( Int context );
65+
extern void Cblacs_setup( Int* mypnum, Int* nprocs );
66+
extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
67+
extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
68+
extern void Cigesd2d( Int context, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
69+
extern void Cigerv2d( Int context, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
70+
extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
71+
extern void Cigamn2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int* RA, Int* CA, Int rcflag, Int rdest, Int cdest );
72+
extern void Cigamx2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int* RA, Int* CA, Int rcflag, Int rdest, Int cdest );
73+
extern void Ccgesd2d( Int context, Int m, Int n, complex* A, Int lda, Int rdest, Int cdest );
74+
extern void Ccgerv2d( Int context, Int m, Int n, complex* A, Int lda, Int rsrc, Int csrc );
7475
/* lapack */
7576
void clacpy_();
7677
/* aux fonctions */
77-
extern Int localindice();
78-
extern void *mr2d_malloc();
79-
extern Int ppcm();
80-
extern Int localsize();
81-
extern Int memoryblocksize();
82-
extern Int changeorigin();
83-
extern void paramcheck();
78+
extern Int localindice( Int ig, Int jg, Int templateheight, Int templatewidth, MDESC *a );
79+
extern void *mr2d_malloc( size_t n );
80+
extern Int ppcm( Int a, Int b );
81+
extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
82+
extern Int memoryblocksize( MDESC *a );
83+
extern Int changeorigin( Int myp, Int sp, Int p, Int bs, Int i, Int *decal, Int *newsp );
84+
extern void paramcheck( MDESC *a, Int i, Int j, Int m, Int n, Int p, Int q, Int gcontext );
8485
/* tools and others function */
8586
#define scanD0 cgescanD0
8687
#define dispmat cgedispmat
@@ -89,9 +90,9 @@ extern void paramcheck();
8990
#define scan_intervals cgescan_intervals
9091
extern void scanD0();
9192
extern void dispmat();
92-
extern void setmemory();
93-
extern void freememory();
94-
extern Int scan_intervals();
93+
extern void setmemory( complex** ptr, Int size );
94+
extern void freememory( complex* ptr );
95+
extern Int scan_intervals( char type, Int ja, Int jb, Int n, MDESC *ma, MDESC *mb, Int q0, Int q1, Int col0, Int col1, IDESC *result );
9596
extern void Cpcgemr2do();
9697
extern void Cpcgemr2d();
9798
/* some defines for Cpcgemr2do */

‎REDIST/SRC/pctrmr.c

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "redist.h"
2+
#include <stddef.h>
23
/** $Id: pctrmr.c,v 1.1.1.1 2000/02/15 18:04:09 susan Exp $
34
------------------------------------------------------------------------
45
@@ -170,11 +171,11 @@
170171
#define ccopy_ ccopy
171172
#define clacpy_ clacpy
172173
#endif
173-
#define Clacpy Cctrlacpy
174-
void Clacpy();
175174
typedef struct {
176175
float r, i;
177176
} complex;
177+
#define Clacpy Cctrlacpy
178+
void Clacpy( Int m, Int n, complex *a, Int lda, complex *b, Int ldb );
178179
typedef struct {
179180
Int desctype;
180181
Int ctxt;
@@ -202,48 +203,48 @@ typedef struct {
202203
#define realloc myrealloc
203204
#endif
204205
/* Cblacs */
205-
extern void Cblacs_pcoord();
206-
extern Int Cblacs_pnum();
206+
extern void Cblacs_pcoord( Int context, Int pnum, Int* prow, Int* pcol );
207+
extern Int Cblacs_pnum( Int context, Int prow, Int pcol );
207208
extern void Csetpvmtids();
208-
extern void Cblacs_get();
209-
extern void Cblacs_pinfo();
210-
extern void Cblacs_gridinfo();
211-
extern void Cblacs_gridinit();
212-
extern void Cblacs_exit();
213-
extern void Cblacs_gridexit();
214-
extern void Cblacs_setup();
215-
extern void Cigebs2d();
216-
extern void Cigebr2d();
217-
extern void Cigesd2d();
218-
extern void Cigerv2d();
219-
extern void Cigsum2d();
220-
extern void Cigamn2d();
221-
extern void Cigamx2d();
222-
extern void Ccgesd2d();
223-
extern void Ccgerv2d();
209+
extern void Cblacs_get( Int context, Int what, Int* val );
210+
extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
211+
extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
212+
extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
213+
extern void Cblacs_exit( Int continue_blacs );
214+
extern void Cblacs_gridexit( Int context );
215+
extern void Cblacs_setup( Int* mypnum, Int* nprocs );
216+
extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
217+
extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
218+
extern void Cigesd2d( Int context, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
219+
extern void Cigerv2d( Int context, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
220+
extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
221+
extern void Cigamn2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int* RA, Int* CA, Int rcflag, Int rdest, Int cdest );
222+
extern void Cigamx2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int* RA, Int* CA, Int rcflag, Int rdest, Int cdest );
223+
extern void Ccgesd2d( Int context, Int m, Int n, complex* A, Int lda, Int rdest, Int cdest );
224+
extern void Ccgerv2d( Int context, Int m, Int n, complex* A, Int lda, Int rsrc, Int csrc );
224225
/* lapack */
225226
void clacpy_();
226227
/* aux fonctions */
227-
extern Int localindice();
228-
extern void *mr2d_malloc();
229-
extern Int ppcm();
230-
extern Int localsize();
231-
extern Int memoryblocksize();
232-
extern Int changeorigin();
233-
extern void paramcheck();
228+
extern Int localindice( Int ig, Int jg, Int templateheight, Int templatewidth, MDESC *a );
229+
extern void *mr2d_malloc( size_t n );
230+
extern Int ppcm( Int a, Int b );
231+
extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
232+
extern Int memoryblocksize( MDESC *a );
233+
extern Int changeorigin( Int myp, Int sp, Int p, Int bs, Int i, Int *decal, Int *newsp );
234+
extern void paramcheck( MDESC *a, Int i, Int j, Int m, Int n, Int p, Int q, Int gcontext );
234235
/* tools and others function */
235236
#define scanD0 ctrscanD0
236237
#define dispmat ctrdispmat
237238
#define setmemory ctrsetmemory
238239
#define freememory ctrfreememory
239240
#define scan_intervals ctrscan_intervals
240-
extern void scanD0();
241+
extern void scanD0( char* uplo, char* diag, Int action, complex* ptrbuff, Int* ptrsizebuff, Int m, Int n, MDESC* ma, Int ia, Int ja, Int p0, Int q0, MDESC* mb, Int ib, Int jb, Int p1, Int q1, IDESC* v_inter, Int vinter_nb, IDESC* h_inter, Int hinter_nb, complex* ptrblock );
241242
extern void dispmat();
242-
extern void setmemory();
243-
extern void freememory();
244-
extern Int scan_intervals();
245-
extern void Cpctrmr2do();
246-
extern void Cpctrmr2d();
243+
extern void setmemory( complex** ptr, Int size );
244+
extern void freememory( char* ptr );
245+
extern Int scan_intervals( char type, Int ja, Int jb, Int n, MDESC *ma, MDESC *mb, Int q0, Int q1, Int col0, Int col1, IDESC *result );
246+
extern void Cpctrmr2do( char* uplo, char* diag, Int m, Int n, complex *ptrmyblock, Int ia, Int ja, MDESC *ma, complex *ptrmynewblock, Int ib, Int jb, MDESC *mb );
247+
extern void Cpctrmr2d( char* uplo, char* diag, Int m, Int n, complex *ptrmyblock, Int ia, Int ja, MDESC *ma, complex *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
247248
/* some defines for Cpctrmr2do */
248249
#define SENDBUFF 0
249250
#define RECVBUFF 1
@@ -274,11 +275,11 @@ fortran_mr2dnew(char *uplo, char *diag, Int *m, Int *n, complex *A, Int *ia, Int
274275
B, *ib, *jb, (MDESC *) desc_B, *gcontext);
275276
return;
276277
}
277-
static2 void init_chenille();
278+
static2 void init_chenille( Int mypnum, Int nprocs, Int n0, Int *proc0, Int n1, Int *proc1, Int **psend, Int **precv, Int *myrang );
278279
static2 Int inter_len();
279280
static2 Int block2buff();
280281
static2 void buff2block();
281-
static2 void gridreshape();
282+
static2 void gridreshape( Int *ctxtp );
282283
void
283284
Cpctrmr2do(uplo, diag, m, n,
284285
ptrmyblock, ia, ja, ma,

0 commit comments

Comments
 (0)