ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Cosmetic changes:

Просмотр исходного кода 
* Update to 4 space tabs where relevant (and some irrelevant white
   space changes)
 * Move a few constants to the left of !=/==
 * Add a few {}'s are one line blocks
 * Use BEGIN/END_C_DECLS
 * Change /**< to /** in a few places

This commit was SVN r20177.
Этот коммит содержится в:
Jeff Squyres 2008-12-31 14:50:54 +00:00
родитель f13ea32830
Коммит a7586bdd90
3 изменённых файлов: 400 добавлений и 376 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

46
ompi/op/op.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -930,23 +930,29 @@ int ompi_op_init(void)
/* Create the intrinsic ops */
if (add_intrinsic(&ompi_mpi_op_null, OMPI_OP_FORTRAN_NULL) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_max, OMPI_OP_FORTRAN_MAX) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_min, OMPI_OP_FORTRAN_MIN) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_sum, OMPI_OP_FORTRAN_SUM) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_prod, OMPI_OP_FORTRAN_PROD) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_land, OMPI_OP_FORTRAN_LAND) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_band, OMPI_OP_FORTRAN_BAND) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_lor, OMPI_OP_FORTRAN_LOR) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_bor, OMPI_OP_FORTRAN_BOR) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_lxor, OMPI_OP_FORTRAN_LXOR) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_bxor, OMPI_OP_FORTRAN_BXOR) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_maxloc,
OMPI_OP_FORTRAN_MAXLOC) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_minloc,
OMPI_OP_FORTRAN_MINLOC) != OMPI_SUCCESS ||
add_intrinsic(&ompi_mpi_op_replace,
OMPI_OP_FORTRAN_REPLACE) != OMPI_SUCCESS) {
if (OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_null,
OMPI_OP_FORTRAN_NULL) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_max, OMPI_OP_FORTRAN_MAX) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_min, OMPI_OP_FORTRAN_MIN) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_sum, OMPI_OP_FORTRAN_SUM) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_prod,
OMPI_OP_FORTRAN_PROD) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_land,
OMPI_OP_FORTRAN_LAND) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_band,
OMPI_OP_FORTRAN_BAND) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_lor, OMPI_OP_FORTRAN_LOR) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_bor, OMPI_OP_FORTRAN_BOR) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_lxor,
OMPI_OP_FORTRAN_LXOR) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_bxor,
OMPI_OP_FORTRAN_BXOR) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_maxloc,
OMPI_OP_FORTRAN_MAXLOC) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_minloc,
OMPI_OP_FORTRAN_MINLOC) ||
OMPI_SUCCESS != add_intrinsic(&ompi_mpi_op_replace,
OMPI_OP_FORTRAN_REPLACE)) {
return OMPI_ERROR;
}
@ -997,9 +1003,9 @@ ompi_op_t *ompi_op_create(bool commute,
/* Create a new object and ensure that it's valid */
new_op = OBJ_NEW(ompi_op_t);
if (NULL == new_op)
if (NULL == new_op) {
goto error;
}
if (OMPI_ERROR == new_op->o_f_to_c_index) {
OBJ_RELEASE(new_op);

214
ompi/op/op.h
Просмотреть файл

@ -11,6 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 UT-Battelle, LLC
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -35,46 +36,44 @@
#include <stdio.h>
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {
#endif
BEGIN_C_DECLS
/**
* Fortran handles; must be [manually set to be] equivalent to the
* values in mpif.h.
*/
enum {
/** Corresponds to Fortran MPI_OP_NULL */
OMPI_OP_FORTRAN_NULL = 0,
/**< Corresponds to Fortran MPI_OP_NULL */
/** Corresponds to Fortran MPI_MAX */
OMPI_OP_FORTRAN_MAX,
/**< Corresponds to Fortran MPI_MAX */
/** Corresponds to Fortran MPI_MIN */
OMPI_OP_FORTRAN_MIN,
/**< Corresponds to Fortran MPI_MIN */
/** Corresponds to Fortran MPI_SUM */
OMPI_OP_FORTRAN_SUM,
/**< Corresponds to Fortran MPI_SUM */
/** Corresponds to Fortran MPI_PROD */
OMPI_OP_FORTRAN_PROD,
/**< Corresponds to Fortran MPI_PROD */
/** Corresponds to Fortran MPI_LAND */
OMPI_OP_FORTRAN_LAND,
/**< Corresponds to Fortran MPI_LAND */
/** Corresponds to Fortran MPI_BAND */
OMPI_OP_FORTRAN_BAND,
/**< Corresponds to Fortran MPI_BAND */
/** Corresponds to Fortran MPI_LOR */
OMPI_OP_FORTRAN_LOR,
/**< Corresponds to Fortran MPI_LOR */
/** Corresponds to Fortran MPI_BOR */
OMPI_OP_FORTRAN_BOR,
/**< Corresponds to Fortran MPI_BOR */
/** Corresponds to Fortran MPI_LXOR */
OMPI_OP_FORTRAN_LXOR,
/**< Corresponds to Fortran MPI_LXOR */
/** Corresponds to Fortran MPI_BXOR */
OMPI_OP_FORTRAN_BXOR,
/**< Corresponds to Fortran MPI_BXOR */
/** Corresponds to Fortran MPI_MAXLOC */
OMPI_OP_FORTRAN_MAXLOC,
/**< Corresponds to Fortran MPI_MAXLOC */
/** Corresponds to Fortran MPI_MINLOC */
OMPI_OP_FORTRAN_MINLOC,
/**< Corresponds to Fortran MPI_MINLOC */
/** Corresponds to Fortran MPI_REPLACE */
OMPI_OP_FORTRAN_REPLACE,
/**< Corresponds to Fortran MPI_REPLACE */
/** Maximum value */
OMPI_OP_FORTRAN_MAX_TYPE
/**< Maximum value */
};
/**
@ -83,104 +82,104 @@ enum {
* MPI-2:4.15, p76-77
*/
enum {
/** C integer: unsigned char */
OMPI_OP_TYPE_UNSIGNED_CHAR,
/**< C integer: unsigned char */
/** C integer: signed char */
OMPI_OP_TYPE_SIGNED_CHAR,
/**< C integer: signed char */
/** C integer: int */
OMPI_OP_TYPE_INT,
/**< C integer: int */
/** C integer: long */
OMPI_OP_TYPE_LONG,
/**< C integer: long */
/** C integer: short */
OMPI_OP_TYPE_SHORT,
/**< C integer: short */
/** C integer: unsigned short */
OMPI_OP_TYPE_UNSIGNED_SHORT,
/**< C integer: unsigned short */
/** C integer: unsigned */
OMPI_OP_TYPE_UNSIGNED,
/**< C integer: unsigned */
/** C integer: unsigned long */
OMPI_OP_TYPE_UNSIGNED_LONG,
/**< C integer: unsigned long */
/** C integer: long long int (optional) */
OMPI_OP_TYPE_LONG_LONG_INT,
/**< C integer: long long int (optional) */
/** C integer: unsigned long long (optional) */
OMPI_OP_TYPE_UNSIGNED_LONG_LONG,
/**< C integer: unsigned long long (optional) */
/** Fortran integer */
OMPI_OP_TYPE_INTEGER,
/**< Fortran integer */
/** Fortran integer*1 */
OMPI_OP_TYPE_INTEGER1,
/**< Fortran integer*1 */
/** Fortran integer*2 */
OMPI_OP_TYPE_INTEGER2,
/**< Fortran integer*2 */
/** Fortran integer*4 */
OMPI_OP_TYPE_INTEGER4,
/**< Fortran integer*4 */
/** Fortran integer*8 */
OMPI_OP_TYPE_INTEGER8,
/**< Fortran integer*8 */
/** Fortran integer*16 */
OMPI_OP_TYPE_INTEGER16,
/**< Fortran integer*16 */
/** Floating point: float */
OMPI_OP_TYPE_FLOAT,
/**< Floating point: float */
/** Floating point: double */
OMPI_OP_TYPE_DOUBLE,
/**< Floating point: double */
/** Floating point: real */
OMPI_OP_TYPE_REAL,
/**< Floating point: real */
/** Floating point: real*2 */
OMPI_OP_TYPE_REAL2,
/**< Floating point: real*2 */
/** Floating point: real*4 */
OMPI_OP_TYPE_REAL4,
/**< Floating point: real*4 */
/** Floating point: real*8 */
OMPI_OP_TYPE_REAL8,
/**< Floating point: real*8 */
/** Floating point: real*16 */
OMPI_OP_TYPE_REAL16,
/**< Floating point: real*16 */
/** Floating point: double precision */
OMPI_OP_TYPE_DOUBLE_PRECISION,
/**< Floating point: double precision */
/** Floating point: long double */
OMPI_OP_TYPE_LONG_DOUBLE,
/**< Floating point: long double */
/** Logical */
OMPI_OP_TYPE_LOGICAL,
/**< Logical */
/** Bool */
OMPI_OP_TYPE_BOOL,
/**< Bool */
/** Complex */
OMPI_OP_TYPE_COMPLEX,
/**< Complex */
/** Double complex */
OMPI_OP_TYPE_DOUBLE_COMPLEX,
/**< Double complex */
/** Complex8 */
OMPI_OP_TYPE_COMPLEX8,
/**< Complex8 */
/** Complex16 */
OMPI_OP_TYPE_COMPLEX16,
/**< Complex16 */
/** Complex32 */
OMPI_OP_TYPE_COMPLEX32,
/**< Complex32 */
/** Byte */
OMPI_OP_TYPE_BYTE,
/**< Byte */
/** 2 location Fortran: 2 real */
OMPI_OP_TYPE_2REAL,
/**< 2 location Fortran: 2 real */
/** 2 location Fortran: 2 double precision */
OMPI_OP_TYPE_2DOUBLE_PRECISION,
/**< 2 location Fortran: 2 double precision */
/** 2 location Fortran: 2 integer */
OMPI_OP_TYPE_2INTEGER,
/**< 2 location Fortran: 2 integer */
/** 2 location C: float int */
OMPI_OP_TYPE_FLOAT_INT,
/**< 2 location C: float int */
/** 2 location C: double int */
OMPI_OP_TYPE_DOUBLE_INT,
/**< 2 location C: double int */
/** 2 location C: long int */
OMPI_OP_TYPE_LONG_INT,
/**< 2 location C: long int */
/** 2 location C: int int */
OMPI_OP_TYPE_2INT,
/**< 2 location C: int int */
/** 2 location C: short int */
OMPI_OP_TYPE_SHORT_INT,
/**< 2 location C: short int */
/** 2 location C: long double int */
OMPI_OP_TYPE_LONG_DOUBLE_INT,
/**< 2 location C: long double int */
/** 2 location C: wchar_t */
OMPI_OP_TYPE_WCHAR,
/**< 2 location C: wchar_t */
/** Maximum type */
OMPI_OP_TYPE_MAX
/**< Maximum type */
};
@ -192,13 +191,16 @@ enum {
* repeated code, but it's better this way (and this typedef will
* never change, so there's not much of a maintenance worry).
*/
typedef void (ompi_op_c_handler_fn_t)(void *, void *, int *, MPI_Datatype *);
typedef void (ompi_op_c_handler_fn_t) (void *, void *, int *,
MPI_Datatype *);
/*
* Three buffer ( two input and one output) function prototype
*/
typedef void (ompi_op_3buff_c_handler_fn_t)(void * restrict , void * restrict,
void * restrict, int *, MPI_Datatype *);
typedef void (ompi_op_3buff_c_handler_fn_t) (void *restrict,
void *restrict,
void *restrict, int *,
MPI_Datatype *);
/**
@ -210,7 +212,9 @@ typedef void (ompi_op_fortran_handler_fn_t)(void *, void *,
* Three buffer (2 input one output) function prototype
*/
typedef void (ompi_op_3buff_fortran_handler_fn_t) (void *restrict,
void * restrict , void * restrict , MPI_Fint *, MPI_Fint *);
void *restrict,
void *restrict,
MPI_Fint *, MPI_Fint *);
/**
@ -221,13 +225,17 @@ typedef void (ompi_op_3buff_fortran_handler_fn_t)(void * restrict,
* ompi_mpi_cxx_op_intercept() function.
*/
typedef void (ompi_op_cxx_handler_fn_t) (void *, void *, int *,
MPI_Datatype *, MPI_User_function *op);
MPI_Datatype *,
MPI_User_function * op);
/*
* Three buffer (two input, one output) function prototype
*/
typedef void (ompi_op_3buff_cxx_handler_fn_t)(void * restrict, void * restrict,
void * restrict, int *, MPI_Datatype *, MPI_User_function *op);
typedef void (ompi_op_3buff_cxx_handler_fn_t) (void *restrict,
void *restrict,
void *restrict, int *,
MPI_Datatype *,
MPI_User_function * op);
/*
@ -257,15 +265,18 @@ typedef void (ompi_op_3buff_cxx_handler_fn_t)(void * restrict, void * restrict,
* Back-end type of MPI_Op
*/
struct ompi_op_t {
/** Parent class, for reference counting */
opal_object_t super;
/**< Parent class, for reference counting */
/** Name, for debugging purposes */
char o_name[MPI_MAX_OBJECT_NAME];
/**< Name, for debugging purposes */
/** Flags about the op */
uint32_t o_flags;
/**< Flags about the op */
/** Array of function pointers, indexed on the operation type.
For non-intrinsice MPI_Op's, only the 0th element will be
meaningful. */
union {
/** C handler function pointer */
ompi_op_c_handler_fn_t *c_fn;
@ -276,13 +287,13 @@ struct ompi_op_t {
an explanation */
ompi_op_cxx_handler_fn_t *cxx_intercept_fn;
} o_func[OMPI_OP_TYPE_MAX];
/**< Array of function pointers, indexed on the operation type. For
non-intrinsice MPI_Op's, only the 0th element will be
meaningful. */
/** Index in Fortran <-> C translation array */
int o_f_to_c_index;
/** Array of three buffer function pointers, indexed on the
operation type. For non-intrinsice MPI_Op's, only the 0th
element will be meaningful. */
union {
/** C handler function pointer */
ompi_op_3buff_c_handler_fn_t *c_fn;
@ -293,9 +304,6 @@ struct ompi_op_t {
an explanation */
ompi_op_3buff_cxx_handler_fn_t *cxx_intercept_fn;
} o_3buff_func[OMPI_OP_TYPE_MAX];
/**< Array of three buffer function pointers, indexed on the operation
type. For non-intrinsice MPI_Op's, only the 0th element will be
meaningful. */
};
/**
@ -459,7 +467,8 @@ int ompi_op_finalize(void);
* wrapper for MPI_OP_CREATE is expected to reset this flag to true
* manually.
*/
ompi_op_t *ompi_op_create(bool commute, ompi_op_fortran_handler_fn_t *func);
ompi_op_t *ompi_op_create(bool commute,
ompi_op_fortran_handler_fn_t * func);
/**
* Mark an MPI_Op as holding a C++ callback function, and cache
@ -467,7 +476,8 @@ ompi_op_t *ompi_op_create(bool commute, ompi_op_fortran_handler_fn_t *func);
* ompi/mpi/cxx/op.c::ompi_mpi_cxx_op_intercept() for a full
* expalantion.
*/
OMPI_DECLSPEC void ompi_op_set_cxx_callback(ompi_op_t *op, MPI_User_function *fn);
OMPI_DECLSPEC void ompi_op_set_cxx_callback(ompi_op_t * op,
MPI_User_function * fn);
/**
* Check to see if an op is intrinsic.
@ -553,17 +563,20 @@ static inline bool ompi_op_is_valid(ompi_op_t *op, ompi_datatype_t *ddt,
NULL == op->o_func[ompi_op_ddt_map[ddt->id]].fort_fn) ||
(0 == (op->o_flags & OMPI_OP_FLAGS_FORTRAN_FUNC) &&
NULL == op->o_func[ompi_op_ddt_map[ddt->id]].c_fn))) {
asprintf(msg, "%s: the reduction operation %s is not defined on the %s datatype",
asprintf(msg,
"%s: the reduction operation %s is not defined on the %s datatype",
func, op->o_name, ddt->name);
return false;
}
} else {
/* Non-intrinsic ddt on intrinsic op */
if ('\0' != ddt->name[0]) {
asprintf(msg, "%s: the reduction operation %s is not defined for non-intrinsic datatypes (attempted with datatype named \"%s\")",
asprintf(msg,
"%s: the reduction operation %s is not defined for non-intrinsic datatypes (attempted with datatype named \"%s\")",
func, op->o_name, ddt->name);
} else {
asprintf(msg, "%s: the reduction operation %s is not defined for non-intrinsic datatypes",
asprintf(msg,
"%s: the reduction operation %s is not defined for non-intrinsic datatypes",
func, op->o_name);
}
return false;
@ -605,8 +618,9 @@ static inline bool ompi_op_is_valid(ompi_op_t *op, ompi_datatype_t *ddt,
* optimization). If you give it an intrinsic op with a datatype that
* is not defined to have that operation, it is likely to seg fault.
*/
static inline void ompi_op_reduce(ompi_op_t *op, void *source, void *target,
int count, ompi_datatype_t *dtype)
static inline void ompi_op_reduce(ompi_op_t * op, void *source,
void *target, int count,
ompi_datatype_t * dtype)
{
MPI_Fint f_dtype, f_count;
@ -630,10 +644,11 @@ static inline void ompi_op_reduce(ompi_op_t *op, void *source, void *target,
f_dtype = OMPI_INT_2_FINT(dtype->d_f_to_c_index);
f_count = OMPI_INT_2_FINT(count);
op->o_func[ompi_op_ddt_map[dtype->id]].fort_fn(source, target,
&f_count, &f_dtype);
&f_count,
&f_dtype);
} else {
op->o_func[ompi_op_ddt_map[dtype->id]].c_fn(source, target, &count,
&dtype);
op->o_func[ompi_op_ddt_map[dtype->id]].c_fn(source, target,
&count, &dtype);
}
}
@ -682,8 +697,9 @@ static inline void ompi_op_reduce(ompi_op_t *op, void *source, void *target,
* optimization). If you give it an intrinsic op with a datatype that
* is not defined to have that operation, it is likely to seg fault.
*/
static inline void ompi_3buff_op_reduce(ompi_op_t *op, void *source1, void *source2,
void *target, int count, ompi_datatype_t *dtype)
static inline void ompi_3buff_op_reduce(ompi_op_t * op, void *source1,
void *source2, void *target,
int count, ompi_datatype_t * dtype)
{
MPI_Fint f_dtype, f_count;
void *restrict src1;
@ -712,10 +728,13 @@ static inline void ompi_3buff_op_reduce(ompi_op_t *op, void *source1, void *sour
if (0 != (op->o_flags & OMPI_OP_FLAGS_FORTRAN_FUNC)) {
f_dtype = OMPI_INT_2_FINT(dtype->d_f_to_c_index);
f_count = OMPI_INT_2_FINT(count);
op->o_3buff_func[ompi_op_ddt_map[dtype->id]].fort_fn(src1, src2 , tgt,
&f_count, &f_dtype);
op->o_3buff_func[ompi_op_ddt_map[dtype->id]].fort_fn(src1,
src2, tgt,
&f_count,
&f_dtype);
} else {
op->o_3buff_func[ompi_op_ddt_map[dtype->id]].c_fn(src1, src2, tgt,&count,
op->o_3buff_func[ompi_op_ddt_map[dtype->id]].c_fn(src1, src2,
tgt, &count,
&dtype);
}
}
@ -728,14 +747,13 @@ static inline void ompi_3buff_op_reduce(ompi_op_t *op, void *source1, void *sour
f_count = OMPI_INT_2_FINT(count);
op->o_3buff_func[0].fort_fn(src1, src2, tgt, &f_count, &f_dtype);
} else if (0 != (op->o_flags & OMPI_OP_FLAGS_CXX_FUNC)) {
op->o_3buff_func[0].cxx_intercept_fn(src1, src2, tgt, &count, &dtype,
op->o_func[1].c_fn);
op->o_3buff_func[0].cxx_intercept_fn(src1, src2, tgt, &count,
&dtype, op->o_func[1].c_fn);
} else {
op->o_3buff_func[0].c_fn(src1, src2, tgt, &count, &dtype);
}
}
#if defined(c_plusplus) || defined(__cplusplus)
}
#endif
END_C_DECLS
#endif /* OMPI_OP_H */

2
ompi/op/op_predefined.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow