Ignore:
Timestamp:
10/06/23 11:32:05 (9 months ago)
Author:
jderouillat
Message:

Specify the usage of the xios namespace to overload the MPI funtions

Location:
XIOS3/trunk/src/transport
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • XIOS3/trunk/src/transport/legacy_context_client.cpp

    r2547 r2589  
    3131    { 
    3232      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test) 
    33       MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ; 
    34       MPI_Comm_split(intraComm_,clientRank,clientRank, &commSelf_) ; // for windows 
     33      xios::MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ; 
     34      xios::MPI_Comm_split(intraComm_,clientRank,clientRank, &commSelf_) ; // for windows 
    3535      eventScheduler_ = parent->getEventScheduler() ;   
    3636      timeLine = 1; 
    … …  
    219219          MPI_Comm interComm ; 
    220220          int tag = 0 ; 
    221           MPI_Intercomm_create(commSelf_, 0, interCommMerged_, clientSize+rank, tag, &interComm) ; 
    222           MPI_Intercomm_merge(interComm, false, &winComm_[rank]) ; 
    223           MPI_Comm_free(&interComm) ; 
     221          xios::MPI_Intercomm_create(commSelf_, 0, interCommMerged_, clientSize+rank, tag, &interComm) ; 
     222          xios::MPI_Intercomm_merge(interComm, false, &winComm_[rank]) ; 
     223          xios::MPI_Comm_free(&interComm) ; 
    224224                 
    225225          buffer->attachWindows(winComm_[rank]) ; 
    … …  
    242242            MPI_Comm interComm ; 
    243243            int tag = 0 ; 
    244             MPI_Intercomm_create(commSelf_, 0, interCommMerged_, clientSize+rank, tag, &interComm) ; 
    245             MPI_Intercomm_merge(interComm, false, &winComm_[rank]) ; 
    246             MPI_Comm_free(&interComm) ; 
     244            xios::MPI_Intercomm_create(commSelf_, 0, interCommMerged_, clientSize+rank, tag, &interComm) ; 
     245            xios::MPI_Intercomm_merge(interComm, false, &winComm_[rank]) ; 
     246            xios::MPI_Comm_free(&interComm) ; 
    247247               
    248248            buffer->attachWindows(winComm_[rank]) ; 

  • XIOS3/trunk/src/transport/legacy_context_server.cpp

    r2558 r2589  
    3636  { 
    3737  
    38     MPI_Comm_dup(intraComm, &processEventBarrier_) ; 
     38    xios::MPI_Comm_dup(intraComm, &processEventBarrier_) ; 
    3939  
    4040 
    … …  
    4343    finished=false; 
    4444 
    45     MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ; 
    46     MPI_Comm_split(intraComm_, intraCommRank, intraCommRank, &commSelf_) ; // for windows 
     45    xios::MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ; 
     46    xios::MPI_Comm_split(intraComm_, intraCommRank, intraCommRank, &commSelf_) ; // for windows 
    4747     
    4848    itLastTimeLine=lastTimeLine.begin() ; 
    … …  
    122122      MPI_Comm interComm ; 
    123123      int tag = 0 ; 
    124       MPI_Intercomm_create(commSelf_, 0, interCommMerged_, rank, tag , &interComm) ; 
    125       MPI_Intercomm_merge(interComm, true, &winComm_[rank]) ; 
    126       MPI_Comm_free(&interComm) ; 
     124      xios::MPI_Intercomm_create(commSelf_, 0, interCommMerged_, rank, tag , &interComm) ; 
     125      xios::MPI_Intercomm_merge(interComm, true, &winComm_[rank]) ; 
     126      xios::MPI_Comm_free(&interComm) ; 
    127127      windows_[rank].resize(2) ; 
    128128      //MPI_Win_create_dynamic(MPI_INFO_NULL, winComm_[rank], &windows_[rank][0]); 

  • XIOS3/trunk/src/transport/one_sided_client_buffer.cpp

    r2587 r2589  
    2222    CTimer::get("create Windows").resume() ; 
    2323    MPI_Comm interComm ; 
    24     MPI_Intercomm_create(commSelf, 0, interCommMerged, intraServerRank, 0, &interComm) ; 
    25     MPI_Intercomm_merge(interComm, false, &winComm_) ; 
     24    xios::MPI_Intercomm_create(commSelf, 0, interCommMerged, intraServerRank, 0, &interComm) ; 
     25    xios::MPI_Intercomm_merge(interComm, false, &winComm_) ; 
    2626    int rank ; 
    2727    MPI_Comm_rank(winComm_,&rank) ; 
    2828    info(logProtocol)<<"Windows rank="<<rank<<endl ; 
    2929    CXios::getMpiGarbageCollector().registerCommunicator(winComm_) ; 
    30     MPI_Comm_free(&interComm) ; 
     30    xios::MPI_Comm_free(&interComm) ; 
    3131     
    3232    maxWindows_=MAX_WINDOWS ;     

  • XIOS3/trunk/src/transport/one_sided_context_client.cpp

    r2585 r2589  
    3131      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test) 
    3232 
    33       MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ; 
    34        
    35       MPI_Comm_split(intraComm_,clientRank,clientRank, &commSelf_) ; // for windows 
     33      xios::MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ; 
     34       
     35      xios::MPI_Comm_split(intraComm_,clientRank,clientRank, &commSelf_) ; // for windows 
    3636      eventScheduler_ = parent->getEventScheduler() ;   
    3737      timeLine = 1; 

  • XIOS3/trunk/src/transport/one_sided_context_server.cpp

    r2566 r2589  
    3636  { 
    3737    
    38     MPI_Comm_dup(intraComm, &processEventBarrier_) ; 
     38    xios::MPI_Comm_dup(intraComm, &processEventBarrier_) ; 
    3939  
    4040    currentTimeLine=1; 
    … …  
    4242    finished=false; 
    4343 
    44     MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ; 
    45     MPI_Comm_split(intraComm_, intraCommRank, intraCommRank, &commSelf_) ; // for windows 
     44    xios::MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ; 
     45    xios::MPI_Comm_split(intraComm_, intraCommRank, intraCommRank, &commSelf_) ; // for windows 
    4646     
    4747    itLastTimeLine=lastTimeLine.begin() ; 
    … …  
    237237    //    MPI_Win_free(&windows_[rank][0]); 
    238238    //    MPI_Win_free(&windows_[rank][1]); 
    239     //    MPI_Comm_free(&winComm_[rank]) ; 
     239    //    xios::MPI_Comm_free(&winComm_[rank]) ; 
    240240    //  } 
    241241  } 

  • XIOS3/trunk/src/transport/one_sided_server_buffer.cpp

    r2565 r2589  
    2525    CTimer::get("create Windows").resume() ; 
    2626    MPI_Comm interComm ; 
    27     MPI_Intercomm_create(commSelf, 0, interCommMerged, clientRank_, 0 , &interComm) ; 
    28     MPI_Intercomm_merge(interComm, true, &winComm_) ; 
     27    xios::MPI_Intercomm_create(commSelf, 0, interCommMerged, clientRank_, 0 , &interComm) ; 
     28    xios::MPI_Intercomm_merge(interComm, true, &winComm_) ; 
    2929    CXios::getMpiGarbageCollector().registerCommunicator(winComm_) ; 
    30     MPI_Comm_free(&interComm) ; 
     30    xios::MPI_Comm_free(&interComm) ; 
    3131     
    3232    maxWindows_=MAX_WINDOWS ; 

  • XIOS3/trunk/src/transport/p2p_client_buffer.cpp

    r2587 r2589  
    2424    CTimer::get("create Windows").resume() ; 
    2525    //MPI_Comm interComm ; 
    26     //MPI_Intercomm_create(commSelf, 0, interCommMerged, intraServerRank, 0, &interComm) ; 
    27     //MPI_Intercomm_merge(interComm, false, &winComm_) ; 
     26    //xios::MPI_Intercomm_create(commSelf, 0, interCommMerged, intraServerRank, 0, &interComm) ; 
     27    //xios::MPI_Intercomm_merge(interComm, false, &winComm_) ; 
    2828    //int rank ; 
    2929    //MPI_Comm_rank(winComm_,&rank) ; 
    3030    //info(logProtocol)<<"Windows rank="<<rank<<endl ; 
    3131    //CXios::getMpiGarbageCollector().registerCommunicator(winComm_) ; 
    32     //MPI_Comm_free(&interComm) ; 
     32    //xios::MPI_Comm_free(&interComm) ; 
    3333     
    3434    maxWindows_=MAX_WINDOWS ;     

  • XIOS3/trunk/src/transport/p2p_context_client.cpp

    r2585 r2589  
    3131      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test) 
    3232 
    33       MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ; 
     33      xios::MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ; 
    3434      CXios::getMpiGarbageCollector().registerCommunicator(interCommMerged_) ; 
    3535       
    36       MPI_Comm_split(intraComm_,clientRank,clientRank, &commSelf_) ; // for windows 
     36      xios::MPI_Comm_split(intraComm_,clientRank,clientRank, &commSelf_) ; // for windows 
    3737      CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ; 
    3838      eventScheduler_ = parent->getEventScheduler() ;   

  • XIOS3/trunk/src/transport/p2p_context_server.cpp

    r2580 r2589  
    3636  { 
    3737    
    38     MPI_Comm_dup(intraComm, &processEventBarrier_) ; 
     38    xios::MPI_Comm_dup(intraComm, &processEventBarrier_) ; 
    3939    CXios::getMpiGarbageCollector().registerCommunicator(processEventBarrier_) ; 
    4040     
    … …  
    4343    finished=false; 
    4444 
    45     MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ; 
     45    xios::MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ; 
    4646    CXios::getMpiGarbageCollector().registerCommunicator(interCommMerged_) ; 
    47     MPI_Comm_split(intraComm_, intraCommRank, intraCommRank, &commSelf_) ; // for windows 
     47    xios::MPI_Comm_split(intraComm_, intraCommRank, intraCommRank, &commSelf_) ; // for windows 
    4848    CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ; 
    4949     
    … …  
    244244    //    MPI_Win_free(&windows_[rank][0]); 
    245245    //    MPI_Win_free(&windows_[rank][1]); 
    246     //    MPI_Comm_free(&winComm_[rank]) ; 
     246    //    xios::MPI_Comm_free(&winComm_[rank]) ; 
    247247    //  } 
    248248  } 

  • XIOS3/trunk/src/transport/p2p_server_buffer.cpp

    r2564 r2589  
    2525    CTimer::get("create Windows").resume() ; 
    2626    //MPI_Comm interComm ; 
    27     //MPI_Intercomm_create(commSelf, 0, interCommMerged, clientRank_, 0 , &interComm) ; 
    28     //MPI_Intercomm_merge(interComm, true, &winComm_) ; 
     27    //xios::MPI_Intercomm_create(commSelf, 0, interCommMerged, clientRank_, 0 , &interComm) ; 
     28    //xios::MPI_Intercomm_merge(interComm, true, &winComm_) ; 
    2929    //CXios::getMpiGarbageCollector().registerCommunicator(winComm_) ; 
    30     //MPI_Comm_free(&interComm) ; 
     30    //xios::MPI_Comm_free(&interComm) ; 
    3131     
    3232    //maxWindows_=MAX_WINDOWS ; 
Note: See TracChangeset for help on using the changeset viewer.