Merge pull request #19 from albandil/ilp64_support

ILP64 support

Author: julielangou

BLACS/SRC/BI_Arecv.c

@@ -1,8 +1,9 @@
 #include "Bdef.h"
 
-void BI_Arecv(BLACSCONTEXT *ctxt, int src, int msgid, BLACBUFF *bp)
+void BI_Arecv(BLACSCONTEXT *ctxt, Int src, Int msgid, BLACBUFF *bp)
 {
-   int i, info, errclass;
+   Int i, info;
+   MpiInt errclass;
 
    info=MPI_Irecv(bp->Buff, bp->N, bp->dtype, src, msgid, ctxt->scp->comm,
                 &bp->Aops[bp->nAops]);

BLACS/SRC/BI_ArgCheck.c

@@ -1,13 +1,13 @@
 #include "Bdef.h"
 
 
-void BI_ArgCheck(int ConTxt, int RoutType, char *routine, char scope,
-                 char uplo, char diag, int m, int n, int lda, int nprocs,
-                 int *prows, int *pcols)
+void BI_ArgCheck(Int ConTxt, Int RoutType, char *routine, char scope,
+                 char uplo, char diag, Int m, Int n, Int lda, Int nprocs,
+                 Int *prows, Int *pcols)
 {
 #if (BlacsDebugLvl > 0)
    char *srcdest;
-   int i=1, prow, pcol, Ng, nprow, npcol, myrow, mycol;
+   Int i=1, prow, pcol, Ng, nprow, npcol, myrow, mycol;
    BLACSCONTEXT *ctxt;
 
    MGetConTxt(ConTxt, ctxt);

BLACS/SRC/BI_Asend.c

@@ -1,8 +1,9 @@
 #include "Bdef.h"
 
-void BI_Asend(BLACSCONTEXT *ctxt, int dest, int msgid, BLACBUFF *bp)
+void BI_Asend(BLACSCONTEXT *ctxt, Int dest, Int msgid, BLACBUFF *bp)
 {
-   int i, info, errclass;
+   Int i, info;
+   MpiInt errclass;
 
    info=MPI_Isend(bp->Buff, bp->N, bp->dtype, dest, msgid, ctxt->scp->comm,
                 &bp->Aops[bp->nAops]);

BLACS/SRC/BI_BeComb.c

@@ -8,7 +8,7 @@
  *  Robert van de Geijn, et al.
  */
 void BI_BeComb(BLACSCONTEXT *ctxt, BLACBUFF *bp, BLACBUFF *bp2,
-               int N, VVFUNPTR Xvvop)
+               Int N, VVFUNPTR Xvvop)
 /*
  *  -- V1.1ALPHA (test version) BLACS routine --
  *  University of Tennessee, October 1, 1995
@@ -47,15 +47,15 @@ void BI_BeComb(BLACSCONTEXT *ctxt, BLACBUFF *bp, BLACBUFF *bp2,
  * ------------------------------------------------------------------------
  */
 {
-   void BI_Ssend(BLACSCONTEXT *, int, int, BLACBUFF *);
-   void BI_Srecv(BLACSCONTEXT *, int, int, BLACBUFF *);
-   void BI_Rsend(BLACSCONTEXT *, int, int, BLACBUFF *);
-   void BI_Arecv(BLACSCONTEXT *, int, int, BLACBUFF *);
+   void BI_Ssend(BLACSCONTEXT *, Int, Int, BLACBUFF *);
+   void BI_Srecv(BLACSCONTEXT *, Int, Int, BLACBUFF *);
+   void BI_Rsend(BLACSCONTEXT *, Int, Int, BLACBUFF *);
+   void BI_Arecv(BLACSCONTEXT *, Int, Int, BLACBUFF *);
    void BI_UpdateBuffs(BLACBUFF *);
-   BLACBUFF *BI_GetBuff(int);
-   int BI_BuffIsFree(BLACBUFF *, int);
+   BLACBUFF *BI_GetBuff(Int);
+   Int BI_BuffIsFree(BLACBUFF *, Int);
 
-   int Np, Iam, dest, msgid, Rmsgid, np2, bit, ierr;
+   Int Np, Iam, dest, msgid, Rmsgid, np2, bit, ierr;
    extern MPI_Status *BI_Stats;
 
    Np = ctxt->scp->Np;

BLACS/SRC/BI_BlacsAbort.c

@@ -1,8 +1,8 @@
 #include "Bdef.h"
 
-void BI_BlacsAbort(int ErrNo)
+void BI_BlacsAbort(Int ErrNo)
 {
-   int ierr;
+   Int ierr;
    fflush(stderr);
    fflush(stdout);
    ierr=MPI_Abort(MPI_COMM_WORLD, ErrNo);

BLACS/SRC/BI_BlacsErr.c

@@ -1,14 +1,14 @@
 #include "Bdef.h"
 
-void BI_BlacsErr(int ConTxt, int line, char *file, char *form, ...)
+void BI_BlacsErr(Int ConTxt, Int line, char *file, char *form, ...)
 {
 #ifdef __STDC__
-   void BI_BlacsAbort(int ErrNo);
+   void BI_BlacsAbort(Int ErrNo);
 #else
    void BI_BlacsAbort();
 #endif
-   extern int BI_Iam;
-   int myrow, mycol;
+   extern Int BI_Iam;
+   Int myrow, mycol;
    va_list argptr;
    char cline[100];
    BLACSCONTEXT *ctxt;

BLACS/SRC/BI_BlacsWarn.c

@@ -1,10 +1,10 @@
 #include "Bdef.h"
 
-void BI_BlacsWarn(int ConTxt, int line, char *file, char *form, ...)
+void BI_BlacsWarn(Int ConTxt, Int line, char *file, char *form, ...)
 {
-   extern int BI_Iam;
+   extern Int BI_Iam;
    extern BLACSCONTEXT **BI_MyContxts;
-   int myrow, mycol;
+   Int myrow, mycol;
    va_list argptr;
    char cline[100];
 

BLACS/SRC/BI_BuffIsFree.c

@@ -1,14 +1,14 @@
 #include "Bdef.h"
 
-int BI_BuffIsFree(BLACBUFF *bp, int Wait)
+Int BI_BuffIsFree(BLACBUFF *bp, Int Wait)
 /*
  *  Check to see if buff is finished with async. operations.  If Wait != 0,
  *  wait for all async. operations to complete.
  */
 {
-   int i, info;
+   MpiInt i, info;
    extern MPI_Status *BI_Stats;
-   extern int BI_Np;
+   extern Int BI_Np;
 
 
    if (!Wait)

BLACS/SRC/BI_ContxtNum.c

@@ -1,12 +1,12 @@
 #include "Bdef.h"
 
-int BI_ContxtNum(BLACSCONTEXT *ctxt)
+Int BI_ContxtNum(BLACSCONTEXT *ctxt)
 /*
  *  Returns the integer ID of ctxt
  */
 {
-   int i;
-   extern int BI_MaxNCtxt;
+   Int i;
+   extern Int BI_MaxNCtxt;
    extern BLACSCONTEXT **BI_MyContxts;
 
    if (ctxt == NULL) return(-1);

BLACS/SRC/BI_EmergencyBuff.c

@@ -6,15 +6,15 @@
  *  the user-changeable macro value BUFWAIT.  If in that time no active    *
  *  buffer becomes inactive, a hang is assumed, and the grid is killed.    *
  ***************************************************************************/
-void BI_EmergencyBuff(int length)
+void BI_EmergencyBuff(Int length)
 {
    void BI_UpdateBuffs(BLACBUFF *);
 
    char *cptr;
-   int i, j;
+   Int i, j;
    double Mwalltime(void);
    double t1;
-   extern int BI_Np;
+   extern Int BI_Np;
    extern BLACBUFF *BI_ReadyB, *BI_ActiveQ;
 
    j = sizeof(BLACBUFF);