Skip to content

Workarounds to compile with MPItrampoline #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nick-wilson wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Workarounds to compile with MPItrampoline #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2969eda
Reduced size of threaded tests so that they don't take as long.
Oct 14, 2021
4aceff7
Adding test file to build
Oct 29, 2021
ab1c59f
Cleaned up header files.
Oct 29, 2021
e407845
Added some declarations so the ga++ interface builds properly.
Dec 10, 2021
89e3822
Fixed up some additional problems with compiling test suite.
Dec 10, 2021
b4b3582
update license files
ajaypanyala Jun 9, 2022
f4016b8
Merge branch 'hotfix/5.8.2'
Nov 3, 2022
81c690b
replace case-switch on MPI return codes with if-elseif (#286)
jeffhammond Dec 7, 2022
befd78a
workaround MPI_COMM_NULL not available at compile time
nick-wilson Dec 8, 2022
2fd652c
workaround MPI_REQUEST_NULL not available at compile time
nick-wilson Dec 8, 2022
6ea9364
workaround MPI_COMM_WORLD not available at compile time
nick-wilson Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions cmx/src-mpi-pr/cmx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5151,32 +5151,28 @@ STATIC void check_mpi_retval(int retval, const char *file, int line)
STATIC const char *str_mpi_retval(int retval)
{
const char *msg = NULL;

switch(retval) {
case MPI_SUCCESS : msg = "MPI_SUCCESS"; break;
case MPI_ERR_BUFFER : msg = "MPI_ERR_BUFFER"; break;
case MPI_ERR_COUNT : msg = "MPI_ERR_COUNT"; break;
case MPI_ERR_TYPE : msg = "MPI_ERR_TYPE"; break;
case MPI_ERR_TAG : msg = "MPI_ERR_TAG"; break;
case MPI_ERR_COMM : msg = "MPI_ERR_COMM"; break;
case MPI_ERR_RANK : msg = "MPI_ERR_RANK"; break;
case MPI_ERR_ROOT : msg = "MPI_ERR_ROOT"; break;
case MPI_ERR_GROUP : msg = "MPI_ERR_GROUP"; break;
case MPI_ERR_OP : msg = "MPI_ERR_OP"; break;
case MPI_ERR_TOPOLOGY : msg = "MPI_ERR_TOPOLOGY"; break;
case MPI_ERR_DIMS : msg = "MPI_ERR_DIMS"; break;
case MPI_ERR_ARG : msg = "MPI_ERR_ARG"; break;
case MPI_ERR_UNKNOWN : msg = "MPI_ERR_UNKNOWN"; break;
case MPI_ERR_TRUNCATE : msg = "MPI_ERR_TRUNCATE"; break;
case MPI_ERR_OTHER : msg = "MPI_ERR_OTHER"; break;
case MPI_ERR_INTERN : msg = "MPI_ERR_INTERN"; break;
case MPI_ERR_IN_STATUS : msg = "MPI_ERR_IN_STATUS"; break;
case MPI_ERR_PENDING : msg = "MPI_ERR_PENDING"; break;
case MPI_ERR_REQUEST : msg = "MPI_ERR_REQUEST"; break;
case MPI_ERR_LASTCODE : msg = "MPI_ERR_LASTCODE"; break;
default : msg = "DEFAULT"; break;
}

if (retval == MPI_SUCCESS ) { msg = "MPI_SUCCESS"; }
else if (retval == MPI_ERR_BUFFER ) { msg = "MPI_ERR_BUFFER"; }
else if (retval == MPI_ERR_COUNT ) { msg = "MPI_ERR_COUNT"; }
else if (retval == MPI_ERR_TYPE ) { msg = "MPI_ERR_TYPE"; }
else if (retval == MPI_ERR_TAG ) { msg = "MPI_ERR_TAG"; }
else if (retval == MPI_ERR_COMM ) { msg = "MPI_ERR_COMM"; }
else if (retval == MPI_ERR_RANK ) { msg = "MPI_ERR_RANK"; }
else if (retval == MPI_ERR_ROOT ) { msg = "MPI_ERR_ROOT"; }
else if (retval == MPI_ERR_GROUP ) { msg = "MPI_ERR_GROUP"; }
else if (retval == MPI_ERR_OP ) { msg = "MPI_ERR_OP"; }
else if (retval == MPI_ERR_TOPOLOGY ) { msg = "MPI_ERR_TOPOLOGY"; }
else if (retval == MPI_ERR_DIMS ) { msg = "MPI_ERR_DIMS"; }
else if (retval == MPI_ERR_ARG ) { msg = "MPI_ERR_ARG"; }
else if (retval == MPI_ERR_UNKNOWN ) { msg = "MPI_ERR_UNKNOWN"; }
else if (retval == MPI_ERR_TRUNCATE ) { msg = "MPI_ERR_TRUNCATE"; }
else if (retval == MPI_ERR_OTHER ) { msg = "MPI_ERR_OTHER"; }
else if (retval == MPI_ERR_INTERN ) { msg = "MPI_ERR_INTERN"; }
else if (retval == MPI_ERR_IN_STATUS) { msg = "MPI_ERR_IN_STATUS"; }
else if (retval == MPI_ERR_PENDING ) { msg = "MPI_ERR_PENDING"; }
else if (retval == MPI_ERR_REQUEST ) { msg = "MPI_ERR_REQUEST"; }
else if (retval == MPI_ERR_LASTCODE ) { msg = "MPI_ERR_LASTCODE"; }
else { msg = "DEFAULT"; }
return msg;
}

Expand Down
4 changes: 4 additions & 0 deletions comex/src-armci/message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,11 @@ void armci_msg_brdcst(void* buffer, int len, int root)


/* there was a case in ghost update where a proc sent a message to itself */
#ifdef MPI_REQUEST_NULL
static MPI_Request self_request = MPI_REQUEST_NULL;
#else
static MPI_Request self_request;
#endif
static int self_request_flag = 0;

void armci_msg_snd(int tag, void* buffer, int len, int to)
Expand Down
48 changes: 22 additions & 26 deletions comex/src-mpi-mt/comex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,32 +2546,28 @@ STATIC void check_mpi_retval(int retval, const char *file, int line)
STATIC const char *str_mpi_retval(int retval)
{
const char *msg = NULL;

switch(retval) {
case MPI_SUCCESS : msg = "MPI_SUCCESS"; break;
case MPI_ERR_BUFFER : msg = "MPI_ERR_BUFFER"; break;
case MPI_ERR_COUNT : msg = "MPI_ERR_COUNT"; break;
case MPI_ERR_TYPE : msg = "MPI_ERR_TYPE"; break;
case MPI_ERR_TAG : msg = "MPI_ERR_TAG"; break;
case MPI_ERR_COMM : msg = "MPI_ERR_COMM"; break;
case MPI_ERR_RANK : msg = "MPI_ERR_RANK"; break;
case MPI_ERR_ROOT : msg = "MPI_ERR_ROOT"; break;
case MPI_ERR_GROUP : msg = "MPI_ERR_GROUP"; break;
case MPI_ERR_OP : msg = "MPI_ERR_OP"; break;
case MPI_ERR_TOPOLOGY : msg = "MPI_ERR_TOPOLOGY"; break;
case MPI_ERR_DIMS : msg = "MPI_ERR_DIMS"; break;
case MPI_ERR_ARG : msg = "MPI_ERR_ARG"; break;
case MPI_ERR_UNKNOWN : msg = "MPI_ERR_UNKNOWN"; break;
case MPI_ERR_TRUNCATE : msg = "MPI_ERR_TRUNCATE"; break;
case MPI_ERR_OTHER : msg = "MPI_ERR_OTHER"; break;
case MPI_ERR_INTERN : msg = "MPI_ERR_INTERN"; break;
case MPI_ERR_IN_STATUS : msg = "MPI_ERR_IN_STATUS"; break;
case MPI_ERR_PENDING : msg = "MPI_ERR_PENDING"; break;
case MPI_ERR_REQUEST : msg = "MPI_ERR_REQUEST"; break;
case MPI_ERR_LASTCODE : msg = "MPI_ERR_LASTCODE"; break;
default : msg = "DEFAULT"; break;
}

if (retval == MPI_SUCCESS ) { msg = "MPI_SUCCESS"; }
else if (retval == MPI_ERR_BUFFER ) { msg = "MPI_ERR_BUFFER"; }
else if (retval == MPI_ERR_COUNT ) { msg = "MPI_ERR_COUNT"; }
else if (retval == MPI_ERR_TYPE ) { msg = "MPI_ERR_TYPE"; }
else if (retval == MPI_ERR_TAG ) { msg = "MPI_ERR_TAG"; }
else if (retval == MPI_ERR_COMM ) { msg = "MPI_ERR_COMM"; }
else if (retval == MPI_ERR_RANK ) { msg = "MPI_ERR_RANK"; }
else if (retval == MPI_ERR_ROOT ) { msg = "MPI_ERR_ROOT"; }
else if (retval == MPI_ERR_GROUP ) { msg = "MPI_ERR_GROUP"; }
else if (retval == MPI_ERR_OP ) { msg = "MPI_ERR_OP"; }
else if (retval == MPI_ERR_TOPOLOGY ) { msg = "MPI_ERR_TOPOLOGY"; }
else if (retval == MPI_ERR_DIMS ) { msg = "MPI_ERR_DIMS"; }
else if (retval == MPI_ERR_ARG ) { msg = "MPI_ERR_ARG"; }
else if (retval == MPI_ERR_UNKNOWN ) { msg = "MPI_ERR_UNKNOWN"; }
else if (retval == MPI_ERR_TRUNCATE ) { msg = "MPI_ERR_TRUNCATE"; }
else if (retval == MPI_ERR_OTHER ) { msg = "MPI_ERR_OTHER"; }
else if (retval == MPI_ERR_INTERN ) { msg = "MPI_ERR_INTERN"; }
else if (retval == MPI_ERR_IN_STATUS) { msg = "MPI_ERR_IN_STATUS"; }
else if (retval == MPI_ERR_PENDING ) { msg = "MPI_ERR_PENDING"; }
else if (retval == MPI_ERR_REQUEST ) { msg = "MPI_ERR_REQUEST"; }
else if (retval == MPI_ERR_LASTCODE ) { msg = "MPI_ERR_LASTCODE"; }
else { msg = "DEFAULT"; }
return msg;
}

Expand Down
48 changes: 22 additions & 26 deletions comex/src-mpi-pr/comex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4963,32 +4963,28 @@ STATIC void check_mpi_retval(int retval, const char *file, int line)
STATIC const char *str_mpi_retval(int retval)
{
const char *msg = NULL;

switch(retval) {
case MPI_SUCCESS : msg = "MPI_SUCCESS"; break;
case MPI_ERR_BUFFER : msg = "MPI_ERR_BUFFER"; break;
case MPI_ERR_COUNT : msg = "MPI_ERR_COUNT"; break;
case MPI_ERR_TYPE : msg = "MPI_ERR_TYPE"; break;
case MPI_ERR_TAG : msg = "MPI_ERR_TAG"; break;
case MPI_ERR_COMM : msg = "MPI_ERR_COMM"; break;
case MPI_ERR_RANK : msg = "MPI_ERR_RANK"; break;
case MPI_ERR_ROOT : msg = "MPI_ERR_ROOT"; break;
case MPI_ERR_GROUP : msg = "MPI_ERR_GROUP"; break;
case MPI_ERR_OP : msg = "MPI_ERR_OP"; break;
case MPI_ERR_TOPOLOGY : msg = "MPI_ERR_TOPOLOGY"; break;
case MPI_ERR_DIMS : msg = "MPI_ERR_DIMS"; break;
case MPI_ERR_ARG : msg = "MPI_ERR_ARG"; break;
case MPI_ERR_UNKNOWN : msg = "MPI_ERR_UNKNOWN"; break;
case MPI_ERR_TRUNCATE : msg = "MPI_ERR_TRUNCATE"; break;
case MPI_ERR_OTHER : msg = "MPI_ERR_OTHER"; break;
case MPI_ERR_INTERN : msg = "MPI_ERR_INTERN"; break;
case MPI_ERR_IN_STATUS : msg = "MPI_ERR_IN_STATUS"; break;
case MPI_ERR_PENDING : msg = "MPI_ERR_PENDING"; break;
case MPI_ERR_REQUEST : msg = "MPI_ERR_REQUEST"; break;
case MPI_ERR_LASTCODE : msg = "MPI_ERR_LASTCODE"; break;
default : msg = "DEFAULT"; break;
}

if (retval == MPI_SUCCESS ) { msg = "MPI_SUCCESS"; }
else if (retval == MPI_ERR_BUFFER ) { msg = "MPI_ERR_BUFFER"; }
else if (retval == MPI_ERR_COUNT ) { msg = "MPI_ERR_COUNT"; }
else if (retval == MPI_ERR_TYPE ) { msg = "MPI_ERR_TYPE"; }
else if (retval == MPI_ERR_TAG ) { msg = "MPI_ERR_TAG"; }
else if (retval == MPI_ERR_COMM ) { msg = "MPI_ERR_COMM"; }
else if (retval == MPI_ERR_RANK ) { msg = "MPI_ERR_RANK"; }
else if (retval == MPI_ERR_ROOT ) { msg = "MPI_ERR_ROOT"; }
else if (retval == MPI_ERR_GROUP ) { msg = "MPI_ERR_GROUP"; }
else if (retval == MPI_ERR_OP ) { msg = "MPI_ERR_OP"; }
else if (retval == MPI_ERR_TOPOLOGY ) { msg = "MPI_ERR_TOPOLOGY"; }
else if (retval == MPI_ERR_DIMS ) { msg = "MPI_ERR_DIMS"; }
else if (retval == MPI_ERR_ARG ) { msg = "MPI_ERR_ARG"; }
else if (retval == MPI_ERR_UNKNOWN ) { msg = "MPI_ERR_UNKNOWN"; }
else if (retval == MPI_ERR_TRUNCATE ) { msg = "MPI_ERR_TRUNCATE"; }
else if (retval == MPI_ERR_OTHER ) { msg = "MPI_ERR_OTHER"; }
else if (retval == MPI_ERR_INTERN ) { msg = "MPI_ERR_INTERN"; }
else if (retval == MPI_ERR_IN_STATUS) { msg = "MPI_ERR_IN_STATUS"; }
else if (retval == MPI_ERR_PENDING ) { msg = "MPI_ERR_PENDING"; }
else if (retval == MPI_ERR_REQUEST ) { msg = "MPI_ERR_REQUEST"; }
else if (retval == MPI_ERR_LASTCODE ) { msg = "MPI_ERR_LASTCODE"; }
else { msg = "DEFAULT"; }
return msg;
}

Expand Down
4 changes: 4 additions & 0 deletions comex/src-mpi-pr/groups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@


/* world group state */
#ifdef MPI_COMM_NULL
comex_group_world_t g_state = {
MPI_COMM_NULL,
MPI_GROUP_NULL,
Expand All @@ -37,6 +38,9 @@ comex_group_world_t g_state = {
-1,
-1
};
#else
comex_group_world_t g_state = {0};
#endif
/* the HEAD of the group linked list */
comex_igroup_t *group_list = NULL;

Expand Down
48 changes: 22 additions & 26 deletions comex/src-mpi-pt/comex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3620,32 +3620,28 @@ STATIC void check_mpi_retval(int retval, const char *file, int line)
STATIC const char *str_mpi_retval(int retval)
{
const char *msg = NULL;

switch(retval) {
case MPI_SUCCESS : msg = "MPI_SUCCESS"; break;
case MPI_ERR_BUFFER : msg = "MPI_ERR_BUFFER"; break;
case MPI_ERR_COUNT : msg = "MPI_ERR_COUNT"; break;
case MPI_ERR_TYPE : msg = "MPI_ERR_TYPE"; break;
case MPI_ERR_TAG : msg = "MPI_ERR_TAG"; break;
case MPI_ERR_COMM : msg = "MPI_ERR_COMM"; break;
case MPI_ERR_RANK : msg = "MPI_ERR_RANK"; break;
case MPI_ERR_ROOT : msg = "MPI_ERR_ROOT"; break;
case MPI_ERR_GROUP : msg = "MPI_ERR_GROUP"; break;
case MPI_ERR_OP : msg = "MPI_ERR_OP"; break;
case MPI_ERR_TOPOLOGY : msg = "MPI_ERR_TOPOLOGY"; break;
case MPI_ERR_DIMS : msg = "MPI_ERR_DIMS"; break;
case MPI_ERR_ARG : msg = "MPI_ERR_ARG"; break;
case MPI_ERR_UNKNOWN : msg = "MPI_ERR_UNKNOWN"; break;
case MPI_ERR_TRUNCATE : msg = "MPI_ERR_TRUNCATE"; break;
case MPI_ERR_OTHER : msg = "MPI_ERR_OTHER"; break;
case MPI_ERR_INTERN : msg = "MPI_ERR_INTERN"; break;
case MPI_ERR_IN_STATUS : msg = "MPI_ERR_IN_STATUS"; break;
case MPI_ERR_PENDING : msg = "MPI_ERR_PENDING"; break;
case MPI_ERR_REQUEST : msg = "MPI_ERR_REQUEST"; break;
case MPI_ERR_LASTCODE : msg = "MPI_ERR_LASTCODE"; break;
default : msg = "DEFAULT"; break;
}

if (retval == MPI_SUCCESS ) { msg = "MPI_SUCCESS"; }
else if (retval == MPI_ERR_BUFFER ) { msg = "MPI_ERR_BUFFER"; }
else if (retval == MPI_ERR_COUNT ) { msg = "MPI_ERR_COUNT"; }
else if (retval == MPI_ERR_TYPE ) { msg = "MPI_ERR_TYPE"; }
else if (retval == MPI_ERR_TAG ) { msg = "MPI_ERR_TAG"; }
else if (retval == MPI_ERR_COMM ) { msg = "MPI_ERR_COMM"; }
else if (retval == MPI_ERR_RANK ) { msg = "MPI_ERR_RANK"; }
else if (retval == MPI_ERR_ROOT ) { msg = "MPI_ERR_ROOT"; }
else if (retval == MPI_ERR_GROUP ) { msg = "MPI_ERR_GROUP"; }
else if (retval == MPI_ERR_OP ) { msg = "MPI_ERR_OP"; }
else if (retval == MPI_ERR_TOPOLOGY ) { msg = "MPI_ERR_TOPOLOGY"; }
else if (retval == MPI_ERR_DIMS ) { msg = "MPI_ERR_DIMS"; }
else if (retval == MPI_ERR_ARG ) { msg = "MPI_ERR_ARG"; }
else if (retval == MPI_ERR_UNKNOWN ) { msg = "MPI_ERR_UNKNOWN"; }
else if (retval == MPI_ERR_TRUNCATE ) { msg = "MPI_ERR_TRUNCATE"; }
else if (retval == MPI_ERR_OTHER ) { msg = "MPI_ERR_OTHER"; }
else if (retval == MPI_ERR_INTERN ) { msg = "MPI_ERR_INTERN"; }
else if (retval == MPI_ERR_IN_STATUS) { msg = "MPI_ERR_IN_STATUS"; }
else if (retval == MPI_ERR_PENDING ) { msg = "MPI_ERR_PENDING"; }
else if (retval == MPI_ERR_REQUEST ) { msg = "MPI_ERR_REQUEST"; }
else if (retval == MPI_ERR_LASTCODE ) { msg = "MPI_ERR_LASTCODE"; }
else { msg = "DEFAULT"; }
return msg;
}

Expand Down
48 changes: 22 additions & 26 deletions comex/src-portals4/comex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,32 +1434,28 @@ static inline void check_mpi_retval(int retval, const char *file, int line)
static inline const char *str_mpi_retval(int retval)
{
const char *msg = NULL;

switch(retval) {
case MPI_SUCCESS : msg = "MPI_SUCCESS"; break;
case MPI_ERR_BUFFER : msg = "MPI_ERR_BUFFER"; break;
case MPI_ERR_COUNT : msg = "MPI_ERR_COUNT"; break;
case MPI_ERR_TYPE : msg = "MPI_ERR_TYPE"; break;
case MPI_ERR_TAG : msg = "MPI_ERR_TAG"; break;
case MPI_ERR_COMM : msg = "MPI_ERR_COMM"; break;
case MPI_ERR_RANK : msg = "MPI_ERR_RANK"; break;
case MPI_ERR_ROOT : msg = "MPI_ERR_ROOT"; break;
case MPI_ERR_GROUP : msg = "MPI_ERR_GROUP"; break;
case MPI_ERR_OP : msg = "MPI_ERR_OP"; break;
case MPI_ERR_TOPOLOGY : msg = "MPI_ERR_TOPOLOGY"; break;
case MPI_ERR_DIMS : msg = "MPI_ERR_DIMS"; break;
case MPI_ERR_ARG : msg = "MPI_ERR_ARG"; break;
case MPI_ERR_UNKNOWN : msg = "MPI_ERR_UNKNOWN"; break;
case MPI_ERR_TRUNCATE : msg = "MPI_ERR_TRUNCATE"; break;
case MPI_ERR_OTHER : msg = "MPI_ERR_OTHER"; break;
case MPI_ERR_INTERN : msg = "MPI_ERR_INTERN"; break;
case MPI_ERR_IN_STATUS : msg = "MPI_ERR_IN_STATUS"; break;
case MPI_ERR_PENDING : msg = "MPI_ERR_PENDING"; break;
case MPI_ERR_REQUEST : msg = "MPI_ERR_REQUEST"; break;
case MPI_ERR_LASTCODE : msg = "MPI_ERR_LASTCODE"; break;
default : msg = "DEFAULT"; break;
}

if (retval == MPI_SUCCESS ) { msg = "MPI_SUCCESS"; }
else if (retval == MPI_ERR_BUFFER ) { msg = "MPI_ERR_BUFFER"; }
else if (retval == MPI_ERR_COUNT ) { msg = "MPI_ERR_COUNT"; }
else if (retval == MPI_ERR_TYPE ) { msg = "MPI_ERR_TYPE"; }
else if (retval == MPI_ERR_TAG ) { msg = "MPI_ERR_TAG"; }
else if (retval == MPI_ERR_COMM ) { msg = "MPI_ERR_COMM"; }
else if (retval == MPI_ERR_RANK ) { msg = "MPI_ERR_RANK"; }
else if (retval == MPI_ERR_ROOT ) { msg = "MPI_ERR_ROOT"; }
else if (retval == MPI_ERR_GROUP ) { msg = "MPI_ERR_GROUP"; }
else if (retval == MPI_ERR_OP ) { msg = "MPI_ERR_OP"; }
else if (retval == MPI_ERR_TOPOLOGY ) { msg = "MPI_ERR_TOPOLOGY"; }
else if (retval == MPI_ERR_DIMS ) { msg = "MPI_ERR_DIMS"; }
else if (retval == MPI_ERR_ARG ) { msg = "MPI_ERR_ARG"; }
else if (retval == MPI_ERR_UNKNOWN ) { msg = "MPI_ERR_UNKNOWN"; }
else if (retval == MPI_ERR_TRUNCATE ) { msg = "MPI_ERR_TRUNCATE"; }
else if (retval == MPI_ERR_OTHER ) { msg = "MPI_ERR_OTHER"; }
else if (retval == MPI_ERR_INTERN ) { msg = "MPI_ERR_INTERN"; }
else if (retval == MPI_ERR_IN_STATUS) { msg = "MPI_ERR_IN_STATUS"; }
else if (retval == MPI_ERR_PENDING ) { msg = "MPI_ERR_PENDING"; }
else if (retval == MPI_ERR_REQUEST ) { msg = "MPI_ERR_REQUEST"; }
else if (retval == MPI_ERR_LASTCODE ) { msg = "MPI_ERR_LASTCODE"; }
else { msg = "DEFAULT"; }
return msg;
}

Expand Down
4 changes: 4 additions & 0 deletions global/src/ga.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,10 @@ extern void NGA_Strided_get64(int g_a, int64_t lo[], int64_t hi[], int6
extern void NGA_Strided_put64(int g_a, int64_t lo[], int64_t hi[], int64_t skip[], void* buf, int64_t ld[]);
extern DoubleComplex NGA_Zdot_patch64(int g_a, char t_a, int64_t alo[], int64_t ahi[], int g_b, char t_b, int64_t blo[], int64_t bhi[]);
extern void NGA_Zero_patch64(int g_a, int64_t lo[], int64_t hi[]);
extern int NGA_Sprs_array_create64(int64_t idim, int64_t jdim, int type);
extern void NGA_Sprs_array_add_element64(int s_a, int64_t idx, int64_t jdx, void *val);
extern void NGA_Sprs_array_row_distribution64(int s_a, int iproc, int64_t *lo, int64_t *hi);
extern void NGA_Sprs_array_column_distribution64(int s_a, int iproc, int64_t *lo, int64_t *hi);

#ifdef __cplusplus
}
Expand Down
4 changes: 0 additions & 4 deletions global/src/global.fh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
parameter (ga_max_dim = GA_MAX_DIM)
!
logical ga_allocate
logical ga_deallocate
complex ga_cdot
complex ga_cdot_patch
integer ga_cluster_nnodes
Expand Down Expand Up @@ -72,7 +71,6 @@
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
Expand Down Expand Up @@ -156,7 +154,6 @@
double complex nga_zdot_patch
!
external ga_allocate
external ga_deallocate
external ga_cdot
external ga_cdot_patch
external ga_cluster_nnodes
Expand Down Expand Up @@ -225,7 +222,6 @@
external ga_zdot
external ga_zdot_patch
external nga_allocate
external nga_deallocate
external nga_cdot
external nga_cdot_patch
external nga_cluster_nnodes
Expand Down
7 changes: 7 additions & 0 deletions tcgmsg/tcgmsg-mpi/misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ extern void exit(int status);
#include "armci.h"

char tcgmsg_err_string[ERR_STR_LEN];
#ifdef MPI_COMM_WORLD
MPI_Comm TCGMSG_Comm=MPI_COMM_WORLD;
#else
MPI_Comm TCGMSG_Comm;
#endif
int _tcg_initialized=0;
long DEBUG_;
int SR_parallel;
Expand Down Expand Up @@ -142,6 +146,9 @@ void tcgi_alt_pbegin(int *argc, char **argv[])
#else
MPI_Init(argc, argv);
#endif
#ifndef MPI_COMM_WORLD
TCGMSG_Comm=MPI_COMM_WORLD;
#endif
#if defined(MPI_VERSION) && (MPI_VERSION >= 2)
MPI_Comm_set_errhandler(TCGMSG_Comm, MPI_ERRORS_RETURN);
#else
Expand Down