-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
array_of_displacements[0] = 0 ;
array_of_displacements[1] = sizeof(double) ;
array_of_displacements[2] = 2*sizeof(double) ;
- MPI_Type_struct(3, array_of_blocklengths, array_of_displacements,
+ MPI_Type_create_struct(3, array_of_blocklengths, array_of_displacements,
array_of_types, &_MPI_TIME) ;
MPI_Type_commit(&_MPI_TIME) ;
}
"_MapOfRequestStruct".
That structure RequestStruct give the possibility to manage
the structures MPI_Request and MPI_Status * of MPI. It give
- also the possibility to get informations about that request :
+ also the possibility to get information about that request :
target, send/recv, tag, [a]synchronous, type, outcount.
. That identifier is used to control an asynchronous request
{
int size = 0;
for (int i = 0 ; i < _processor_group_size ; i++ )
- size += _send_requests[ i ].size() ;
+ size += (int)_send_requests[ i ].size() ;
return size ;
}
{
int size = 0 ;
for (int i = 0 ; i < _processor_group_size ; i++ )
- size += _recv_requests[ i ].size() ;
+ size += (int)_recv_requests[ i ].size() ;
return size ;
}
list< int >::const_iterator iter ;
for (iter = _send_requests[ destrank ].begin() ; iter != _send_requests[destrank].end() ; iter++ )
ArrayOfSendRequests[i++] = *iter ;
- return _send_requests[destrank].size() ;
+ return (int)_send_requests[destrank].size() ;
}
// Returns in ArrayOfRecvRequests with the dimension "size" all the
_recv_requests[ sourcerank ] ;
for (iter = _recv_requests[ sourcerank ].begin() ; iter != _recv_requests[sourcerank].end() ; iter++ )
ArrayOfRecvRequests[i++] = *iter ;
- return _recv_requests[sourcerank].size() ;
+ return (int)_recv_requests[sourcerank].size() ;
}
// Send in synchronous mode count values of type datatype from buffer to target
// Receive (read) in synchronous mode count values of type datatype in buffer from source
// (returns RequestId identifier even if the corresponding structure is deleted :
// it is only in order to have the same signature as the asynchronous mode)
- // The output argument OutCount is optionnal : *OutCount <= count
+ // The output argument OutCount is optional : *OutCount <= count
int MPIAccess::recv(void* buffer, int count, MPI_Datatype datatype, int source, int &RequestId, int *OutCount)
{
int sts = MPI_SUCCESS ;
int outcount = 0 ;
if ( sts == MPI_SUCCESS )
{
- MPI_Datatype datatype = MPIDatatype( RequestId ) ;
- _comm_interface.getCount(MPIStatus( RequestId ), datatype, &outcount ) ;
+ MPI_Datatype datatype2 = MPIDatatype( RequestId ) ;
+ _comm_interface.getCount(MPIStatus( RequestId ), datatype2, &outcount ) ;
setMPIOutCount( RequestId , outcount ) ;
setMPICompleted( RequestId , true ) ;
deleteStatus( RequestId ) ;
int MPIAccess::cancel( int source, int theMPITag, MPI_Datatype datatype, int outcount, int &flag )
{
int sts ;
- MPI_Aint extent ;
+ MPI_Aint extent, lbound ;
flag = 0 ;
- sts = MPI_Type_extent( datatype , &extent ) ;
+ sts = MPI_Type_get_extent( datatype , &lbound, &extent ) ;
if ( sts == MPI_SUCCESS )
{
void * recvbuf = malloc( extent*outcount ) ;
return _comm_interface.requestFree( request ) ;
}
- // Print all informations of all known requests for debugging purpose
+ // Print all information of all known requests for debugging purpose
void MPIAccess::check() const
{
int i = 0 ;
// Returns the MPI size of a TimeMessage
MPI_Aint MPIAccess::timeExtent() const
{
- MPI_Aint aextent ;
- MPI_Type_extent( _MPI_TIME , &aextent ) ;
+ MPI_Aint aextent, lbound ;
+ MPI_Type_get_extent( _MPI_TIME , &lbound, &aextent ) ;
return aextent ;
}
// Returns the MPI size of a MPI_INT
MPI_Aint MPIAccess::intExtent() const
{
- MPI_Aint aextent ;
- MPI_Type_extent( MPI_INT , &aextent ) ;
+ MPI_Aint aextent, lbound ;
+ MPI_Type_get_extent( MPI_INT , &lbound, &aextent ) ;
+ return aextent ;
+ }
+
+ // Returns the MPI size of a MPI_LONG
+ MPI_Aint MPIAccess::longExtent() const
+ {
+ MPI_Aint aextent, lbound ;
+ MPI_Type_get_extent( MPI_LONG , &lbound, &aextent ) ;
return aextent ;
}
// Returns the MPI size of a MPI_DOUBLE
MPI_Aint MPIAccess::doubleExtent() const
{
- MPI_Aint aextent ;
- MPI_Type_extent( MPI_DOUBLE , &aextent ) ;
+ MPI_Aint aextent, lbound ;
+ MPI_Type_get_extent( MPI_DOUBLE , &lbound, &aextent ) ;
return aextent ;
}