Changeset 24768


Ignore:
Timestamp:
05/01/20 15:30:19 (5 years ago)
Author:
jdquinn
Message:

CHG: Adjusting interface to correspond with changes to MeDiPack

Location:
issm/trunk-jpl/src/c/toolkits/mpi
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp

    r24767 r24768  
    11/* \file issmmpi.cpp
    2  * \brief: implementation of all the mpi wrappers that ISSM requires. The goal is to control 
     2 * \brief: implementation of all the mpi wrappers that ISSM requires. The goal is to control
    33 * which MPI layer we are using at compile time: the standard mpi, the autodiff mpi or no mpi at all.
    44 */
    … …  
    1414
    1515#include "./issmmpi.h"
     16MpiTypes* mpiTypes;
    1617#include "../../shared/Numerics/types.h"
    1718
    … …  
    2021size_t sizeHelper(ISSM_MPI_Datatype type) { /*{{{*/
    2122
    22   switch(type) { 
    23   case ISSM_MPI_CHAR: 
     23  switch(type) {
     24  case ISSM_MPI_CHAR:
    2425    return sizeof(char);
    2526    break;
    26   case ISSM_MPI_DOUBLE: 
     27  case ISSM_MPI_DOUBLE:
    2728    return sizeof(double);
    2829    break;
    29   case ISSM_MPI_INT: 
     30  case ISSM_MPI_INT:
    3031    return sizeof(int);
    3132    break;
    32   default: 
     33  default:
    3334    assert(0);
    3435    break;
    … …  
    6162#else
    6263# ifdef _HAVE_AD_
    63   if (sendtype==ISSM_MPI_DOUBLE) { 
     64  if (sendtype==ISSM_MPI_DOUBLE) {
    6465    IssmDouble* activeSendBuf=(IssmDouble*)sendbuf;
    6566    IssmDouble* activeRecvBuf=(IssmDouble*)recvbuf;
    6667    for(int i=0;i<sendcount;++i) activeRecvBuf[i]=activeSendBuf[i];
    6768  }
    68   else 
     69  else
    6970# endif
    7071    memcpy(recvbuf,sendbuf,sizeHelper(sendtype)*sendcount);
    … …  
    9697# endif
    9798#else
    98   assert(sendcount==recvcounts[0]); // we handle only identical representations 
     99  assert(sendcount==recvcounts[0]); // we handle only identical representations
    99100# ifdef _HAVE_AD_
    100   if (sendtype==ISSM_MPI_DOUBLE) { 
     101  if (sendtype==ISSM_MPI_DOUBLE) {
    101102    IssmDouble* activeSendBuf=(IssmDouble*)sendbuf;
    102103    IssmDouble* activeRecvBuf=(IssmDouble*)(recvbuf)+displs[0];
    103104    for(int i=0;i<sendcount;++i) activeRecvBuf[i]=activeSendBuf[i];
    104105  }
    105   else 
     106  else
    106107# endif
    107108    memcpy((char*)recvbuf+(sizeHelper(recvtype)*displs[0]),sendbuf,sizeHelper(sendtype)*sendcount);
    … …  
    130131#else
    131132#ifdef _HAVE_AD_
    132   if (datatype==ISSM_MPI_DOUBLE) { 
     133  if (datatype==ISSM_MPI_DOUBLE) {
    133134    IssmDouble* activeSendBuf=(IssmDouble*)sendbuf;
    134135    IssmDouble* activeRecvBuf=(IssmDouble*)recvbuf;
    135136    for(int i=0;i<count;++i) activeRecvBuf[i]=activeSendBuf[i];
    136137  }
    137   else 
     138  else
    138139# endif
    139140    memcpy(recvbuf,sendbuf,sizeHelper(datatype)*count);
    … …  
    147148#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
    148149  rc=AMPI_Barrier(comm);
    149 # else 
     150# else
    150151  rc=MPI_Barrier(comm);
    151152# endif
    … …  
    160161#ifdef _HAVE_MPI_
    161162#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
    162   rc=AMPI_Bcast(buffer, 
     163  rc=AMPI_Bcast(buffer,
    163164                count,
    164165                datatype,
    … …  
    166167                comm);
    167168# else
    168   rc=MPI_Bcast(buffer, 
     169  rc=MPI_Bcast(buffer,
    169170               count,
    170171               datatype,
    … …  
    172173               comm);
    173174# endif
    174 #else 
    175 // nothing to be done here 
     175#else
     176// nothing to be done here
    176177#endif
    177178  return rc;
    … …  
    183184#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
    184185  assert(0); // to be implemented
    185 # else 
     186# else
    186187  rc=MPI_Comm_free(comm);
    187188# endif
    … …  
    261262#else
    262263# ifdef _HAVE_AD_
    263   if (sendtype==ISSM_MPI_DOUBLE) { 
     264  if (sendtype==ISSM_MPI_DOUBLE) {
    264265    IssmDouble* activeSendBuf=(IssmDouble*)sendbuf;
    265266    IssmDouble* activeRecvBuf=(IssmDouble*)recvbuf;
    266267    for(int i=0;i<sendcnt;++i) activeRecvBuf[i]=activeSendBuf[i];
    267268  }
    268   else 
     269  else
    269270# endif
    270271    memcpy(recvbuf,sendbuf,sizeHelper(sendtype)*sendcnt);
    … …  
    299300# endif
    300301#else
    301   assert(sendcnt==recvcnts[0]); // we handle only identical representations 
     302  assert(sendcnt==recvcnts[0]); // we handle only identical representations
    302303#ifdef _HAVE_AD_
    303   if (sendtype==ISSM_MPI_DOUBLE) { 
     304  if (sendtype==ISSM_MPI_DOUBLE) {
    304305    IssmDouble* activeSendBuf=(IssmDouble*)sendbuf;
    305306    IssmDouble* activeRecvBuf=(IssmDouble*)(recvbuf)+displs[0];
    306307    for(int i=0;i<sendcnt;++i) activeRecvBuf[i]=activeSendBuf[i];
    307308  }
    308   else 
     309  else
    309310# endif
    310311    memcpy((char*)recvbuf+(sizeHelper(recvtype)*displs[0]),sendbuf,sizeHelper(sendtype)*sendcnt);
    … …  
    340341#ifdef _HAVE_MPI_
    341342#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
    342   rc=AMPI_Recv(buf, 
     343  rc=AMPI_Recv(buf,
    343344               count,
    344345               datatype,
    … …  
    351352               status);
    352353# else
    353   rc=MPI_Recv(buf, 
     354  rc=MPI_Recv(buf,
    354355              count,
    355356              datatype,
    … …  
    359360              status);
    360361# endif
    361 #else 
    362 // nothing to be done here 
    363 // as long as nobody tries to do anything with 'status' 
     362#else
     363// nothing to be done here
     364// as long as nobody tries to do anything with 'status'
    364365// we won't do anything to it here either
    365366#endif
    … …  
    389390#else
    390391# ifdef _HAVE_AD_
    391   if (datatype==ISSM_MPI_DOUBLE) { 
     392  if (datatype==ISSM_MPI_DOUBLE) {
    392393    IssmDouble* activeSendBuf=(IssmDouble*)sendbuf;
    393394    IssmDouble* activeRecvBuf=(IssmDouble*)recvbuf;
    394395    for(int i=0;i<count;++i) activeRecvBuf[i]=activeSendBuf[i];
    395396  }
    396   else 
     397  else
    397398# endif
    398399    memcpy(recvbuf,sendbuf,sizeHelper(datatype)*count);
    … …  
    426427#else
    427428# ifdef _HAVE_AD_
    428   if (sendtype==ISSM_MPI_DOUBLE) { 
     429  if (sendtype==ISSM_MPI_DOUBLE) {
    429430    IssmDouble* activeSendBuf=(IssmDouble*)sendbuf;
    430431    IssmDouble* activeRecvBuf=(IssmDouble*)recvbuf;
    431432    for(int i=0;i<recvcnt;++i) activeRecvBuf[i]=activeSendBuf[i];
    432433  }
    433   else 
     434  else
    434435# endif
    435436    memcpy(recvbuf,sendbuf,sizeHelper(sendtype)*recvcnt);
    … …  
    464465# endif
    465466#else
    466   assert(sendcnts[0]==recvcnt); // we handle only identical representations 
     467  assert(sendcnts[0]==recvcnt); // we handle only identical representations
    467468# ifdef _HAVE_AD_
    468   if (sendtype==ISSM_MPI_DOUBLE) { 
     469  if (sendtype==ISSM_MPI_DOUBLE) {
    469470    IssmDouble* activeSendBuf=(IssmDouble*)(sendbuf)+displs[0];
    470471    IssmDouble* activeRecvBuf=(IssmDouble*)recvbuf;
    471472    for(int i=0;i<recvcnt;++i) activeRecvBuf[i]=activeSendBuf[i];
    472473  }
    473   else 
     474  else
    474475# endif
    475476    memcpy(recvbuf,(char*)sendbuf+(sizeHelper(sendtype)*displs[0]),sizeHelper(sendtype)*recvcnt);
    … …  
    482483#ifdef _HAVE_MPI_
    483484#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
    484   rc=AMPI_Send(buf, 
     485  rc=AMPI_Send(buf,
    485486               count,
    486487               datatype,
    … …  
    492493               comm);
    493494# else
    494   rc=MPI_Send(buf, 
     495  rc=MPI_Send(buf,
    495496              count,
    496497              datatype,
    … …  
    499500              comm);
    500501# endif
    501 #else 
    502 // nothing to be done here 
     502#else
     503// nothing to be done here
    503504#endif
    504505  return rc;
    … …  
    508509#ifdef _HAVE_MPI_
    509510        return MPI_Wtime();
    510 #else 
     511#else
    511512        assert(0); // to be implemented
    512513        return 0.0;
    … …  
    530531rc=MPI_Comm_split(comm, color, key, newcomm);
    531532#endif
    532 #else 
    533 // nothing to be done here 
     533#else
     534// nothing to be done here
    534535#endif
    535536  return rc;
    … …  
    544545        rc=MPI_Intercomm_create(comm,local_leader,peer_comm,remote_leader,tag,newintercomm);
    545546#endif
    546 #else 
    547         // nothing to be done here 
     547#else
     548        // nothing to be done here
    548549#endif
    549550        return rc;

  • issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h

    r24767 r24768  
    3434                        #include <codi/externals/codiMpiTypes.hpp>
    3535                        using MpiTypes = CoDiMpiTypes<IssmDouble>;
    36                         MpiTypes* mpiTypes;
     36                        extern MpiTypes* mpiTypes;
    3737                        #define AMPI_ADOUBLE mpiTypes->MPI_TYPE
    3838                        #elif defined(_HAVE_ADOLC_)
Note: See TracChangeset for help on using the changeset viewer.