X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b63f78dc217b79305cef05bd2200069d3e24475..a4c8f1898670317d0fa33bf1b1a904ea922b78cc:/src/smpi/mpi/smpi_op.cpp diff --git a/src/smpi/mpi/smpi_op.cpp b/src/smpi/mpi/smpi_op.cpp index 53fa2cb6a8..008839bf72 100644 --- a/src/smpi/mpi/smpi_op.cpp +++ b/src/smpi/mpi/smpi_op.cpp @@ -1,19 +1,21 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ +#include "smpi_op.hpp" #include "private.hpp" #include "smpi_datatype.hpp" -#include "smpi_op.hpp" -#include "smpi_process.hpp" +#include "src/smpi/include/smpi_actor.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_op, smpi, "Logging specific to SMPI (op)"); #define MAX_OP(a, b) (b) = (a) < (b) ? (b) : (a) #define MIN_OP(a, b) (b) = (a) < (b) ? (a) : (b) #define SUM_OP(a, b) (b) += (a) +#define SUM_OP_COMPLEX(a, b) {(b.value) += (a.value);(b.index) += (a.index);} #define PROD_OP(a, b) (b) *= (a) +#define PROD_OP_COMPLEX(a, b) {(b.value) *= (a.value);(b.index) *= (a.index);} #define LAND_OP(a, b) (b) = (a) && (b) #define LOR_OP(a, b) (b) = (a) || (b) #define LXOR_OP(a, b) (b) = (not(a) && (b)) || ((a) && not(b)) @@ -66,7 +68,9 @@ 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) +APPLY_OP_LOOP(MPI_INTEGER8, int64_t,op)\ +APPLY_OP_LOOP(MPI_COUNT, long long,op) + #define APPLY_BOOL_OP_LOOP(op)\ APPLY_OP_LOOP(MPI_C_BOOL, bool,op) @@ -77,8 +81,8 @@ 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) +APPLY_OP_LOOP(MPI_REAL8, double,op)\ +APPLY_OP_LOOP(MPI_REAL16, long double,op) #define APPLY_COMPLEX_OP_LOOP(op)\ APPLY_OP_LOOP(MPI_C_FLOAT_COMPLEX, float _Complex,op)\ @@ -94,11 +98,14 @@ 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());\ +APPLY_OP_LOOP(MPI_2LONG, long_long,op)\ +APPLY_OP_LOOP(MPI_COMPLEX8, float_float,op)\ +APPLY_OP_LOOP(MPI_COMPLEX16, double_double,op)\ +APPLY_OP_LOOP(MPI_COMPLEX32, double_double,op) + +#define APPLY_END_OP_LOOP(op) \ + { \ + xbt_die("Failed to apply " _XBT_STRINGIFY(op) " to type %s", (*datatype)->name()); \ } static void max_func(void *a, void *b, int *length, MPI_Datatype * datatype) @@ -120,6 +127,7 @@ static void sum_func(void *a, void *b, int *length, MPI_Datatype * datatype) APPLY_BASIC_OP_LOOP(SUM_OP) APPLY_FLOAT_OP_LOOP(SUM_OP) APPLY_COMPLEX_OP_LOOP(SUM_OP) + APPLY_PAIR_OP_LOOP(SUM_OP_COMPLEX) APPLY_END_OP_LOOP(SUM_OP) } @@ -128,12 +136,14 @@ static void prod_func(void *a, void *b, int *length, MPI_Datatype * datatype) APPLY_BASIC_OP_LOOP(PROD_OP) APPLY_FLOAT_OP_LOOP(PROD_OP) APPLY_COMPLEX_OP_LOOP(PROD_OP) + APPLY_PAIR_OP_LOOP(PROD_OP_COMPLEX) APPLY_END_OP_LOOP(PROD_OP) } static void land_func(void *a, void *b, int *length, MPI_Datatype * datatype) { APPLY_BASIC_OP_LOOP(LAND_OP) + APPLY_FLOAT_OP_LOOP(LAND_OP) APPLY_BOOL_OP_LOOP(LAND_OP) APPLY_END_OP_LOOP(LAND_OP) } @@ -141,6 +151,7 @@ static void land_func(void *a, void *b, int *length, MPI_Datatype * datatype) static void lor_func(void *a, void *b, int *length, MPI_Datatype * datatype) { APPLY_BASIC_OP_LOOP(LOR_OP) + APPLY_FLOAT_OP_LOOP(LOR_OP) APPLY_BOOL_OP_LOOP(LOR_OP) APPLY_END_OP_LOOP(LOR_OP) } @@ -148,6 +159,7 @@ static void lor_func(void *a, void *b, int *length, MPI_Datatype * datatype) static void lxor_func(void *a, void *b, int *length, MPI_Datatype * datatype) { APPLY_BASIC_OP_LOOP(LXOR_OP) + APPLY_FLOAT_OP_LOOP(LXOR_OP) APPLY_BOOL_OP_LOOP(LXOR_OP) APPLY_END_OP_LOOP(LXOR_OP) } @@ -190,14 +202,14 @@ static void replace_func(void *a, void *b, int *length, MPI_Datatype * datatype) memcpy(b, a, *length * (*datatype)->size()); } -static void no_func(void *a, void *b, int *length, MPI_Datatype * datatype) +static void no_func(void*, void*, int*, MPI_Datatype*) { /* obviously a no-op */ } -#define CREATE_MPI_OP(name, func) \ - static SMPI_Op mpi_##name (&(func) /* func */, true ); \ -MPI_Op name = &mpi_##name; +#define CREATE_MPI_OP(name, func) \ + static SMPI_Op _XBT_CONCAT(mpi_, name)(&(func) /* func */, true, true); \ + MPI_Op name = &_XBT_CONCAT(mpi_, name); CREATE_MPI_OP(MPI_MAX, max_func); CREATE_MPI_OP(MPI_MIN, min_func); @@ -217,43 +229,23 @@ CREATE_MPI_OP(MPI_NO_OP, no_func); namespace simgrid{ namespace smpi{ -Op::Op(MPI_User_function * function, bool commutative) : func_(function), is_commutative_(commutative) +void Op::apply(const void* invec, void* inoutvec, const int* len, MPI_Datatype datatype) { - is_fortran_op_ = false; -} - -bool Op::is_commutative() -{ - return is_commutative_; -} - -bool Op::is_fortran_op() -{ - return is_fortran_op_; -} - -void Op::set_fortran_op() -{ - //tell that we were created from fortran, so we need to translate the type to fortran when called - is_fortran_op_ = true; -} - -void Op::apply(void *invec, void *inoutvec, int *len, MPI_Datatype datatype) -{ - if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){//we need to switch as the called function may silently touch global variables + if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { + // we need to switch as the called function may silently touch global variables XBT_DEBUG("Applying operation, switch to the right data frame "); - smpi_switch_data_segment(simgrid::s4u::Actor::self()->getPid()); + smpi_switch_data_segment(simgrid::s4u::Actor::self()); } if (not smpi_process()->replaying() && *len > 0) { if (not is_fortran_op_) - this->func_(invec, inoutvec, len, &datatype); + this->func_(const_cast(invec), inoutvec, const_cast(len), &datatype); else{ XBT_DEBUG("Applying operation of length %d from %p and from/to %p", *len, invec, inoutvec); int tmp = datatype->c2f(); /* Unfortunately, the C and Fortran version of the MPI standard do not agree on the type here, thus the reinterpret_cast. */ - this->func_(invec, inoutvec, len, reinterpret_cast(&tmp) ); + this->func_(const_cast(invec), inoutvec, const_cast(len), reinterpret_cast(&tmp)); } } } @@ -262,5 +254,17 @@ Op* Op::f2c(int id){ return static_cast(F2C::f2c(id)); } +void Op::ref(){ + refcount_++; +} + +void Op::unref(MPI_Op* op){ + if((*op)!=MPI_OP_NULL){ + (*op)->refcount_--; + if((*op)->refcount_==0 && (*op)->predefined_==false) + delete(*op); + } +} + } }