- Make the types of the MCA param variables be "int", not "int32_t"
- Separate out the registration of the MCA params into a standalong function that is invoked by ompi_mpi_init() (so that ompi_info can see these params) - Rename the params to "mpi_ddt_*" instead of "datatype_*" so that they fit into the common naming scheme This commit was SVN r8196.
Этот коммит содержится в:
родитель
e5525ad5f8
Коммит
ebd97afdac
@ -120,6 +120,7 @@ typedef struct ompi_datatype_t {
|
||||
|
||||
OBJ_CLASS_DECLARATION( ompi_datatype_t );
|
||||
|
||||
int ompi_ddt_register_params(void);
|
||||
int32_t ompi_ddt_init( void );
|
||||
int32_t ompi_ddt_finalize( void );
|
||||
ompi_datatype_t* ompi_ddt_create( int32_t expectedSize );
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
int32_t ompi_copy_debug = 0;
|
||||
int ompi_copy_debug = 0;
|
||||
#define DO_DEBUG(INST) if( ompi_copy_debug ) { INST }
|
||||
#else
|
||||
#define DO_DEBUG(INST)
|
||||
|
@ -23,9 +23,9 @@
|
||||
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
#include "mca/base/mca_base_param.h"
|
||||
extern int32_t ompi_unpack_debug;
|
||||
extern int32_t ompi_pack_debug;
|
||||
extern int32_t ompi_copy_debug;
|
||||
extern int ompi_unpack_debug;
|
||||
extern int ompi_pack_debug;
|
||||
extern int ompi_copy_debug;
|
||||
#endif /* OMPI_ENABLE_DEBUG */
|
||||
|
||||
extern size_t ompi_datatype_memcpy_block_size;
|
||||
@ -348,6 +348,25 @@ int ompi_ddt_local_sizes[DT_MAX_PREDEFINED];
|
||||
strncpy( (PDATA)->name, MPIDDTNAME, MPI_MAX_OBJECT_NAME ); \
|
||||
} while(0)
|
||||
|
||||
int ompi_ddt_register_params(void)
|
||||
{
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
mca_base_param_reg_int_name( "mpi", "ddt_unpack_debug",
|
||||
"Whether to output debugging information in the ddt unpack functions (nonzero = enabled)",
|
||||
false, false,
|
||||
ompi_unpack_debug, &ompi_unpack_debug );
|
||||
mca_base_param_reg_int_name( "mpi", "ddt_pack_debug",
|
||||
"Whether to output debugging information in the ddt pack functions (nonzero = enabled)",
|
||||
false, false,
|
||||
ompi_pack_debug, &ompi_pack_debug );
|
||||
mca_base_param_reg_int_name( "mpi", "ddt_copy_debug",
|
||||
"Whether to output debugging information in the ddt copy functions (nonzero = enabled)",
|
||||
false, false,
|
||||
ompi_copy_debug, &ompi_copy_debug );
|
||||
#endif /* OMPI_ENABLE_DEBUG */
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
int32_t ompi_ddt_init( void )
|
||||
{
|
||||
int i;
|
||||
@ -537,15 +556,6 @@ int32_t ompi_ddt_init( void )
|
||||
MOOG(cxx_dblcplex);
|
||||
MOOG(cxx_ldblcplex);
|
||||
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
mca_base_param_reg_int_name( "datatype", "unpack_debug", "Non zero lead to output generated by the unpack functions",
|
||||
false, false, 0, &ompi_unpack_debug );
|
||||
mca_base_param_reg_int_name( "datatype", "pack_debug", "Non zero lead to output generated by the pack functions",
|
||||
false, false, 0, &ompi_pack_debug );
|
||||
mca_base_param_reg_int_name( "datatype", "copy_debug", "Non zero lead to output generated by the local copy functions",
|
||||
false, false, 0, &ompi_copy_debug );
|
||||
#endif /* OMPI_ENABLE_DEBUG */
|
||||
|
||||
ompi_ddt_default_convertors_init();
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
int32_t ompi_pack_debug = 0;
|
||||
int ompi_pack_debug = 0;
|
||||
#define DO_DEBUG(INST) if( ompi_pack_debug ) { INST }
|
||||
#else
|
||||
#define DO_DEBUG(INST)
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
int32_t ompi_unpack_debug = 0;
|
||||
int ompi_unpack_debug = 0;
|
||||
#define DO_DEBUG(INST) if( ompi_unpack_debug ) { INST }
|
||||
#else
|
||||
#define DO_DEBUG(INST)
|
||||
|
@ -18,13 +18,15 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/runtime/mpiruntime.h"
|
||||
#include "ompi/runtime/params.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "opal/util/output.h"
|
||||
#include "opal/util/show_help.h"
|
||||
#include "opal/mca/base/mca_base_param.h"
|
||||
#include "ompi/runtime/mpiruntime.h"
|
||||
#include "ompi/runtime/params.h"
|
||||
#include <time.h>
|
||||
|
||||
/*
|
||||
* Global variables
|
||||
@ -141,9 +143,9 @@ int ompi_mpi_register_params(void)
|
||||
true, false,
|
||||
-1, NULL);
|
||||
|
||||
/* All done */
|
||||
/* The ddt engine has a few parameters */
|
||||
|
||||
return OMPI_SUCCESS;
|
||||
return ompi_ddt_register_params();
|
||||
}
|
||||
|
||||
int ompi_show_all_mca_params(int32_t rank, int requested, char *nodename) {
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user