Resolve merge conflicts

Change-Id: If354094142c973f6ddc959520bc33c44f13f44e8
amd · Feb 26, 2024 · 46ce83a · 46ce83a
2 parents cecb21f + e5792d7
commit 46ce83a
Show file tree

Hide file tree

Showing 697 changed files with 21,101 additions and 4,046 deletions.
diff --git a/BLACS/SRC/Bdef.h b/BLACS/SRC/Bdef.h
@@ -337,194 +337,8 @@ Int BI_ContxtNum(BLACSCONTEXT *ctxt);
 #define BI_MPI_TYPE_FREE(t) MPI_Type_free(t)
 #endif
 
-#if (FORTRAN_CALL_C == NOCHANGE)
-/*
- * These defines set up the naming scheme required to have a fortran
- * routine call a C routine (which is what the BLACS are written in)
- * for the following Fortran to C interface:
- *           FORTRAN CALL               C DECLARATION
- *           call dgebs2d(...)          void dgebs2d(...)
- */
-
-/*
- * Support routines
- */
-#define blacs_pinfo_                   blacs_pinfo
-#define blacs_setup_                   blacs_setup
-#define setpvmtids_                    setpvmtids
-#define blacs_set_                     blacs_set
-#define blacs_get_                     blacs_get
-#define blacs_gridinit_                blacs_gridinit
-#define blacs_gridmap_                 blacs_gridmap
-#define ksendid_                       ksendid
-#define krecvid_                       krecvid
-#define kbsid_                         kbsid
-#define kbrid_                         kbrid
-#define blacs_freebuff_                blacs_freebuff
-#define blacs_gridexit_                blacs_gridexit
-#define blacs_abort_                   blacs_abort
-#define blacs_exit_                    blacs_exit
-#define blacs_gridinfo_                blacs_gridinfo
-#define blacs_pnum_                    blacs_pnum
-#define blacs_pcoord_                  blacs_pcoord
-#define dcputime00_                    dcputime00
-#define dwalltime00_                   dwalltime00
-#define blacs_barrier_                 blacs_barrier
-
-/*
- * Main, type dependent, routines
- */
-#define igesd2d_   igesd2d
-#define igerv2d_   igerv2d
-#define igebs2d_   igebs2d
-#define igebr2d_   igebr2d
-#define itrsd2d_   itrsd2d
-#define itrrv2d_   itrrv2d
-#define itrbs2d_   itrbs2d
-#define itrbr2d_   itrbr2d
-#define igsum2d_   igsum2d
-#define igamx2d_   igamx2d
-#define igamn2d_   igamn2d
-#define sgesd2d_   sgesd2d
-#define sgerv2d_   sgerv2d
-#define sgebs2d_   sgebs2d
-#define sgebr2d_   sgebr2d
-#define strsd2d_   strsd2d
-#define strrv2d_   strrv2d
-#define strbs2d_   strbs2d
-#define strbr2d_   strbr2d
-#define sgsum2d_   sgsum2d
-#define sgamx2d_   sgamx2d
-#define sgamn2d_   sgamn2d
-#define dgesd2d_   dgesd2d
-#define dgerv2d_   dgerv2d
-#define dgebs2d_   dgebs2d
-#define dgebr2d_   dgebr2d
-#define ugesr2d_   ugesr2d
-#define dtrsd2d_   dtrsd2d
-#define dtrrv2d_   dtrrv2d
-#define dtrbs2d_   dtrbs2d
-#define dtrbr2d_   dtrbr2d
-#define dgsum2d_   dgsum2d
-#define dgamx2d_   dgamx2d
-#define dgamn2d_   dgamn2d
-#define cgesd2d_   cgesd2d
-#define cgerv2d_   cgerv2d
-#define cgebs2d_   cgebs2d
-#define cgebr2d_   cgebr2d
-#define ctrsd2d_   ctrsd2d
-#define ctrrv2d_   ctrrv2d
-#define ctrbs2d_   ctrbs2d
-#define ctrbr2d_   ctrbr2d
-#define cgsum2d_   cgsum2d
-#define cgamx2d_   cgamx2d
-#define cgamn2d_   cgamn2d
-#define zgesd2d_   zgesd2d
-#define zgerv2d_   zgerv2d
-#define zgebs2d_   zgebs2d
-#define zgebr2d_   zgebr2d
-#define ztrsd2d_   ztrsd2d
-#define ztrrv2d_   ztrrv2d
-#define ztrbs2d_   ztrbs2d
-#define ztrbr2d_   ztrbr2d
-#define zgsum2d_   zgsum2d
-#define zgamx2d_   zgamx2d
-#define zgamn2d_   zgamn2d
-
-#elif (FORTRAN_CALL_C == UPCASE)
-/*
- * These defines set up the naming scheme required to have a fortran
- * routine call a C routine (which is what the BLACS are written in)
- * for the following Fortran to C interface:
- *           FORTRAN CALL               C DECLARATION
- *           call dgebs2d(...)          void DGEBS2D(...)
- */
-/*
- * Support routines
- */
-#define blacs_pinfo_                   BLACS_PINFO
-#define blacs_setup_                   BLACS_SETUP
-#define setpvmtids_                    SETPVMTIDS
-#define blacs_set_                     BLACS_SET
-#define blacs_get_                     BLACS_GET
-#define blacs_gridinit_                BLACS_GRIDINIT
-#define blacs_gridmap_                 BLACS_GRIDMAP
-#define ksendid_                       KSENDID
-#define krecvid_                       KRECVID
-#define kbsid_                         KBSID
-#define kbrid_                         KBRID
-#define blacs_freebuff_                BLACS_FREEBUFF
-#define blacs_gridexit_                BLACS_GRIDEXIT
-#define blacs_abort_                   BLACS_ABORT
-#define blacs_exit_                    BLACS_EXIT
-#define blacs_gridinfo_                BLACS_GRIDINFO
-#define blacs_pnum_                    BLACS_PNUM
-#define blacs_pcoord_                  BLACS_PCOORD
-#define dcputime00_                    DCPUTIME00
-#define dwalltime00_                   DWALLTIME00
-#define blacs_barrier_                 BLACS_BARRIER
-
-/*
- * Main, type dependent, routines
- */
-#define igesd2d_   IGESD2D
-#define igerv2d_   IGERV2D
-#define igebs2d_   IGEBS2D
-#define igebr2d_   IGEBR2D
-#define itrsd2d_   ITRSD2D
-#define itrrv2d_   ITRRV2D
-#define itrbs2d_   ITRBS2D
-#define itrbr2d_   ITRBR2D
-#define igsum2d_   IGSUM2D
-#define igamx2d_   IGAMX2D
-#define igamn2d_   IGAMN2D
-#define sgesd2d_   SGESD2D
-#define sgerv2d_   SGERV2D
-#define sgebs2d_   SGEBS2D
-#define sgebr2d_   SGEBR2D
-#define strsd2d_   STRSD2D
-#define strrv2d_   STRRV2D
-#define strbs2d_   STRBS2D
-#define strbr2d_   STRBR2D
-#define sgsum2d_   SGSUM2D
-#define sgamx2d_   SGAMX2D
-#define sgamn2d_   SGAMN2D
-#define dgesd2d_   DGESD2D
-#define dgerv2d_   DGERV2D
-#define dgebs2d_   DGEBS2D
-#define dgebr2d_   DGEBR2D
-#define ugesr2d_   UGESR2D
-#define dtrsd2d_   DTRSD2D
-#define dtrrv2d_   DTRRV2D
-#define dtrbs2d_   DTRBS2D
-#define dtrbr2d_   DTRBR2D
-#define dgsum2d_   DGSUM2D
-#define dgamx2d_   DGAMX2D
-#define dgamn2d_   DGAMN2D
-#define cgesd2d_   CGESD2D
-#define cgerv2d_   CGERV2D
-#define cgebs2d_   CGEBS2D
-#define cgebr2d_   CGEBR2D
-#define ctrsd2d_   CTRSD2D
-#define ctrrv2d_   CTRRV2D
-#define ctrbs2d_   CTRBS2D
-#define ctrbr2d_   CTRBR2D
-#define cgsum2d_   CGSUM2D
-#define cgamx2d_   CGAMX2D
-#define cgamn2d_   CGAMN2D
-#define zgesd2d_   ZGESD2D
-#define zgerv2d_   ZGERV2D
-#define zgebs2d_   ZGEBS2D
-#define zgebr2d_   ZGEBR2D
-#define ztrsd2d_   ZTRSD2D
-#define ztrrv2d_   ZTRRV2D
-#define ztrbs2d_   ZTRBS2D
-#define ztrbr2d_   ZTRBR2D
-#define zgsum2d_   ZGSUM2D
-#define zgamx2d_   ZGAMX2D
-#define zgamn2d_   ZGAMN2D
-
-#elif (FORTRAN_CALL_C == FCISF2C)
+
+#if (FORTRAN_CALL_C == FCISF2C)
 /*
  * These defines set up the naming scheme required to have a fortran
  * routine call a C routine (which is what the BLACS are written in)

diff --git a/BLACS/SRC/blacs_abort_.c b/BLACS/SRC/blacs_abort_.c
@@ -18,3 +18,21 @@ F_VOID_FUNC blacs_abort_(Int *ConTxt, Int *ErrNo)
 
    BI_BlacsAbort(Mpval(ErrNo));
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_abort(Int *ConTxt, Int *ErrNo)
+{
+   blacs_abort_( ConTxt, ErrNo);
+}
+
+F_VOID_FUNC BLACS_ABORT(Int *ConTxt, Int *ErrNo)
+{
+   blacs_abort_( ConTxt, ErrNo);
+}
+
+F_VOID_FUNC BLACS_ABORT_(Int *ConTxt, Int *ErrNo)
+{
+   blacs_abort_( ConTxt, ErrNo);
+}
+#endif
diff --git a/BLACS/SRC/blacs_barr_.c b/BLACS/SRC/blacs_barr_.c
@@ -26,3 +26,21 @@ F_VOID_FUNC blacs_barrier_(Int *ConTxt, F_CHAR scope)
       break;
    }
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_barrier(Int *ConTxt, F_CHAR scope)
+{
+   blacs_barrier_( ConTxt, scope);
+}
+
+F_VOID_FUNC BLACS_BARRIER(Int *ConTxt, F_CHAR scope)
+{
+   blacs_barrier_( ConTxt, scope);
+}
+
+F_VOID_FUNC BLACS_BARRIER_(Int *ConTxt, F_CHAR scope)
+{
+   blacs_barrier_( ConTxt, scope);
+}
+#endif
diff --git a/BLACS/SRC/blacs_exit_.c b/BLACS/SRC/blacs_exit_.c
@@ -50,3 +50,21 @@ F_VOID_FUNC blacs_exit_(Int *NotDone)
    BI_AuxBuff.Aops = NULL;
    BI_Stats = NULL;
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_exit(Int *NotDone)
+{
+   blacs_exit_( NotDone);
+}
+
+F_VOID_FUNC BLACS_EXIT(Int *NotDone)
+{
+   blacs_exit_( NotDone);
+}
+
+F_VOID_FUNC BLACS_EXIT_(Int *NotDone)
+{
+   blacs_exit_( NotDone);
+}
+#endif
diff --git a/BLACS/SRC/blacs_free_.c b/BLACS/SRC/blacs_free_.c
@@ -22,3 +22,21 @@ F_VOID_FUNC blacs_freebuff_(Int *ConTxt, Int *Wait)
       BI_ReadyB = NULL;
    }
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_freebuff(Int *ConTxt, Int *Wait)
+{
+   blacs_freebuff_( ConTxt, Wait);
+}
+
+F_VOID_FUNC BLACS_FREEBUFF(Int *ConTxt, Int *Wait)
+{
+   blacs_freebuff_( ConTxt, Wait);
+}
+
+F_VOID_FUNC BLACS_FREEBUFF_(Int *ConTxt, Int *Wait)
+{
+   blacs_freebuff_( ConTxt, Wait);
+}
+#endif
diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c
@@ -77,3 +77,21 @@ F_VOID_FUNC blacs_get_(Int *ConTxt, Int *what, Int *val)
                 Mpval(what));
    }
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_get(Int *ConTxt, Int *what, Int *val)
+{
+   blacs_get_( ConTxt, what, val);
+}
+
+F_VOID_FUNC BLACS_GET(Int *ConTxt, Int *what, Int *val)
+{
+   blacs_get_( ConTxt, what, val);
+}
+
+F_VOID_FUNC BLACS_GET_(Int *ConTxt, Int *what, Int *val)
+{
+   blacs_get_( ConTxt, what, val);
+}
+#endif
diff --git a/BLACS/SRC/blacs_grid_.c b/BLACS/SRC/blacs_grid_.c
@@ -42,3 +42,21 @@ F_VOID_FUNC blacs_gridexit_(Int *ConTxt)
    free(ctxt);
    BI_MyContxts[Mpval(ConTxt)] = NULL;
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_gridexit(Int *ConTxt)
+{
+   blacs_gridexit_( ConTxt);
+}
+
+F_VOID_FUNC BLACS_GRIDEXIT(Int *ConTxt)
+{
+   blacs_gridexit_( ConTxt);
+}
+
+F_VOID_FUNC BLACS_GRIDEXIT_(Int *ConTxt)
+{
+   blacs_gridexit_( ConTxt);
+}
+#endif
diff --git a/BLACS/SRC/blacs_info_.c b/BLACS/SRC/blacs_info_.c
@@ -30,3 +30,24 @@ F_VOID_FUNC blacs_gridinfo_(Int *ConTxt, Int *nprow, Int *npcol,
    }
    else *nprow = *npcol = *myrow = *mycol = -1;
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_gridinfo(Int *ConTxt, Int *nprow, Int *npcol,
+                            Int *myrow, Int *mycol)
+{
+   blacs_gridinfo_( ConTxt, nprow, npcol, myrow, mycol);
+}
+
+F_VOID_FUNC BLACS_GRIDINFO(Int *ConTxt, Int *nprow, Int *npcol,
+                            Int *myrow, Int *mycol)
+{
+   blacs_gridinfo_( ConTxt, nprow, npcol, myrow, mycol);
+}
+
+F_VOID_FUNC BLACS_GRIDINFO_(Int *ConTxt, Int *nprow, Int *npcol,
+                            Int *myrow, Int *mycol)
+{
+   blacs_gridinfo_( ConTxt, nprow, npcol, myrow, mycol);
+}
+#endif
diff --git a/BLACS/SRC/blacs_init_.c b/BLACS/SRC/blacs_init_.c
@@ -36,3 +36,21 @@ F_VOID_FUNC blacs_gridinit_(Int *ConTxt, F_CHAR order, Int *nprow, Int *npcol)
 #endif
    free(tmpgrid);
 }
+#if (INTFACE != C_CALL)
+/** Wrapper functions to support Fortran to C calls **/
+
+F_VOID_FUNC blacs_gridinit(Int *ConTxt, F_CHAR order, Int *nprow, Int *npcol)
+{
+   blacs_gridinit_( ConTxt, order, nprow, npcol);
+}
+
+F_VOID_FUNC BLACS_GRIDINIT(Int *ConTxt, F_CHAR order, Int *nprow, Int *npcol)
+{
+   blacs_gridinit_( ConTxt, order, nprow, npcol);
+}
+
+F_VOID_FUNC BLACS_GRIDINIT_(Int *ConTxt, F_CHAR order, Int *nprow, Int *npcol)
+{
+   blacs_gridinit_( ConTxt, order, nprow, npcol);
+}
+#endif