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

MPI standard state that MPI_LONG_LONG and MPI_LONG_LONG_INT are synonyms. Thanks to

Просмотр исходного кода 
Martin audet for finding out this one.

This commit was SVN r9699.
Этот коммит содержится в:
George Bosilca 2006-04-24 21:24:10 +00:00
родитель e57300da4c
Коммит a297a7ae67
11 изменённых файлов: 33 добавлений и 56 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
ompi/datatype/convertor.c
Просмотреть файл

@ -126,7 +126,6 @@ ompi_convertor_master_t* ompi_convertor_find_or_create_master( uint32_t remote_a
if( ompi_arch_checkmask( &master->remote_arch, OMPI_ARCH_LONGIS64 ) ) {
remote_sizes[DT_LONG] = 8;
remote_sizes[DT_UNSIGNED_LONG] = 8;
remote_sizes[DT_LONG_LONG] = 8;
remote_sizes[DT_LONG_LONG_INT] = 8;
remote_sizes[DT_UNSIGNED_LONG_LONG] = 8;
}

1
ompi/datatype/copy_functions.c
Просмотреть файл

@ -219,7 +219,6 @@ conversion_fct_t ompi_ddt_copy_functions[DT_MAX_PREDEFINED] = {
(conversion_fct_t)copy_int, /* DT_UNSIGNED_INT */
(conversion_fct_t)copy_long, /* DT_LONG */
(conversion_fct_t)copy_long, /* DT_UNSIGNED_LONG */
(conversion_fct_t)copy_long_long, /* DT_LONG_LONG */
(conversion_fct_t)copy_long_long, /* DT_LONG_LONG_INT */
(conversion_fct_t)copy_long_long, /* DT_UNSIGNED_LONG_LONG */
(conversion_fct_t)copy_float, /* DT_FLOAT */

1
ompi/datatype/copy_functions_heterogeneous.c
Просмотреть файл

@ -367,7 +367,6 @@ conversion_fct_t ompi_ddt_heterogeneous_copy_functions[DT_MAX_PREDEFINED] = {
(conversion_fct_t) copy_int_heterogeneous, /* DT_UNSIGNED_INT */
(conversion_fct_t) copy_long_heterogeneous, /* DT_LONG */
(conversion_fct_t) copy_long_heterogeneous, /* DT_UNSIGNED_LONG */
(conversion_fct_t) copy_long_long_heterogeneous, /* DT_LONG_LONG */
(conversion_fct_t) copy_long_long_heterogeneous, /* DT_LONG_LONG_INT */
(conversion_fct_t) copy_long_long_heterogeneous, /* DT_UNSIGNED_LONG_LONG */
(conversion_fct_t) copy_float_heterogeneous, /* DT_FLOAT */

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

@ -49,7 +49,7 @@ OMPI_DECLSPEC extern ompi_pointer_array_t *ompi_datatype_f_to_c_table;
/* if there are more basic datatypes than the number of bytes in the int type
* the bdt_used field of the data description struct should be changed to long.
*/
#define DT_MAX_PREDEFINED 0x2B
#define DT_MAX_PREDEFINED 0x2A
/* flags for the datatypes. */
#define DT_FLAG_DESTROYED 0x0001 /**< user destroyed but some other layers still have a reference */

57
ompi/datatype/datatype_internal.h
Просмотреть файл

@ -90,44 +90,43 @@ static inline void DUMP( char* fmt, ... )
#define DT_UNSIGNED_INT 0x0C
#define DT_LONG 0x0D
#define DT_UNSIGNED_LONG 0x0E
#define DT_LONG_LONG 0x0F
#define DT_LONG_LONG_INT 0x10
#define DT_UNSIGNED_LONG_LONG 0x11
#define DT_FLOAT 0x12
#define DT_DOUBLE 0x13
#define DT_LONG_DOUBLE 0x14
#define DT_PACKED 0x15
#define DT_WCHAR 0x16
#define DT_CXX_BOOL 0x17
#define DT_LOGIC 0x18
#define DT_INTEGER 0x19
#define DT_REAL 0x1A
#define DT_DBLPREC 0x1B
#define DT_LONG_LONG_INT 0x0F
#define DT_UNSIGNED_LONG_LONG 0x10
#define DT_FLOAT 0x11
#define DT_DOUBLE 0x12
#define DT_LONG_DOUBLE 0x13
#define DT_PACKED 0x14
#define DT_WCHAR 0x15
#define DT_CXX_BOOL 0x16
#define DT_LOGIC 0x17
#define DT_INTEGER 0x18
#define DT_REAL 0x19
#define DT_DBLPREC 0x1A
/*
* This is not a datatype. It contain the number of basic datatypes.
*/
#define DT_MAX_BASIC 0x1C
#define DT_MAX_BASIC 0x1B
/*
* Derived datatypes supposely contiguous
*/
#define DT_COMPLEX_FLOAT 0x1C
#define DT_COMPLEX_DOUBLE 0x1D
#define DT_COMPLEX_LONG_DOUBLE 0x1E
#define DT_2INT 0x1F
#define DT_2INTEGER 0x20
#define DT_2REAL 0x21
#define DT_2DBLPREC 0x22
#define DT_2COMPLEX 0x23
#define DT_2DOUBLE_COMPLEX 0x24
#define DT_COMPLEX_FLOAT 0x1B
#define DT_COMPLEX_DOUBLE 0x1C
#define DT_COMPLEX_LONG_DOUBLE 0x1D
#define DT_2INT 0x1E
#define DT_2INTEGER 0x1F
#define DT_2REAL 0x20
#define DT_2DBLPREC 0x21
#define DT_2COMPLEX 0x22
#define DT_2DOUBLE_COMPLEX 0x23
/*
* Derived datatypes which will definitively be non contiguous on some architectures.
*/
#define DT_FLOAT_INT 0x25
#define DT_DOUBLE_INT 0x26
#define DT_LONG_DOUBLE_INT 0x27
#define DT_LONG_INT 0x28
#define DT_SHORT_INT 0x29
#define DT_UNAVAILABLE 0x2A
#define DT_FLOAT_INT 0x24
#define DT_DOUBLE_INT 0x25
#define DT_LONG_DOUBLE_INT 0x26
#define DT_LONG_INT 0x27
#define DT_SHORT_INT 0x28
#define DT_UNAVAILABLE 0x29
/* If the number of basic datatype should change update
* DT_MAX_PREDEFINED in datatype.h
*/

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

@ -947,7 +947,7 @@ int main( int argc, char* argv[] )
ompi_ddt_add( pdt2, ompi_ddt_basicDatatypes[DT_INT], 1, 0, -1 );
ompi_ddt_add( pdt2, pdt3, 3, sizeof(int) * 1, -1 );
ompi_ddt_add( pdt1, ompi_ddt_basicDatatypes[DT_LONG_LONG], 5, 0, -1 );
ompi_ddt_add( pdt1, ompi_ddt_basicDatatypes[DT_LONG_LONG_INT], 5, 0, -1 );
ompi_ddt_add( pdt1, ompi_ddt_basicDatatypes[DT_LONG_DOUBLE], 2, sizeof(long long) * 5, -1 );
printf( ">>--------------------------------------------<<\n" );

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

@ -54,7 +54,7 @@
* MPI_INTEGER2 2
* MPI_INTEGER4 4
* MPI_INTEGER8 8
* MPI_LONG_LONG 8
* MPI_LONG_LONG_INT 8
* MPI_UNSIGNED_LONG_LONG 8
* MPI_REAL4 4
* MPI_REAL8 8

5
ompi/datatype/dt_module.c
Просмотреть файл

@ -97,11 +97,9 @@ OMPI_DECLSPEC ompi_datatype_t ompi_mpi_unsigned = INIT_BASIC_DATA( unsigned int,
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_long = INIT_BASIC_DATA( long, OMPI_ALIGNMENT_LONG, LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT );
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_unsigned_long = INIT_BASIC_DATA( unsigned long, OMPI_ALIGNMENT_LONG, UNSIGNED_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT );
#if HAVE_LONG_LONG
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_long_long = INIT_BASIC_DATA( long long, OMPI_ALIGNMENT_LONG_LONG, LONG_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT );
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_long_long_int = INIT_BASIC_DATA( long long, OMPI_ALIGNMENT_LONG_LONG, LONG_LONG_INT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT );
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_unsigned_long_long = INIT_BASIC_DATA( unsigned long long, OMPI_ALIGNMENT_LONG_LONG, UNSIGNED_LONG_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT );
#else
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_long_long = INIT_UNAVAILABLE_DATA( LONG_LONG );
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_long_long_int = INIT_UNAVAILABLE_DATA( LONG_LONG_INT );
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_unsigned_long_long = INIT_UNAVAILABLE_DATA( UNIGNED_LONG_LONG );
#endif /* HAVE_LONG_LONG */
@ -238,7 +236,6 @@ const ompi_datatype_t* ompi_ddt_basicDatatypes[DT_MAX_PREDEFINED] = {
&ompi_mpi_unsigned,
&ompi_mpi_long,
&ompi_mpi_unsigned_long,
&ompi_mpi_long_long,
&ompi_mpi_long_long_int,
&ompi_mpi_unsigned_long_long,
&ompi_mpi_float,
@ -482,7 +479,7 @@ int32_t ompi_ddt_init( void )
ompi_mpi_integer2.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer4, "MPI_INTEGER4", &ompi_mpi_int );
ompi_mpi_integer4.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8, "MPI_INTEGER8", &ompi_mpi_long_long );
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8, "MPI_INTEGER8", &ompi_mpi_long_long_int );
ompi_mpi_integer8.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer16, "MPI_INTEGER16", &ompi_mpi_unavailable );
ompi_mpi_integer16.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;

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

@ -67,12 +67,10 @@ OBJ_CLASS_INSTANCE(ompi_op_t, opal_object_t,
#ifdef HAVE_LONG_LONG
#define C_INTEGER_LONG_LONG(name) \
{ ompi_mpi_op_##name##_long_long }, /* OMPI_OP_TYPE_LONG_LONG */ \
{ ompi_mpi_op_##name##_long_long_int }, /* OMPI_OP_TYPE_LONG_LONG_INT */ \
{ ompi_mpi_op_##name##_unsigned_long_long } /* OMPI_OP_TYPE_UNSIGNED_LONG_LONG */
#else
#define C_INTEGER_LONG_LONG(name) \
{ NULL }, /* OMPI_OP_TYPE_LONG_LONG */ \
{ NULL }, /* OMPI_OP_TYPE_LONG_LONG_INT */ \
{ NULL } /* OMPI_OP_TYPE_UNSIGNED_LONG_LONG */
#endif
@ -96,7 +94,6 @@ OBJ_CLASS_INSTANCE(ompi_op_t, opal_object_t,
{ NULL }, /* OMPI_OP_TYPE_UNSIGNED_SHORT */ \
{ NULL }, /* OMPI_OP_TYPE_UNSIGNED */ \
{ NULL }, /* OMPI_OP_TYPE_UNSIGNED_LONG */ \
{ NULL }, /* OMPI_OP_TYPE_LONG_LONG */ \
{ NULL }, /* OMPI_OP_TYPE_LONG_LONG_ING */ \
{ NULL } /* OMPI_OP_TYPE_UNSIGNED_LONG_LONG */
@ -607,7 +604,6 @@ int ompi_op_init(void)
ompi_op_ddt_map[DT_UNSIGNED_INT] = OMPI_OP_TYPE_UNSIGNED;
ompi_op_ddt_map[DT_LONG] = OMPI_OP_TYPE_LONG;
ompi_op_ddt_map[DT_UNSIGNED_LONG] = OMPI_OP_TYPE_UNSIGNED_LONG;
ompi_op_ddt_map[DT_LONG_LONG] = OMPI_OP_TYPE_LONG_LONG;
ompi_op_ddt_map[DT_LONG_LONG_INT] = OMPI_OP_TYPE_LONG_LONG_INT;
ompi_op_ddt_map[DT_UNSIGNED_LONG_LONG] = OMPI_OP_TYPE_UNSIGNED_LONG_LONG;
ompi_op_ddt_map[DT_FLOAT] = OMPI_OP_TYPE_FLOAT;

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

@ -93,8 +93,6 @@ enum {
OMPI_OP_TYPE_UNSIGNED_LONG,
/**< C integer: unsigned long */
OMPI_OP_TYPE_LONG_LONG,
/**< C integer: long long (optional) */
OMPI_OP_TYPE_LONG_LONG_INT,
/**< C integer: long long int (optional) */
OMPI_OP_TYPE_UNSIGNED_LONG_LONG,

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

@ -2,7 +2,7 @@
* Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2005 The University of Tennessee and The University
* Copyright (c) 2004-2006 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@ -142,7 +142,6 @@ FUNC_FUNC(max, unsigned, unsigned)
FUNC_FUNC(max, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(max, long_long_int, long long int)
FUNC_FUNC(max, long_long, long long)
FUNC_FUNC(max, unsigned_long_long, unsigned long long)
#endif
/* Fortran integer */
@ -202,7 +201,6 @@ FUNC_FUNC(min, unsigned, unsigned)
FUNC_FUNC(min, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(min, long_long_int, long long int)
FUNC_FUNC(min, long_long, long long)
FUNC_FUNC(min, unsigned_long_long, unsigned long long)
#endif
/* Fortran integer */
@ -259,7 +257,6 @@ OP_FUNC(sum, unsigned, unsigned, +=)
OP_FUNC(sum, unsigned_long, unsigned long, +=)
#if HAVE_LONG_LONG
OP_FUNC(sum, long_long_int, long long int, +=)
OP_FUNC(sum, long_long, long long, +=)
OP_FUNC(sum, unsigned_long_long, unsigned long long, +=)
#endif
/* Fortran integer */
@ -332,7 +329,6 @@ OP_FUNC(prod, unsigned, unsigned, *=)
OP_FUNC(prod, unsigned_long, unsigned long, *=)
#if HAVE_LONG_LONG
OP_FUNC(prod, long_long_int, long long int, +=)
OP_FUNC(prod, long_long, long long, +=)
OP_FUNC(prod, unsigned_long_long, unsigned long long, +=)
#endif
/* Fortran integer */
@ -407,7 +403,6 @@ FUNC_FUNC(land, unsigned, unsigned)
FUNC_FUNC(land, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(land, long_long_int, long long int)
FUNC_FUNC(land, long_long, long long)
FUNC_FUNC(land, unsigned_long_long, unsigned long long)
#endif
/* Logical */
@ -434,7 +429,6 @@ FUNC_FUNC(lor, unsigned, unsigned)
FUNC_FUNC(lor, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(lor, long_long_int, long long int)
FUNC_FUNC(lor, long_long, long long)
FUNC_FUNC(lor, unsigned_long_long, unsigned long long)
#endif
/* Logical */
@ -461,7 +455,6 @@ FUNC_FUNC(lxor, unsigned, unsigned)
FUNC_FUNC(lxor, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(lxor, long_long_int, long long int)
FUNC_FUNC(lxor, long_long, long long)
FUNC_FUNC(lxor, unsigned_long_long, unsigned long long)
#endif
/* Logical */
@ -488,7 +481,6 @@ FUNC_FUNC(band, unsigned, unsigned)
FUNC_FUNC(band, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(band, long_long_int, long long int)
FUNC_FUNC(band, long_long, long long)
FUNC_FUNC(band, unsigned_long_long, unsigned long long)
#endif
/* Fortran integer */
@ -530,7 +522,6 @@ FUNC_FUNC(bor, unsigned, unsigned)
FUNC_FUNC(bor, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(bor, long_long_int, long long int)
FUNC_FUNC(bor, long_long, long long)
FUNC_FUNC(bor, unsigned_long_long, unsigned long long)
#endif
/* Fortran integer */
@ -572,7 +563,6 @@ FUNC_FUNC(bxor, unsigned, unsigned)
FUNC_FUNC(bxor, unsigned_long, unsigned long)
#if HAVE_LONG_LONG
FUNC_FUNC(bxor, long_long_int, long long int)
FUNC_FUNC(bxor, long_long, long long)
FUNC_FUNC(bxor, unsigned_long_long, unsigned long long)
#endif
/* Fortran integer */