Skip to content

SET_LOWERHALF_FS_CONTEXT and RESTORE; workaround #1

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
jungan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SET_LOWERHALF_FS_CONTEXT and RESTORE; workaround #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions contrib/mpi-proxy-split/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ unit-test/*.exe
proxy
mpi-wrappers/*.c*
mpi-wrappers/*.so*
Makefile_config
lower-half/lh_proxy
test/ckpt_rank_0/
24 changes: 12 additions & 12 deletions contrib/mpi-proxy-split/mpi-wrappers/mpi_cart_wrappers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ USER_DEFINED_WRAPPER(int, Cart_coords, (MPI_Comm) comm, (int) rank,
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Cart_coords)(realComm, rank, maxdims, coords);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
}
Expand All @@ -57,8 +57,8 @@ USER_DEFINED_WRAPPER(int, Cart_create, (MPI_Comm) old_comm, (int) ndims,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Cart_create)(realComm, ndims, dims,
periods, reorder, comm_cart);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
MPI_Comm virtComm = ADD_NEW_COMM(*comm_cart);
VirtualGlobalCommId::instance().createGlobalId(virtComm);
*comm_cart = virtComm;
Expand All @@ -80,7 +80,7 @@ USER_DEFINED_WRAPPER(int, Cart_get, (MPI_Comm) comm, (int) maxdims,
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Cart_get)(realComm, maxdims, dims, periods, coords);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
}
Expand All @@ -94,8 +94,8 @@ USER_DEFINED_WRAPPER(int, Cart_map, (MPI_Comm) comm, (int) ndims,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
// FIXME: Need to virtualize this newrank??
retval = NEXT_FUNC(Cart_map)(realComm, ndims, dims, periods, newrank);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
FncArg ds = CREATE_LOG_BUF(dims, ndims * sizeof(int));
FncArg ps = CREATE_LOG_BUF(periods, ndims * sizeof(int));
LOG_CALL(restoreCarts, Cart_map, comm, ndims, ds, ps, newrank);
Expand All @@ -112,7 +112,7 @@ USER_DEFINED_WRAPPER(int, Cart_rank, (MPI_Comm) comm,
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Cart_rank)(realComm, coords, rank);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
}
Expand All @@ -126,8 +126,8 @@ USER_DEFINED_WRAPPER(int, Cart_shift, (MPI_Comm) comm, (int) direction,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Cart_shift)(realComm, direction,
disp, rank_source, rank_dest);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
LOG_CALL(restoreCarts, Cart_shift, comm, direction,
disp, rank_source, rank_dest);
}
Expand All @@ -144,8 +144,8 @@ USER_DEFINED_WRAPPER(int, Cart_sub, (MPI_Comm) comm,
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Cart_sub)(realComm, remain_dims, new_comm);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
int ndims = 0;
MPI_Cartdim_get(comm, &ndims);
MPI_Comm virtComm = ADD_NEW_COMM(*new_comm);
Expand All @@ -166,7 +166,7 @@ USER_DEFINED_WRAPPER(int, Cartdim_get, (MPI_Comm) comm, (int *) ndims)
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Cartdim_get)(realComm, ndims);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
}
Expand Down
50 changes: 25 additions & 25 deletions contrib/mpi-proxy-split/mpi-wrappers/mpi_collective_wrappers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ USER_DEFINED_WRAPPER(int, Bcast,
MPI_Datatype realType = VIRTUAL_TO_REAL_TYPE(datatype);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Bcast)(buffer, count, realType, root, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -102,8 +102,8 @@ USER_DEFINED_WRAPPER(int, Ibcast,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Ibcast)(buffer, count, realType,
root, realComm, request);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
MPI_Request virtRequest = ADD_NEW_REQUEST(*request);
*request = virtRequest;
LOG_CALL(restoreRequests, Ibcast, buffer, count, datatype,
Expand All @@ -125,7 +125,7 @@ USER_DEFINED_WRAPPER(int, Barrier, (MPI_Comm) comm)
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Barrier)(realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -142,7 +142,7 @@ USER_DEFINED_WRAPPER(int, Barrier, (MPI_Comm) comm)
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Barrier)(realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();

dmtcp_mpi::TwoPhaseAlgo::instance().commit_finish();
Expand All @@ -158,8 +158,8 @@ USER_DEFINED_WRAPPER(int, Ibarrier, (MPI_Comm) comm, (MPI_Request *) request)
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Ibarrier)(realComm, request);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
MPI_Request virtRequest = ADD_NEW_REQUEST(*request);
*request = virtRequest;
LOG_CALL(restoreRequests, Ibarrier, comm, *request);
Expand Down Expand Up @@ -191,7 +191,7 @@ USER_DEFINED_WRAPPER(int, Allreduce,
retval = NEXT_FUNC(Allreduce)(sendbuf, recvbuf, count,
realType, realOp, realComm);
}
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -212,7 +212,7 @@ USER_DEFINED_WRAPPER(int, Reduce,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Reduce)(sendbuf, recvbuf, count,
realType, realOp, root, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -232,8 +232,8 @@ USER_DEFINED_WRAPPER(int, Ireduce,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Ireduce)(sendbuf, recvbuf, count,
realType, realOp, root, realComm, request);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
MPI_Request virtRequest = ADD_NEW_REQUEST(*request);
*request = virtRequest;
LOG_CALL(restoreRequests, Ireduce, sendbuf, recvbuf,
Expand All @@ -260,7 +260,7 @@ USER_DEFINED_WRAPPER(int, Reduce_scatter,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Reduce_scatter)(sendbuf, recvbuf, recvcounts,
realType, realOp, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -280,7 +280,7 @@ MPI_Alltoall_internal(const void *sendbuf, int sendcount,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Alltoall)(sendbuf, sendcount, realSendType, recvbuf,
recvcount, realRecvType, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
}
Expand Down Expand Up @@ -314,7 +314,7 @@ USER_DEFINED_WRAPPER(int, Alltoallv,
retval = NEXT_FUNC(Alltoallv)(sendbuf, sendcounts, sdispls, realSendType,
recvbuf, recvcounts, rdispls, realRecvType,
realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -335,7 +335,7 @@ USER_DEFINED_WRAPPER(int, Gather, (const void *) sendbuf, (int) sendcount,
retval = NEXT_FUNC(Gather)(sendbuf, sendcount, realSendType,
recvbuf, recvcount, realRecvType,
root, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -357,7 +357,7 @@ USER_DEFINED_WRAPPER(int, Gatherv, (const void *) sendbuf, (int) sendcount,
retval = NEXT_FUNC(Gatherv)(sendbuf, sendcount, realSendType,
recvbuf, recvcounts, displs, realRecvType,
root, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -378,7 +378,7 @@ USER_DEFINED_WRAPPER(int, Scatter, (const void *) sendbuf, (int) sendcount,
retval = NEXT_FUNC(Scatter)(sendbuf, sendcount, realSendType,
recvbuf, recvcount, realRecvType,
root, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -400,7 +400,7 @@ USER_DEFINED_WRAPPER(int, Scatterv, (const void *) sendbuf,
retval = NEXT_FUNC(Scatterv)(sendbuf, sendcounts, displs, realSendType,
recvbuf, recvcount, realRecvType,
root, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -421,7 +421,7 @@ USER_DEFINED_WRAPPER(int, Allgather, (const void *) sendbuf, (int) sendcount,
retval = NEXT_FUNC(Allgather)(sendbuf, sendcount, realSendType,
recvbuf, recvcount, realRecvType,
realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -443,7 +443,7 @@ USER_DEFINED_WRAPPER(int, Allgatherv, (const void *) sendbuf, (int) sendcount,
retval = NEXT_FUNC(Allgatherv)(sendbuf, sendcount, realSendType,
recvbuf, recvcounts, displs, realRecvType,
realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -463,7 +463,7 @@ USER_DEFINED_WRAPPER(int, Scan, (const void *) sendbuf, (void *) recvbuf,
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Scan)(sendbuf, recvbuf, count,
realType, realOp, realComm);
RETURN_TO_UPPER_HALF();
RETURN_TO_UPPER_HALF(__func__);
DMTCP_PLUGIN_ENABLE_CKPT();
return retval;
};
Expand All @@ -480,8 +480,8 @@ USER_DEFINED_WRAPPER(int, Comm_split, (MPI_Comm) comm, (int) color, (int) key,
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Comm_split)(realComm, color, key, newcomm);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
MPI_Comm virtComm = ADD_NEW_COMM(*newcomm);
VirtualGlobalCommId::instance().createGlobalId(virtComm);
*newcomm = virtComm;
Expand All @@ -502,8 +502,8 @@ USER_DEFINED_WRAPPER(int, Comm_dup, (MPI_Comm) comm, (MPI_Comm *) newcomm)
MPI_Comm realComm = VIRTUAL_TO_REAL_COMM(comm);
JUMP_TO_LOWER_HALF(lh_info.fsaddr);
retval = NEXT_FUNC(Comm_dup)(realComm, newcomm);
RETURN_TO_UPPER_HALF();
if (retval == MPI_SUCCESS && LOGGING()) {
RETURN_TO_UPPER_HALF(__func__);
if (retval == MPI_SUCCESS && LOGGING_MPI()) {
MPI_Comm virtComm = ADD_NEW_COMM(*newcomm);
VirtualGlobalCommId::instance().createGlobalId(virtComm);
*newcomm = virtComm;
Expand Down
Loading