/* smpi_mpi_dt.c -- MPI primitives to handle datatypes */
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void serialize_vector( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type)
+void serialize_vector( void* noncontiguous_vector, void *contiguous_vector, int count, void *type)
{
s_smpi_mpi_vector_t* type_c = reinterpret_cast<s_smpi_mpi_vector_t*>(type);
int i;
char* contiguous_vector_char = static_cast<char*>(contiguous_vector);
- const char* noncontiguous_vector_char = static_cast<const char*>(noncontiguous_vector);
+ char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_vector);
for (i = 0; i < type_c->block_count * count; i++) {
if (type_c->old_type->sizeof_substruct == 0)
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void unserialize_vector( const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
+void unserialize_vector( void* contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
{
s_smpi_mpi_vector_t* type_c = reinterpret_cast<s_smpi_mpi_vector_t*>(type);
int i;
- const char* contiguous_vector_char = static_cast<const char*>(contiguous_vector);
+ char* contiguous_vector_char = static_cast<char*>(contiguous_vector);
char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_vector);
for (i = 0; i < type_c->block_count * count; i++) {
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void serialize_contiguous( const void *noncontiguous_hvector, void *contiguous_hvector, int count, void *type)
+void serialize_contiguous( void* noncontiguous_hvector, void *contiguous_hvector, int count, void *type)
{
s_smpi_mpi_contiguous_t* type_c = reinterpret_cast<s_smpi_mpi_contiguous_t*>(type);
char* contiguous_vector_char = static_cast<char*>(contiguous_hvector);
- const char* noncontiguous_vector_char = static_cast<const char*>(noncontiguous_hvector)+type_c->lb;
+ char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_hvector)+type_c->lb;
memcpy(contiguous_vector_char, noncontiguous_vector_char, count* type_c->block_count * type_c->size_oldtype);
}
/* Copies contiguous data into noncontiguous memory.
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void unserialize_contiguous(const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
+void unserialize_contiguous(void* contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
{
s_smpi_mpi_contiguous_t* type_c = reinterpret_cast<s_smpi_mpi_contiguous_t*>(type);
- const char* contiguous_vector_char = static_cast<const char*>(contiguous_vector);
+ char* contiguous_vector_char = static_cast<char*>(contiguous_vector);
char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_vector)+type_c->lb;
int n= count* type_c->block_count;
smpi_op_apply(op, contiguous_vector_char, noncontiguous_vector_char, &n, &type_c->old_type);
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void serialize_hvector( const void *noncontiguous_hvector, void *contiguous_hvector, int count, void *type)
+void serialize_hvector( void* noncontiguous_hvector, void *contiguous_hvector, int count, void *type)
{
s_smpi_mpi_hvector_t* type_c = reinterpret_cast<s_smpi_mpi_hvector_t*>(type);
int i;
char* contiguous_vector_char = static_cast<char*>(contiguous_hvector);
- const char* noncontiguous_vector_char = static_cast<const char*>(noncontiguous_hvector);
+ char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_hvector);
for (i = 0; i < type_c->block_count * count; i++) {
if (type_c->old_type->sizeof_substruct == 0)
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void unserialize_hvector( const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
+void unserialize_hvector( void* contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
{
s_smpi_mpi_hvector_t* type_c = reinterpret_cast<s_smpi_mpi_hvector_t*>(type);
int i;
- const char* contiguous_vector_char = static_cast<const char*>(contiguous_vector);
+ char* contiguous_vector_char = static_cast<char*>(contiguous_vector);
char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_vector);
for (i = 0; i < type_c->block_count * count; i++) {
* - block_indices - indices of each data, in element
* - count - the number of rows of matrix
*/
-void serialize_indexed( const void *noncontiguous_indexed, void *contiguous_indexed, int count, void *type)
+void serialize_indexed( void* noncontiguous_indexed, void *contiguous_indexed, int count, void *type)
{
s_smpi_mpi_indexed_t* type_c = reinterpret_cast<s_smpi_mpi_indexed_t*>(type);
int i,j;
char* contiguous_indexed_char = static_cast<char*>(contiguous_indexed);
- const char* noncontiguous_indexed_char = static_cast<const char*>(noncontiguous_indexed)+type_c->block_indices[0] * type_c->size_oldtype;
+ char* noncontiguous_indexed_char = static_cast<char*>(noncontiguous_indexed)+type_c->block_indices[0] * type_c->size_oldtype;
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_type->sizeof_substruct == 0)
contiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
if (i<type_c->block_count-1)
noncontiguous_indexed_char =
- static_cast<const char*>(noncontiguous_indexed) + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
+ static_cast<char*>(noncontiguous_indexed) + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
else
noncontiguous_indexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
- noncontiguous_indexed=static_cast<const void*>(noncontiguous_indexed_char);
+ noncontiguous_indexed=static_cast< void*>(noncontiguous_indexed_char);
}
}
/* Copies contiguous data into noncontiguous memory.
* - block_indices - indices of each data, in element
* - count - the number of rows of matrix
*/
-void unserialize_indexed( const void *contiguous_indexed, void *noncontiguous_indexed, int count, void *type, MPI_Op op)
+void unserialize_indexed( void* contiguous_indexed, void *noncontiguous_indexed, int count, void *type, MPI_Op op)
{
s_smpi_mpi_indexed_t* type_c = reinterpret_cast<s_smpi_mpi_indexed_t*>(type);
int i,j;
- const char* contiguous_indexed_char = static_cast<const char*>(contiguous_indexed);
+ char* contiguous_indexed_char = static_cast<char*>(contiguous_indexed);
char* noncontiguous_indexed_char =
static_cast<char*>(noncontiguous_indexed)+type_c->block_indices[0]*smpi_datatype_get_extent(type_c->old_type);
for(j=0; j<count;j++){
* - block_indices - indices of each data, in bytes
* - count - the number of rows of matrix
*/
-void serialize_hindexed( const void *noncontiguous_hindexed, void *contiguous_hindexed, int count, void *type)
+void serialize_hindexed( void* noncontiguous_hindexed, void *contiguous_hindexed, int count, void *type)
{
s_smpi_mpi_hindexed_t* type_c = reinterpret_cast<s_smpi_mpi_hindexed_t*>(type);
int i,j;
char* contiguous_hindexed_char = static_cast<char*>(contiguous_hindexed);
- const char* noncontiguous_hindexed_char = static_cast<const char*>(noncontiguous_hindexed)+ type_c->block_indices[0];
+ char* noncontiguous_hindexed_char = static_cast<char*>(noncontiguous_hindexed)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_type->sizeof_substruct == 0)
contiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
if (i<type_c->block_count-1)
- noncontiguous_hindexed_char = static_cast<const char*>(noncontiguous_hindexed) + type_c->block_indices[i+1];
+ noncontiguous_hindexed_char = static_cast<char*>(noncontiguous_hindexed) + type_c->block_indices[i+1];
else
noncontiguous_hindexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
- noncontiguous_hindexed=reinterpret_cast<const void*>(noncontiguous_hindexed_char);
+ noncontiguous_hindexed=static_cast<void*>(noncontiguous_hindexed_char);
}
}
/* Copies contiguous data into noncontiguous memory.
* - block_indices - indices of each data, in bytes
* - count - the number of rows of matrix
*/
-void unserialize_hindexed( const void *contiguous_hindexed, void *noncontiguous_hindexed, int count, void *type,
+void unserialize_hindexed( void* contiguous_hindexed, void *noncontiguous_hindexed, int count, void *type,
MPI_Op op)
{
s_smpi_mpi_hindexed_t* type_c = reinterpret_cast<s_smpi_mpi_hindexed_t*>(type);
int i,j;
- const char* contiguous_hindexed_char = static_cast<const char*>(contiguous_hindexed);
+ char* contiguous_hindexed_char = static_cast<char*>(contiguous_hindexed);
char* noncontiguous_hindexed_char = static_cast<char*>(noncontiguous_hindexed)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
else
noncontiguous_hindexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
- noncontiguous_hindexed=reinterpret_cast<void*>(noncontiguous_hindexed_char);
+ noncontiguous_hindexed=static_cast<void*>(noncontiguous_hindexed_char);
}
}
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void serialize_struct( const void *noncontiguous_struct, void *contiguous_struct, int count, void *type)
+void serialize_struct( void* noncontiguous_struct, void *contiguous_struct, int count, void *type)
{
s_smpi_mpi_struct_t* type_c = reinterpret_cast<s_smpi_mpi_struct_t*>(type);
int i,j;
char* contiguous_struct_char = static_cast<char*>(contiguous_struct);
- const char* noncontiguous_struct_char = static_cast<const char*>(noncontiguous_struct)+ type_c->block_indices[0];
+ char* noncontiguous_struct_char = static_cast<char*>(noncontiguous_struct)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_types[i]->sizeof_substruct == 0)
contiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]);
if (i<type_c->block_count-1)
- noncontiguous_struct_char = static_cast<const char*>(noncontiguous_struct) + type_c->block_indices[i+1];
+ noncontiguous_struct_char = static_cast<char*>(noncontiguous_struct) + type_c->block_indices[i+1];
else //let's hope this is MPI_UB ?
noncontiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_types[i]);
}
- noncontiguous_struct=reinterpret_cast<const void*>(noncontiguous_struct_char);
+ noncontiguous_struct=static_cast<void*>(noncontiguous_struct_char);
}
}
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
*/
-void unserialize_struct( const void *contiguous_struct, void *noncontiguous_struct, int count, void *type, MPI_Op op)
+void unserialize_struct( void* contiguous_struct, void *noncontiguous_struct, int count, void *type, MPI_Op op)
{
s_smpi_mpi_struct_t* type_c = reinterpret_cast<s_smpi_mpi_struct_t*>(type);
int i,j;
- const char* contiguous_struct_char = static_cast<const char*>(contiguous_struct);
+ char* contiguous_struct_char = static_cast<char*>(contiguous_struct);
char* noncontiguous_struct_char = static_cast<char*>(noncontiguous_struct)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
typedef struct s_smpi_mpi_op {
MPI_User_function *func;
bool is_commute;
+ bool is_fortran_op;
} s_smpi_mpi_op_t;
#define MAX_OP(a, b) (b) = (a) < (b) ? (b) : (a)
}
#define CREATE_MPI_OP(name, func) \
- static s_smpi_mpi_op_t mpi_##name = { &(func) /* func */, true }; \
+ static s_smpi_mpi_op_t mpi_##name = { &(func) /* func */, true, false }; \
MPI_Op name = &mpi_##name;
CREATE_MPI_OP(MPI_MAX, max_func);
op = xbt_new(s_smpi_mpi_op_t, 1);
op->func = function;
op-> is_commute = commute;
+ op-> is_fortran_op = false;
return op;
}
xbt_free(op);
}
-void smpi_op_apply(MPI_Op op, const void *invec, void *inoutvec, int *len, MPI_Datatype * datatype)
+void smpi_op_set_fortran(MPI_Op op)
+{
+ //tell that we were created from fortran, so we need to translate the type to fortran when called
+ op->is_fortran_op = true;
+}
+
+void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len, MPI_Datatype * datatype)
{
if(op==MPI_OP_NULL)
return;
smpi_switch_data_segment(smpi_process_index());
}
- if(!smpi_process_get_replaying())
- op->func(const_cast<void*>(invec), inoutvec, len, datatype);
+ if(!smpi_process_get_replaying()){
+ if(! op->is_fortran_op)
+ op->func(invec, inoutvec, len, datatype);
+ else{
+ int tmp = smpi_type_c2f(*datatype);
+ /* Unfortunately, the C and Fortran version of the MPI standard do not agree on the type here,
+ thus the reinterpret_cast. */
+ op->func(invec, inoutvec, len, reinterpret_cast<MPI_Datatype*>(&tmp) );
+ }
+ }
}
int smpi_type_attr_delete(MPI_Datatype type, int keyval){