Realised I don't need to remap the status anymore! And a final (probably) tidy up

lib/Wrapper.cpp

@@ -8,22 +8,14 @@
 #include "Timing.h"
 
 int MPI_Init(int *argc, char*** argv) {
-  int err = 0;
-
-  err |= PMPI_Init(argc, argv);
-
+  int err = PMPI_Init(argc, argv);
   initialiseTMPI();
-
   return err;
 }
 
 int MPI_Init_thread( int *argc, char ***argv, int required, int *provided ) {
-  int err = 0;
-
-  err |= PMPI_Init_thread(argc, argv, required, provided);
-
+  int err = PMPI_Init_thread(argc, argv, required, provided);
   initialiseTMPI();
-
   return err;
 }
 
@@ -35,220 +27,101 @@ int MPI_Is_thread_main(int* flag) {
 
 int MPI_Comm_rank(MPI_Comm comm, int *rank) {
   assert(comm == MPI_COMM_WORLD);
-
   *rank = getTeamRank();
-//  logInfo("Returning rank " << *rank);
-
   return MPI_SUCCESS;
 }
 
 int MPI_Comm_size(MPI_Comm comm, int *size) {
   assert(comm == MPI_COMM_WORLD);
-
   *size = getTeamSize();
-//  logInfo("Returning size " << *size);
-
   return MPI_SUCCESS;
 }
 
 int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest,
               int tag, MPI_Comm comm) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-
-  err |= PMPI_Send(buf, count, datatype, dest, tag, getTeamComm());
-
-  logInfo(
-      "Send to rank " <<
-      dest <<
-      "/" <<
-      mapTeamToWorldRank(dest) <<
-      " with tag " <<
-      tag);
-
+  int err = PMPI_Send(buf, count, datatype, dest, tag, getTeamComm());
+  logInfo("Send to rank " << dest << "/" << mapTeamToWorldRank(dest) << " with tag " << tag);
   return err;
 }
 
 int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
               MPI_Comm comm, MPI_Status *status) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-
-  err |= PMPI_Recv(buf, count, datatype, source, tag, getTeamComm(), status);
-
-  remapStatus(status);
-
-  logInfo(
-      "Receive from rank " <<
-      source <<
-      "/" <<
-      mapTeamToWorldRank(source) <<
-      " with tag " <<
-      tag);
-
+  int err = PMPI_Recv(buf, count, datatype, source, tag, getTeamComm(), status);
+  logInfo("Receive from rank " << source << "/" << mapTeamToWorldRank(source) << " with tag " << tag);
   return err;
 }
 
 int MPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dest,
                int tag, MPI_Comm comm, MPI_Request *request) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-
-  err |= PMPI_Isend(buf, count, datatype, dest, tag, getTeamComm(), request);
-
-  logInfo(
-      "Isend to rank " <<
-      dest <<
-      "/" <<
-      mapTeamToWorldRank(dest) <<
-      " with tag " <<
-      tag);
-
+  int err = PMPI_Isend(buf, count, datatype, dest, tag, getTeamComm(), request);
+  logInfo("Isend to rank " << dest << "/" << mapTeamToWorldRank(dest) << " with tag " << tag);
   return err;
 }
 
 int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
                MPI_Comm comm, MPI_Request *request) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-
-  err |= PMPI_Irecv(buf, count, datatype, source, tag, getTeamComm(), request);
-
-  logInfo(
-      "Receive from rank " <<
-      source <<
-      "/" <<
-      mapTeamToWorldRank(source) <<
-      " with tag " <<
-      tag);
-
+  int err = PMPI_Irecv(buf, count, datatype, source, tag, getTeamComm(), request);
+  logInfo("Receive from rank " << source << "/" << mapTeamToWorldRank(source) << " with tag " << tag);
   return err;
 }
 
 int MPI_Wait(MPI_Request *request, MPI_Status *status) {
-  int err = 0;
   logInfo("Wait initialised");
-
-  err |= PMPI_Wait(request, status);
-
-  remapStatus(status);
-  logInfo("Wait completed "
-      << ")");
-
+  int err = PMPI_Wait(request, status);
+  logInfo("Wait completed");
   return err;
 }
 
 int MPI_Waitall(int count, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]) {
-  int err = 0;
-
   logInfo("Waitall initialised with " << count << " requests");
-
-  err |= PMPI_Waitall(count, array_of_requests, array_of_statuses);
-
-  if (array_of_statuses != MPI_STATUSES_IGNORE) {
-    for (int i = 0; i < count; i++) {
-      remapStatus(&array_of_statuses[i]);
-    }
-  }
-
+  int err = PMPI_Waitall(count, array_of_requests, array_of_statuses);
   logInfo("Waitall completed with " << count << " requests");
-
   return err;
 }
 
 int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) {
-  int err = 0;
-
-  err |= PMPI_Test(request, flag, status);
-
-  if (*flag) {
-    remapStatus(status);
-  }
-
-  logInfo("Test completed ("
-      << "FLAG=" << *flag
-      << ",STATUS_SOURCE=" << status->MPI_SOURCE
-      << ",STATUS_TAG=" << status->MPI_TAG
-      << ")");
+  int err = PMPI_Test(request, flag, status);
+  logInfo("Test completed (FLAG=" << *flag << ",STATUS_SOURCE=" << status->MPI_SOURCE << ",STATUS_TAG=" << status->MPI_TAG << ")");
   return err;
 }
 
 int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) {
   assert(comm == MPI_COMM_WORLD);
-  int err = 0;
-
-  logInfo(
-      "Probe initialised (SOURCE="
-      << source
-      << ",TAG="
-      << tag
-      << ")");
-
-  err |= PMPI_Probe(source, tag, getTeamComm(), status);
-  remapStatus(status);
-  logInfo(
-      "Probe finished ("
-      << "SOURCE=" << mapTeamToWorldRank(source)
-      << ",TAG=" << tag
-      << ",STATUS_SOURCE=" << status->MPI_SOURCE
-      << ",STATUS_TAG=" << status->MPI_TAG
-      << ")");
-
+  logInfo("Probe initialised (SOURCE=" << source << ",TAG=" << tag << ")");
+  int err = PMPI_Probe(source, tag, getTeamComm(), status);
+  logInfo("Probe finished (SOURCE=" << mapTeamToWorldRank(source) << ",TAG=" << tag << ",STATUS_SOURCE=" << status->MPI_SOURCE << ",STATUS_TAG=" << status->MPI_TAG << ")");
   return err;
-
 }
 
 int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag,
                 MPI_Status *status) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-
-  err |= PMPI_Iprobe(source, tag, getTeamComm(), flag, status);
-  remapStatus(status);
-  logInfo(
-      "Iprobe finished ("
-      << "FLAG=" << *flag
-      << ",SOURCE=" << mapTeamToWorldRank(source)
-      << ",TAG=" << tag
-      << ",STATUS_SOURCE=" << status->MPI_SOURCE
-      << ",STATUS_TAG=" << status->MPI_TAG
-      << ")");
-
+  int err = PMPI_Iprobe(source, tag, getTeamComm(), flag, status);
+  logInfo("Iprobe finished (FLAG=" << *flag << ",SOURCE=" << mapTeamToWorldRank(source) << ",TAG=" << tag << ",STATUS_SOURCE=" << status->MPI_SOURCE << ",STATUS_TAG=" << status->MPI_TAG << ")");
   return err;
 }
 
 int MPI_Barrier(MPI_Comm comm) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-
-  err |= synchroniseRanksInTeam();
-
+  int err = synchroniseRanksInTeam();
   return err;
 }
 
 int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root,
                MPI_Comm comm ) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-  err |= PMPI_Bcast(buffer, count, datatype, root, getTeamComm());
-
+  int err = PMPI_Bcast(buffer, count, datatype, root, getTeamComm());
   return err;
 }
 
 int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count,
                   MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-  err |= PMPI_Allreduce(sendbuf, recvbuf, count, datatype, op, getTeamComm());
-
+  int err = PMPI_Allreduce(sendbuf, recvbuf, count, datatype, op, getTeamComm());
   return err;
 }
 
@@ -256,10 +129,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
                  void *recvbuf, int recvcount, MPI_Datatype recvtype,
                  MPI_Comm comm) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-  err |= PMPI_Alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, getTeamComm());
-
+  int err = PMPI_Alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, getTeamComm());
   return err;
 }
 
@@ -268,17 +138,13 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts,
                   const int *recvcounts, const int *rdispls, MPI_Datatype recvtype,
                   MPI_Comm comm) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-  err |= PMPI_Alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, getTeamComm());
-
+  int err = PMPI_Alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, getTeamComm());
   return err;
 }
 
 double MPI_Wtime() {
-  const double t = PMPI_Wtime();
   // If you mark on the timeline here expect negative time values (you've been warned)
-  return t;
+  return PMPI_Wtime();
 }
 
 int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
@@ -295,30 +161,22 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
   } else {
     assert(comm == MPI_COMM_WORLD);
     MPI_Sendrecv(sendbuf, sendcount, sendtype,dest,sendtag,recvbuf,recvcount,recvtype,source,recvtag, getTeamComm(),status);
-    remapStatus(status);
   }
   return MPI_SUCCESS;
 }
 
 int MPI_Finalize() {
   logInfo("Finalize");
-
   Timing::finaliseTiming();
-
   // Wait for all replicas before finalising
   PMPI_Barrier(MPI_COMM_WORLD);
-
   freeTeamComm();
   Timing::outputTiming();
-
   return PMPI_Finalize();
 }
 
 int MPI_Abort(MPI_Comm comm, int errorcode) {
   assert(comm == MPI_COMM_WORLD);
-
-  int err = 0;
-  err |= PMPI_Abort(getTeamComm(), errorcode);
-
+  int err = PMPI_Abort(getTeamComm(), errorcode);
   return err;
 }