X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c3926e2c40bcec2394899543f06d2e1762b64e0..2bcb5dd3317c733c31c288ae79e72fb28863d936:/src/smpi/smpi_mpi_dt.cpp diff --git a/src/smpi/smpi_mpi_dt.cpp b/src/smpi/smpi_mpi_dt.cpp index 607c1e6555..630ca733df 100644 --- a/src/smpi/smpi_mpi_dt.cpp +++ b/src/smpi/smpi_mpi_dt.cpp @@ -1,6 +1,5 @@ /* 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. */ @@ -13,23 +12,24 @@ #include "smpi_mpi_dt_private.h" #include "mc/mc.h" #include "xbt/replay.h" +#include #include "simgrid/modelchecker.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi, "Logging specific to SMPI (datatype)"); -xbt_dict_t smpi_type_keyvals = NULL; +xbt_dict_t smpi_type_keyvals = nullptr; int type_keyval_id=0;//avoid collisions #define CREATE_MPI_DATATYPE(name, type) \ static s_smpi_mpi_datatype_t mpi_##name = { \ (char*) # name, \ sizeof(type), /* size */ \ - 0, /*was 1 sizeof_substruct*/ \ + 0, /*was 1 sizeof_substruct*/ \ 0, /* lb */ \ sizeof(type), /* ub = lb + size */ \ DT_FLAG_BASIC, /* flags */ \ - NULL, /* attributes */ \ - NULL, /* pointer on extended struct*/ \ + nullptr, /* attributes */ \ + nullptr, /* pointer on extended struct*/ \ 0 /* in_use counter */ \ }; \ const MPI_Datatype name = &mpi_##name; @@ -38,12 +38,12 @@ const MPI_Datatype name = &mpi_##name; static s_smpi_mpi_datatype_t mpi_##name = { \ (char*) # name, \ 0, /* size */ \ - 0, /* was 1 sizeof_substruct*/ \ + 0, /* was 1 sizeof_substruct*/ \ 0, /* lb */ \ 0, /* ub = lb + size */ \ DT_FLAG_BASIC, /* flags */ \ - NULL, /* attributes */ \ - NULL, /* pointer on extended struct*/ \ + nullptr, /* attributes */ \ + nullptr, /* pointer on extended struct*/ \ 0 /* in_use counter */ \ }; \ const MPI_Datatype name = &mpi_##name; @@ -184,27 +184,27 @@ int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t) } if(datatype->name) (*new_t)->name = xbt_strdup(datatype->name); - if(datatype->attributes !=NULL){ - (*new_t)->attributes=xbt_dict_new(); - xbt_dict_cursor_t cursor = NULL; - int *key; - int flag; - void* value_in; - void* value_out; - xbt_dict_foreach(datatype->attributes, cursor, key, value_in){ - smpi_type_key_elem elem = - static_cast(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast(key), sizeof(int))); - if(elem != NULL && elem->copy_fn!=MPI_NULL_COPY_FN){ - ret = elem->copy_fn(datatype, *key, NULL, value_in, &value_out, &flag ); - if(ret!=MPI_SUCCESS){ - smpi_datatype_unuse(*new_t); - *new_t=MPI_DATATYPE_NULL; - xbt_dict_cursor_free(&cursor); - return ret; - } - if(flag) - xbt_dict_set_ext((*new_t)->attributes, reinterpret_cast(key), sizeof(int),value_out, NULL); + if(datatype->attributes !=nullptr){ + (*new_t)->attributes = xbt_dict_new_homogeneous(nullptr); + xbt_dict_cursor_t cursor = nullptr; + int* key; + int flag; + void* value_in; + void* value_out; + xbt_dict_foreach (datatype->attributes, cursor, key, value_in) { + smpi_type_key_elem elem = static_cast( + xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast(key), sizeof(int))); + if (elem != nullptr && elem->copy_fn != MPI_NULL_COPY_FN) { + ret = elem->copy_fn(datatype, *key, nullptr, value_in, &value_out, &flag); + if (ret != MPI_SUCCESS) { + smpi_datatype_unuse(*new_t); + *new_t = MPI_DATATYPE_NULL; + xbt_dict_cursor_free(&cursor); + return ret; } + if (flag) + xbt_dict_set_ext((*new_t)->attributes, reinterpret_cast(key), sizeof(int), value_out, nullptr); + } } } return ret; @@ -235,7 +235,7 @@ void smpi_datatype_get_name(MPI_Datatype datatype, char* name, int* length){ } void smpi_datatype_set_name(MPI_Datatype datatype, char* name){ - if(datatype->name!=NULL && (datatype->flags & DT_FLAG_PREDEFINED) == 0) + if(datatype->name!=nullptr && (datatype->flags & DT_FLAG_PREDEFINED) == 0) xbt_free(datatype->name); datatype->name = xbt_strdup(name); } @@ -287,17 +287,17 @@ int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype, * Copies noncontiguous data into contiguous memory. * @param contiguous_vector - output vector * @param noncontiguous_vector - input vector - * @param type - pointer contening : + * @param type - pointer containing : * - stride - stride of between noncontiguous data * - 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(type); int i; char* contiguous_vector_char = static_cast(contiguous_vector); - const char* noncontiguous_vector_char = static_cast(noncontiguous_vector); + char* noncontiguous_vector_char = static_cast(noncontiguous_vector); for (i = 0; i < type_c->block_count * count; i++) { if (type_c->old_type->sizeof_substruct == 0) @@ -324,12 +324,12 @@ void serialize_vector( const void *noncontiguous_vector, void *contiguous_vector * - 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(type); int i; - const char* contiguous_vector_char = static_cast(contiguous_vector); + char* contiguous_vector_char = static_cast(contiguous_vector); char* noncontiguous_vector_char = static_cast(noncontiguous_vector); for (i = 0; i < type_c->block_count * count; i++) { @@ -369,7 +369,7 @@ s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride, int block_le void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int sizeof_substruct, void *struct_type, int flags){ MPI_Datatype new_t= xbt_new(s_smpi_mpi_datatype_t,1); - new_t->name = NULL; + new_t->name = nullptr; new_t->size = size; new_t->sizeof_substruct = size>0? sizeof_substruct:0; new_t->lb = lb; @@ -377,7 +377,7 @@ void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int s new_t->flags = flags; new_t->substruct = struct_type; new_t->in_use=1; - new_t->attributes=NULL; + new_t->attributes=nullptr; *new_type = new_t; #if HAVE_MC @@ -398,15 +398,15 @@ void smpi_datatype_free(MPI_Datatype* type){ return; } - if((*type)->attributes !=NULL){ - xbt_dict_cursor_t cursor = NULL; + if((*type)->attributes !=nullptr){ + xbt_dict_cursor_t cursor = nullptr; int* key; void * value; int flag; xbt_dict_foreach((*type)->attributes, cursor, key, value){ smpi_type_key_elem elem = static_cast(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast(key), sizeof(int))); - if(elem!=NULL && elem->delete_fn!=NULL) + if(elem!=nullptr && elem->delete_fn!=nullptr) elem->delete_fn(*type,*key, value, &flag); } xbt_dict_free(&(*type)->attributes); @@ -423,8 +423,9 @@ void smpi_datatype_free(MPI_Datatype* type){ void smpi_datatype_use(MPI_Datatype type){ - if(type != MPI_DATATYPE_NULL) - type->in_use++; + if(type == MPI_DATATYPE_NULL) + return; + type->in_use++; if(type->sizeof_substruct!=0){ static_cast((type)->substruct)->subtype_use(&type); @@ -435,7 +436,11 @@ void smpi_datatype_use(MPI_Datatype type){ #endif } -void smpi_datatype_unuse(MPI_Datatype type){ +void smpi_datatype_unuse(MPI_Datatype type) +{ + if (type == MPI_DATATYPE_NULL) + return; + if (type->in_use > 0) type->in_use--; @@ -443,9 +448,9 @@ void smpi_datatype_unuse(MPI_Datatype type){ static_cast((type)->substruct)->subtype_free(&type); } - if(type != MPI_DATATYPE_NULL && type->in_use == 0){ + if (type->in_use == 0) smpi_datatype_free(&type); - } + #if HAVE_MC if(MC_is_active()) MC_ignore(&(type->in_use), sizeof(type->in_use)); @@ -462,11 +467,11 @@ void smpi_datatype_unuse(MPI_Datatype type){ * - 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(type); char* contiguous_vector_char = static_cast(contiguous_hvector); - const char* noncontiguous_vector_char = static_cast(noncontiguous_hvector)+type_c->lb; + char* noncontiguous_vector_char = static_cast(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. @@ -477,10 +482,10 @@ void serialize_contiguous( const void *noncontiguous_hvector, void *contiguous_h * - 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(type); - const char* contiguous_vector_char = static_cast(contiguous_vector); + char* contiguous_vector_char = static_cast(contiguous_vector); char* noncontiguous_vector_char = static_cast(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); @@ -495,11 +500,11 @@ void use_contiguous(MPI_Datatype* d){ } /* Create a Sub type contiguous to be able to serialize and unserialize it the structure s_smpi_mpi_contiguous_t is - * erived from s_smpi_subtype which required the functions unserialize and serialize */ + * derived from s_smpi_subtype which required the functions unserialize and serialize */ s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb, int block_count, MPI_Datatype old_type, int size_oldtype){ if(block_count==0) - return NULL; + return nullptr; s_smpi_mpi_contiguous_t *new_t= xbt_new(s_smpi_mpi_contiguous_t,1); new_t->base.serialize = &serialize_contiguous; new_t->base.unserialize = &unserialize_contiguous; @@ -549,9 +554,9 @@ int smpi_datatype_vector(int count, int blocklen, int stride, MPI_Datatype old_t DT_FLAG_VECTOR); retval=MPI_SUCCESS; }else{ - /* in this situation the data are contignous thus it's not required to serialize and unserialize it*/ + /* in this situation the data are contiguous thus it's not required to serialize and unserialize it*/ smpi_datatype_create(new_type, count * blocklen * smpi_datatype_size(old_type), 0, ((count -1) * stride + blocklen)* - smpi_datatype_size(old_type), 0, NULL, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS); + smpi_datatype_size(old_type), 0, nullptr, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS); retval=MPI_SUCCESS; } return retval; @@ -575,12 +580,12 @@ void use_vector(MPI_Datatype* d){ * - 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(type); int i; char* contiguous_vector_char = static_cast(contiguous_hvector); - const char* noncontiguous_vector_char = static_cast(noncontiguous_hvector); + char* noncontiguous_vector_char = static_cast(noncontiguous_hvector); for (i = 0; i < type_c->block_count * count; i++) { if (type_c->old_type->sizeof_substruct == 0) @@ -605,12 +610,12 @@ void serialize_hvector( const void *noncontiguous_hvector, void *contiguous_hvec * - 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(type); int i; - const char* contiguous_vector_char = static_cast(contiguous_vector); + char* contiguous_vector_char = static_cast(contiguous_vector); char* noncontiguous_vector_char = static_cast(noncontiguous_vector); for (i = 0; i < type_c->block_count * count; i++) { @@ -676,7 +681,7 @@ int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype retval=MPI_SUCCESS; }else{ smpi_datatype_create(new_type, count * blocklen * smpi_datatype_size(old_type),0,count * blocklen * - smpi_datatype_size(old_type), 0, NULL, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS); + smpi_datatype_size(old_type), 0, nullptr, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS); retval=MPI_SUCCESS; } return retval; @@ -692,12 +697,12 @@ int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype * - 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(type); int i,j; char* contiguous_indexed_char = static_cast(contiguous_indexed); - const char* noncontiguous_indexed_char = static_cast(noncontiguous_indexed)+type_c->block_indices[0] * type_c->size_oldtype; + char* noncontiguous_indexed_char = static_cast(noncontiguous_indexed)+type_c->block_indices[0] * type_c->size_oldtype; for(j=0; jblock_count; i++) { if (type_c->old_type->sizeof_substruct == 0) @@ -711,11 +716,11 @@ void serialize_indexed( const void *noncontiguous_indexed, void *contiguous_inde contiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype; if (iblock_count-1) noncontiguous_indexed_char = - static_cast(noncontiguous_indexed) + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type); + static_cast(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(noncontiguous_indexed_char); + noncontiguous_indexed=static_cast< void*>(noncontiguous_indexed_char); } } /* Copies contiguous data into noncontiguous memory. @@ -726,11 +731,11 @@ void serialize_indexed( const void *noncontiguous_indexed, void *contiguous_inde * - 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(type); int i,j; - const char* contiguous_indexed_char = static_cast(contiguous_indexed); + char* contiguous_indexed_char = static_cast(contiguous_indexed); char* noncontiguous_indexed_char = static_cast(noncontiguous_indexed)+type_c->block_indices[0]*smpi_datatype_get_extent(type_c->old_type); for(j=0; j(type); int i,j; char* contiguous_hindexed_char = static_cast(contiguous_hindexed); - const char* noncontiguous_hindexed_char = static_cast(noncontiguous_hindexed)+ type_c->block_indices[0]; + char* noncontiguous_hindexed_char = static_cast(noncontiguous_hindexed)+ type_c->block_indices[0]; for(j=0; jblock_count; i++) { if (type_c->old_type->sizeof_substruct == 0) @@ -861,11 +866,11 @@ void serialize_hindexed( const void *noncontiguous_hindexed, void *contiguous_hi contiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype; if (iblock_count-1) - noncontiguous_hindexed_char = static_cast(noncontiguous_hindexed) + type_c->block_indices[i+1]; + noncontiguous_hindexed_char = static_cast(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(noncontiguous_hindexed_char); + noncontiguous_hindexed=static_cast(noncontiguous_hindexed_char); } } /* Copies contiguous data into noncontiguous memory. @@ -876,13 +881,13 @@ void serialize_hindexed( const void *noncontiguous_hindexed, void *contiguous_hi * - 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(type); int i,j; - const char* contiguous_hindexed_char = static_cast(contiguous_hindexed); + char* contiguous_hindexed_char = static_cast(contiguous_hindexed); char* noncontiguous_hindexed_char = static_cast(noncontiguous_hindexed)+ type_c->block_indices[0]; for(j=0; jblock_count; i++) { @@ -901,7 +906,7 @@ void unserialize_hindexed( const void *contiguous_hindexed, void *noncontiguous_ else noncontiguous_hindexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type); } - noncontiguous_hindexed=reinterpret_cast(noncontiguous_hindexed_char); + noncontiguous_hindexed=static_cast(noncontiguous_hindexed_char); } } @@ -929,8 +934,7 @@ s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create( int* block_lengths, MPI_Ai new_t->base.subtype_use = &use_hindexed; new_t->block_lengths= xbt_new(int, block_count); new_t->block_indices= xbt_new(MPI_Aint, block_count); - int i; - for(i=0;iblock_lengths[i]=block_lengths[i]; new_t->block_indices[i]=block_indices[i]; } @@ -992,12 +996,12 @@ int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Dat * - 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(type); int i,j; char* contiguous_struct_char = static_cast(contiguous_struct); - const char* noncontiguous_struct_char = static_cast(noncontiguous_struct)+ type_c->block_indices[0]; + char* noncontiguous_struct_char = static_cast(noncontiguous_struct)+ type_c->block_indices[0]; for(j=0; jblock_count; i++) { if (type_c->old_types[i]->sizeof_substruct == 0) @@ -1012,11 +1016,11 @@ void serialize_struct( const void *noncontiguous_struct, void *contiguous_struct contiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]); if (iblock_count-1) - noncontiguous_struct_char = static_cast(noncontiguous_struct) + type_c->block_indices[i+1]; + noncontiguous_struct_char = static_cast(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(noncontiguous_struct_char); + noncontiguous_struct=static_cast(noncontiguous_struct_char); } } @@ -1028,12 +1032,12 @@ void serialize_struct( const void *noncontiguous_struct, void *contiguous_struct * - 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(type); int i,j; - const char* contiguous_struct_char = static_cast(contiguous_struct); + char* contiguous_struct_char = static_cast(contiguous_struct); char* noncontiguous_struct_char = static_cast(noncontiguous_struct)+ type_c->block_indices[0]; for(j=0; jblock_count; i++) { @@ -1155,6 +1159,7 @@ void smpi_datatype_commit(MPI_Datatype *datatype) 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) @@ -1180,332 +1185,157 @@ typedef struct s_smpi_mpi_op { } \ } +#define APPLY_OP_LOOP(dtype, type, op) \ + if (*datatype == dtype) {\ + APPLY_FUNC(a, b, length, type, op)\ + } else \ + + +#define APPLY_BASIC_OP_LOOP(op)\ +APPLY_OP_LOOP(MPI_CHAR, char,op)\ +APPLY_OP_LOOP(MPI_SHORT, short,op)\ +APPLY_OP_LOOP(MPI_INT, int,op)\ +APPLY_OP_LOOP(MPI_LONG, long,op)\ +APPLY_OP_LOOP(MPI_LONG_LONG, long long,op)\ +APPLY_OP_LOOP(MPI_SIGNED_CHAR, signed char,op)\ +APPLY_OP_LOOP(MPI_UNSIGNED_CHAR, unsigned char,op)\ +APPLY_OP_LOOP(MPI_UNSIGNED_SHORT, unsigned short,op)\ +APPLY_OP_LOOP(MPI_UNSIGNED, unsigned int,op)\ +APPLY_OP_LOOP(MPI_UNSIGNED_LONG, unsigned long,op)\ +APPLY_OP_LOOP(MPI_UNSIGNED_LONG_LONG, unsigned long long,op)\ +APPLY_OP_LOOP(MPI_WCHAR, wchar_t,op)\ +APPLY_OP_LOOP(MPI_BYTE, int8_t,op)\ +APPLY_OP_LOOP(MPI_INT8_T, int8_t,op)\ +APPLY_OP_LOOP(MPI_INT16_T, int16_t,op)\ +APPLY_OP_LOOP(MPI_INT32_T, int32_t,op)\ +APPLY_OP_LOOP(MPI_INT64_T, int64_t,op)\ +APPLY_OP_LOOP(MPI_UINT8_T, uint8_t,op)\ +APPLY_OP_LOOP(MPI_UINT16_T, uint16_t,op)\ +APPLY_OP_LOOP(MPI_UINT32_T, uint32_t,op)\ +APPLY_OP_LOOP(MPI_UINT64_T, uint64_t,op)\ +APPLY_OP_LOOP(MPI_AINT, MPI_Aint,op)\ +APPLY_OP_LOOP(MPI_OFFSET, MPI_Offset,op)\ +APPLY_OP_LOOP(MPI_INTEGER1, int,op)\ +APPLY_OP_LOOP(MPI_INTEGER2, int16_t,op)\ +APPLY_OP_LOOP(MPI_INTEGER4, int32_t,op)\ +APPLY_OP_LOOP(MPI_INTEGER8, int64_t,op) + +#define APPLY_BOOL_OP_LOOP(op)\ +APPLY_OP_LOOP(MPI_C_BOOL, bool,op) + +#define APPLY_FLOAT_OP_LOOP(op)\ +APPLY_OP_LOOP(MPI_FLOAT, float,op)\ +APPLY_OP_LOOP(MPI_DOUBLE, double,op)\ +APPLY_OP_LOOP(MPI_LONG_DOUBLE, long double,op)\ +APPLY_OP_LOOP(MPI_REAL, float,op)\ +APPLY_OP_LOOP(MPI_REAL4, float,op)\ +APPLY_OP_LOOP(MPI_REAL8, float,op)\ +APPLY_OP_LOOP(MPI_REAL16, double,op) + +#define APPLY_COMPLEX_OP_LOOP(op)\ +APPLY_OP_LOOP(MPI_C_FLOAT_COMPLEX, float _Complex,op)\ +APPLY_OP_LOOP(MPI_C_DOUBLE_COMPLEX, double _Complex,op)\ +APPLY_OP_LOOP(MPI_C_LONG_DOUBLE_COMPLEX, long double _Complex,op) + +#define APPLY_PAIR_OP_LOOP(op)\ +APPLY_OP_LOOP(MPI_FLOAT_INT, float_int,op)\ +APPLY_OP_LOOP(MPI_LONG_INT, long_int,op)\ +APPLY_OP_LOOP(MPI_DOUBLE_INT, double_int,op)\ +APPLY_OP_LOOP(MPI_SHORT_INT, short_int,op)\ +APPLY_OP_LOOP(MPI_2INT, int_int,op)\ +APPLY_OP_LOOP(MPI_2FLOAT, float_float,op)\ +APPLY_OP_LOOP(MPI_2DOUBLE, double_double,op)\ +APPLY_OP_LOOP(MPI_LONG_DOUBLE_INT, long_double_int,op)\ +APPLY_OP_LOOP(MPI_2LONG, long_long,op) + +#define APPLY_END_OP_LOOP(op)\ + {\ + xbt_die("Failed to apply " #op " to type %s", (*datatype)->name);\ + } + + static void max_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, MAX_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, MAX_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, MAX_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, MAX_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, MAX_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, MAX_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, MAX_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, MAX_OP) - } else if (*datatype == MPI_FLOAT) { - APPLY_FUNC(a, b, length, float, MAX_OP) - } else if (*datatype == MPI_DOUBLE) { - APPLY_FUNC(a, b, length, double, MAX_OP) - } else if (*datatype == MPI_LONG_DOUBLE) { - APPLY_FUNC(a, b, length, long double, MAX_OP) - } else { - xbt_die("Failed to apply MAX_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(MAX_OP) + APPLY_FLOAT_OP_LOOP(MAX_OP) + APPLY_END_OP_LOOP(MAX_OP) } static void min_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, MIN_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, MIN_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, MIN_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, MIN_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, MIN_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, MIN_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, MIN_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, MIN_OP) - } else if (*datatype == MPI_FLOAT) { - APPLY_FUNC(a, b, length, float, MIN_OP) - } else if (*datatype == MPI_DOUBLE) { - APPLY_FUNC(a, b, length, double, MIN_OP) - } else if (*datatype == MPI_LONG_DOUBLE) { - APPLY_FUNC(a, b, length, long double, MIN_OP) - } else { - xbt_die("Failed to apply MIN_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(MIN_OP) + APPLY_FLOAT_OP_LOOP(MIN_OP) + APPLY_END_OP_LOOP(MIN_OP) } static void sum_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, SUM_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, SUM_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, SUM_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, SUM_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, SUM_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, SUM_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, SUM_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, SUM_OP) - } else if (*datatype == MPI_FLOAT) { - APPLY_FUNC(a, b, length, float, SUM_OP) - } else if (*datatype == MPI_DOUBLE) { - APPLY_FUNC(a, b, length, double, SUM_OP) - } else if (*datatype == MPI_LONG_DOUBLE) { - APPLY_FUNC(a, b, length, long double, SUM_OP) - } else if (*datatype == MPI_C_FLOAT_COMPLEX) { - APPLY_FUNC(a, b, length, float _Complex, SUM_OP) - } else if (*datatype == MPI_C_DOUBLE_COMPLEX) { - APPLY_FUNC(a, b, length, double _Complex, SUM_OP) - } else if (*datatype == MPI_C_LONG_DOUBLE_COMPLEX) { - APPLY_FUNC(a, b, length, long double _Complex, SUM_OP) - } else { - xbt_die("Failed to apply SUM_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(SUM_OP) + APPLY_FLOAT_OP_LOOP(SUM_OP) + APPLY_COMPLEX_OP_LOOP(SUM_OP) + APPLY_END_OP_LOOP(SUM_OP) } static void prod_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, PROD_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, PROD_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, PROD_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, PROD_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, PROD_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, PROD_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, PROD_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, PROD_OP) - } else if (*datatype == MPI_FLOAT) { - APPLY_FUNC(a, b, length, float, PROD_OP) - } else if (*datatype == MPI_DOUBLE) { - APPLY_FUNC(a, b, length, double, PROD_OP) - } else if (*datatype == MPI_LONG_DOUBLE) { - APPLY_FUNC(a, b, length, long double, PROD_OP) - } else if (*datatype == MPI_C_FLOAT_COMPLEX) { - APPLY_FUNC(a, b, length, float _Complex, PROD_OP) - } else if (*datatype == MPI_C_DOUBLE_COMPLEX) { - APPLY_FUNC(a, b, length, double _Complex, PROD_OP) - } else if (*datatype == MPI_C_LONG_DOUBLE_COMPLEX) { - APPLY_FUNC(a, b, length, long double _Complex, PROD_OP) - } else { - xbt_die("Failed to apply PROD_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(PROD_OP) + APPLY_FLOAT_OP_LOOP(PROD_OP) + APPLY_COMPLEX_OP_LOOP(PROD_OP) + APPLY_END_OP_LOOP(PROD_OP) } static void land_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, LAND_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, LAND_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, LAND_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, LAND_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, LAND_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, LAND_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, LAND_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, LAND_OP) - } else if (*datatype == MPI_C_BOOL) { - APPLY_FUNC(a, b, length, bool, LAND_OP) - } else { - xbt_die("Failed to apply LAND_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(LAND_OP) + APPLY_BOOL_OP_LOOP(LAND_OP) + APPLY_END_OP_LOOP(LAND_OP) } static void lor_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, LOR_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, LOR_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, LOR_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, LOR_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, LOR_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, LOR_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, LOR_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, LOR_OP) - } else if (*datatype == MPI_C_BOOL) { - APPLY_FUNC(a, b, length, bool, LOR_OP) - } else { - xbt_die("Failed to apply LOR_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(LOR_OP) + APPLY_BOOL_OP_LOOP(LOR_OP) + APPLY_END_OP_LOOP(LOR_OP) } static void lxor_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, LXOR_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, LXOR_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, LXOR_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, LXOR_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, LXOR_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, LXOR_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, LXOR_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, LXOR_OP) - } else if (*datatype == MPI_C_BOOL) { - APPLY_FUNC(a, b, length, bool, LXOR_OP) - } else { - xbt_die("Failed to apply LXOR_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(LXOR_OP) + APPLY_BOOL_OP_LOOP(LXOR_OP) + APPLY_END_OP_LOOP(LXOR_OP) } static void band_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, BAND_OP) - }else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, BAND_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, BAND_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, BAND_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, BAND_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, BAND_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, BAND_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, BAND_OP) - } else if (*datatype == MPI_BYTE) { - APPLY_FUNC(a, b, length, uint8_t, BAND_OP) - } else { - xbt_die("Failed to apply BAND_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(BAND_OP) + APPLY_BOOL_OP_LOOP(BAND_OP) + APPLY_END_OP_LOOP(BAND_OP) } static void bor_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, BOR_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, BOR_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, BOR_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, BOR_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, BOR_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, BOR_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, BOR_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, BOR_OP) - } else if (*datatype == MPI_BYTE) { - APPLY_FUNC(a, b, length, uint8_t, BOR_OP) - } else { - xbt_die("Failed to apply BOR_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(BOR_OP) + APPLY_BOOL_OP_LOOP(BOR_OP) + APPLY_END_OP_LOOP(BOR_OP) } static void bxor_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_CHAR) { - APPLY_FUNC(a, b, length, char, BXOR_OP) - } else if (*datatype == MPI_SHORT) { - APPLY_FUNC(a, b, length, short, BXOR_OP) - } else if (*datatype == MPI_INT) { - APPLY_FUNC(a, b, length, int, BXOR_OP) - } else if (*datatype == MPI_LONG) { - APPLY_FUNC(a, b, length, long, BXOR_OP) - } else if (*datatype == MPI_UNSIGNED_SHORT) { - APPLY_FUNC(a, b, length, unsigned short, BXOR_OP) - } else if (*datatype == MPI_UNSIGNED) { - APPLY_FUNC(a, b, length, unsigned int, BXOR_OP) - } else if (*datatype == MPI_UNSIGNED_LONG) { - APPLY_FUNC(a, b, length, unsigned long, BXOR_OP) - } else if (*datatype == MPI_UNSIGNED_CHAR) { - APPLY_FUNC(a, b, length, unsigned char, BXOR_OP) - } else if (*datatype == MPI_BYTE) { - APPLY_FUNC(a, b, length, uint8_t, BXOR_OP) - } else { - xbt_die("Failed to apply BXOR_OP to type %s", (*datatype)->name); - } + APPLY_BASIC_OP_LOOP(BXOR_OP) + APPLY_BOOL_OP_LOOP(BXOR_OP) + APPLY_END_OP_LOOP(BXOR_OP) } static void minloc_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_FLOAT_INT) { - APPLY_FUNC(a, b, length, float_int, MINLOC_OP) - } else if (*datatype == MPI_LONG_INT) { - APPLY_FUNC(a, b, length, long_int, MINLOC_OP) - } else if (*datatype == MPI_DOUBLE_INT) { - APPLY_FUNC(a, b, length, double_int, MINLOC_OP) - } else if (*datatype == MPI_SHORT_INT) { - APPLY_FUNC(a, b, length, short_int, MINLOC_OP) - } else if (*datatype == MPI_2LONG) { - APPLY_FUNC(a, b, length, long_long, MINLOC_OP) - } else if (*datatype == MPI_2INT) { - APPLY_FUNC(a, b, length, int_int, MINLOC_OP) - } else if (*datatype == MPI_LONG_DOUBLE_INT) { - APPLY_FUNC(a, b, length, long_double_int, MINLOC_OP) - } else if (*datatype == MPI_2FLOAT) { - APPLY_FUNC(a, b, length, float_float, MINLOC_OP) - } else if (*datatype == MPI_2DOUBLE) { - APPLY_FUNC(a, b, length, double_double, MINLOC_OP) - } else { - xbt_die("Failed to apply MINLOC_OP to type %s", (*datatype)->name); - } + APPLY_PAIR_OP_LOOP(MINLOC_OP) + APPLY_END_OP_LOOP(MINLOC_OP) } static void maxloc_func(void *a, void *b, int *length, MPI_Datatype * datatype) { - if (*datatype == MPI_FLOAT_INT) { - APPLY_FUNC(a, b, length, float_int, MAXLOC_OP) - } else if (*datatype == MPI_LONG_INT) { - APPLY_FUNC(a, b, length, long_int, MAXLOC_OP) - } else if (*datatype == MPI_DOUBLE_INT) { - APPLY_FUNC(a, b, length, double_int, MAXLOC_OP) - } else if (*datatype == MPI_SHORT_INT) { - APPLY_FUNC(a, b, length, short_int, MAXLOC_OP) - } else if (*datatype == MPI_2LONG) { - APPLY_FUNC(a, b, length, long_long, MAXLOC_OP) - } else if (*datatype == MPI_2INT) { - APPLY_FUNC(a, b, length, int_int, MAXLOC_OP) - } else if (*datatype == MPI_LONG_DOUBLE_INT) { - APPLY_FUNC(a, b, length, long_double_int, MAXLOC_OP) - } else if (*datatype == MPI_2FLOAT) { - APPLY_FUNC(a, b, length, float_float, MAXLOC_OP) - } else if (*datatype == MPI_2DOUBLE) { - APPLY_FUNC(a, b, length, double_double, MAXLOC_OP) - } else { - xbt_die("Failed to apply MAXLOC_OP to type %s", (*datatype)->name); - } + APPLY_PAIR_OP_LOOP(MAXLOC_OP) + APPLY_END_OP_LOOP(MAXLOC_OP) } static void replace_func(void *a, void *b, int *length, MPI_Datatype * datatype) @@ -1514,7 +1344,7 @@ static void replace_func(void *a, void *b, int *length, MPI_Datatype * datatype) } #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); @@ -1537,6 +1367,7 @@ MPI_Op smpi_op_new(MPI_User_function * function, bool commute) op = xbt_new(s_smpi_mpi_op_t, 1); op->func = function; op-> is_commute = commute; + op-> is_fortran_op = false; return op; } @@ -1550,7 +1381,13 @@ void smpi_op_destroy(MPI_Op 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; @@ -1560,17 +1397,25 @@ void smpi_op_apply(MPI_Op op, const void *invec, void *inoutvec, int *len, MPI_D smpi_switch_data_segment(smpi_process_index()); } - if(!smpi_process_get_replaying()) - op->func(const_cast(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(&tmp) ); + } + } } int smpi_type_attr_delete(MPI_Datatype type, int keyval){ smpi_type_key_elem elem = static_cast(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast(&keyval), sizeof(int))); - if(elem==NULL) + if(elem==nullptr) return MPI_ERR_ARG; if(elem->delete_fn!=MPI_NULL_DELETE_FN){ - void * value; + void * value = nullptr; int flag; if(smpi_type_attr_get(type, keyval, &value, &flag)==MPI_SUCCESS){ int ret = elem->delete_fn(type, keyval, value, &flag); @@ -1578,7 +1423,7 @@ int smpi_type_attr_delete(MPI_Datatype type, int keyval){ return ret; } } - if(type->attributes==NULL) + if(type->attributes==nullptr) return MPI_ERR_ARG; xbt_dict_remove_ext(type->attributes, reinterpret_cast(&keyval), sizeof(int)); @@ -1588,50 +1433,48 @@ int smpi_type_attr_delete(MPI_Datatype type, int keyval){ int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag){ smpi_type_key_elem elem = static_cast(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast(&keyval), sizeof(int))); - if(elem==NULL) + if(elem==nullptr) return MPI_ERR_ARG; - xbt_ex_t ex; - if(type->attributes==NULL){ + if(type->attributes==nullptr){ *flag=0; return MPI_SUCCESS; } - TRY { + try { *static_cast(attr_value) = xbt_dict_get_ext(type->attributes, reinterpret_cast(&keyval), sizeof(int)); *flag=1; } - CATCH(ex) { + catch (xbt_ex& ex) { *flag=0; - xbt_ex_free(ex); } return MPI_SUCCESS; } int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value){ - if(smpi_type_keyvals==NULL) - smpi_type_keyvals = xbt_dict_new(); + if(smpi_type_keyvals==nullptr) + smpi_type_keyvals = xbt_dict_new_homogeneous(nullptr); smpi_type_key_elem elem = static_cast(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast(&keyval), sizeof(int))); - if(elem==NULL) + if(elem==nullptr) return MPI_ERR_ARG; int flag; - void* value; + void* value = nullptr; smpi_type_attr_get(type, keyval, &value, &flag); if(flag!=0 && elem->delete_fn!=MPI_NULL_DELETE_FN){ int ret = elem->delete_fn(type, keyval, value, &flag); if(ret!=MPI_SUCCESS) return ret; } - if(type->attributes==NULL) - type->attributes=xbt_dict_new(); + if(type->attributes==nullptr) + type->attributes = xbt_dict_new_homogeneous(nullptr); - xbt_dict_set_ext(type->attributes, reinterpret_cast(&keyval), sizeof(int), attr_value, NULL); + xbt_dict_set_ext(type->attributes, reinterpret_cast(&keyval), sizeof(int), attr_value, nullptr); return MPI_SUCCESS; } int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state){ - if(smpi_type_keyvals==NULL) - smpi_type_keyvals = xbt_dict_new(); + if(smpi_type_keyvals==nullptr) + smpi_type_keyvals = xbt_dict_new_homogeneous(nullptr); smpi_type_key_elem value = (smpi_type_key_elem) xbt_new0(s_smpi_mpi_type_key_elem_t,1); @@ -1639,7 +1482,7 @@ int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delet value->delete_fn=delete_fn; *keyval = type_keyval_id; - xbt_dict_set_ext(smpi_type_keyvals,reinterpret_cast(keyval), sizeof(int),reinterpret_cast(value), NULL); + xbt_dict_set_ext(smpi_type_keyvals,reinterpret_cast(keyval), sizeof(int),reinterpret_cast(value), nullptr); type_keyval_id++; return MPI_SUCCESS; }