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

Fixes trac:1392, #1400

Просмотр исходного кода 
* add "register" function to mca_base_component_t
   * converted coll:basic and paffinity:linux and paffinity:solaris to
     use this function
   * we'll convert the rest over time (I'll file a ticket once all
     this is committed)
 * add 32 bytes of "reserved" space to the end of mca_base_component_t
   and mca_base_component_data_2_0_0_t to make future upgrades
   [slightly] easier
   * new mca_base_component_t size: 196 bytes
   * new mca_base_component_data_2_0_0_t size: 36 bytes
 * MCA base version bumped to v2.0
   * '''We now refuse to load components that are not MCA v2.0.x'''
 * all MCA frameworks versions bumped to v2.0
 * be a little more explicit about version numbers in the MCA base
   * add big comment in mca.h about versioning philosophy

This commit was SVN r19073.

The following Trac tickets were found above:
  Ticket 1392 --> https://svn.open-mpi.org/trac/ompi/ticket/1392
Этот коммит содержится в:
Jeff Squyres 2008-07-28 22:40:57 +00:00
родитель a7c79558ad
Коммит 0af7ac53f2
340 изменённых файлов: 1391 добавлений и 1841 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
ompi/communicator/comm.c
Просмотреть файл

@ -64,13 +64,13 @@ static int ompi_comm_fill_rest (ompi_communicator_t *comm,
typedef int ompi_comm_allgatherfct (void* inbuf, int incount, MPI_Datatype intype,
void* outbuf, int outcount, MPI_Datatype outtype,
ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *data);
mca_coll_base_module_t *data);
static int ompi_comm_allgather_emulate_intra (void* inbuf, int incount, MPI_Datatype intype,
void* outbuf, int outcount,
MPI_Datatype outtype,
ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *data);
mca_coll_base_module_t *data);
static int ompi_comm_copy_topo (ompi_communicator_t *oldcomm,
ompi_communicator_t *newcomm);
@ -887,7 +887,7 @@ static int ompi_comm_allgather_emulate_intra( void *inbuf, int incount,
MPI_Datatype intype, void* outbuf,
int outcount, MPI_Datatype outtype,
ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *data)
mca_coll_base_module_t *data)
{
int rank, size, rsize, i, rc;
int *tmpbuf=NULL;

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

@ -235,7 +235,7 @@ static inline int memchecker_comm(MPI_Comm comm)
opal_memchecker_base_isdefined (&comm->c_coll.coll_scatter, sizeof(mca_coll_base_module_scatter_fn_t));
opal_memchecker_base_isdefined (&comm->c_coll.coll_scatterv, sizeof(mca_coll_base_module_scatterv_fn_t));
opal_memchecker_base_isdefined (&comm->c_coll_selected_component, sizeof(const mca_coll_base_component_1_0_0_t *));
opal_memchecker_base_isdefined (&comm->c_coll_selected_component, sizeof(const mca_coll_base_component_2_0_0_t *));
opal_memchecker_base_isdefined (&comm->c_coll_selected_module, sizeof(const mca_coll_base_module_1_0_0_t *));
/* Somehow, this often shows up in petsc with comm_dup'ed communicators*/
/* opal_memchecker_base_isdefined (&comm->c_coll_selected_data, sizeof(struct mca_coll_base_comm_t *)); */

16
ompi/mca/allocator/allocator.h
Просмотреть файл

@ -132,10 +132,10 @@ typedef struct mca_allocator_base_module_t*
* The data structure provided by each component to the framework which
* describes the component.
*/
struct mca_allocator_base_component_1_0_0_t {
struct mca_allocator_base_component_2_0_0_t {
mca_base_component_t allocator_version;
/**< The version of the component */
mca_base_component_data_1_0_0_t allocator_data;
mca_base_component_data_t allocator_data;
/**< The component metadata */
mca_allocator_base_component_init_fn_t allocator_init;
/**< The component initialization function. */
@ -144,16 +144,14 @@ struct mca_allocator_base_component_1_0_0_t {
/**
* Convenience typedef.
*/
typedef struct mca_allocator_base_component_1_0_0_t mca_allocator_base_component_t;
typedef struct mca_allocator_base_component_2_0_0_t mca_allocator_base_component_t;
/**
* Macro for use in components that are of type allocator v1.0.0
* Macro for use in components that are of type allocator
*/
#define MCA_ALLOCATOR_BASE_VERSION_1_0_0 \
/* allocator v1.0 is chained to MCA v1.0 */ \
MCA_BASE_VERSION_1_0_0, \
/* allocator v1.0 */ \
"allocator", 1, 0, 0
#define MCA_ALLOCATOR_BASE_VERSION_2_0_0 \
MCA_BASE_VERSION_2_0_0, \
"allocator", 2, 0, 0
/**
* The output integer used for the mca base

8
ompi/mca/allocator/basic/allocator_basic.c
Просмотреть файл

@ -31,10 +31,7 @@ mca_allocator_base_component_t mca_allocator_basic_component = {
about the module itself */
{
/* Indicate that we are a allocator v1.0.0 module (which also implies a
specific MCA version) */
MCA_ALLOCATOR_BASE_VERSION_1_0_0,
MCA_ALLOCATOR_BASE_VERSION_2_0_0,
"basic", /* MCA module name */
OMPI_MAJOR_VERSION,
@ -43,9 +40,6 @@ mca_allocator_base_component_t mca_allocator_basic_component = {
mca_allocator_basic_component_open, /* module open */
mca_allocator_basic_component_close /* module close */
},
/* Next the MCA v1.0.0 module meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT

8
ompi/mca/allocator/bucket/allocator_bucket.c
Просмотреть файл

@ -110,10 +110,7 @@ mca_allocator_base_component_t mca_allocator_bucket_component = {
about the module itself */
{
/* Indicate that we are a allocator v1.0.0 module (which also implies a
specific MCA version) */
MCA_ALLOCATOR_BASE_VERSION_1_0_0,
MCA_ALLOCATOR_BASE_VERSION_2_0_0,
"bucket", /* MCA module name */
OMPI_MAJOR_VERSION,
@ -122,9 +119,6 @@ mca_allocator_base_component_t mca_allocator_bucket_component = {
mca_allocator_bucket_module_open, /* module open */
mca_allocator_bucket_module_close /* module close */
},
/* Next the MCA v1.0.0 module meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT

18
ompi/mca/bml/bml.h
Просмотреть файл

@ -431,13 +431,13 @@ typedef int (*mca_bml_base_module_progress_fn_t)(void);
* and component open/close/init functions.
*/
struct mca_bml_base_component_1_0_0_t {
struct mca_bml_base_component_2_0_0_t {
mca_base_component_t bml_version;
mca_base_component_data_1_0_0_t bml_data;
mca_base_component_data_t bml_data;
mca_bml_base_component_init_fn_t bml_init;
};
typedef struct mca_bml_base_component_1_0_0_t mca_bml_base_component_1_0_0_t;
typedef struct mca_bml_base_component_1_0_0_t mca_bml_base_component_t;
typedef struct mca_bml_base_component_2_0_0_t mca_bml_base_component_2_0_0_t;
typedef struct mca_bml_base_component_2_0_0_t mca_bml_base_component_t;
/*
@ -609,12 +609,10 @@ struct mca_bml_base_module_t {
typedef struct mca_bml_base_module_t mca_bml_base_module_t;
/*
* Macro for use in modules that are of type bml v1.0.0
* Macro for use in modules that are of type bml
*/
#define MCA_BML_BASE_VERSION_1_0_0 \
/* v1.0 is chained to MCA v1.0 */ \
MCA_BASE_VERSION_1_0_0, \
/* bml v1.0 */ \
"bml", 1, 0, 0
#define MCA_BML_BASE_VERSION_2_0_0 \
MCA_BASE_VERSION_2_0_0, \
"bml", 2, 0, 0
#endif /* OMPI_MCA_BML_H */

2
ompi/mca/bml/r2/bml_r2.h
Просмотреть файл

@ -51,7 +51,7 @@ struct mca_bml_r2_module_t {
typedef struct mca_bml_r2_module_t mca_bml_r2_module_t;
OMPI_DECLSPEC extern mca_bml_base_component_1_0_0_t mca_bml_r2_component;
OMPI_DECLSPEC extern mca_bml_base_component_2_0_0_t mca_bml_r2_component;
extern mca_bml_r2_module_t mca_bml_r2;
int mca_bml_r2_component_open(void);

9
ompi/mca/bml/r2/bml_r2_component.c
Просмотреть файл

@ -27,15 +27,14 @@
#include "bml_r2.h"
mca_bml_base_component_1_0_0_t mca_bml_r2_component = {
mca_bml_base_component_2_0_0_t mca_bml_r2_component = {
/* First, the mca_base_component_t struct containing meta
information about the component itself */
{
/* Indicate that we are a bml v1.0.0 component (which also implies
a specific MCA version) */
MCA_BML_BASE_VERSION_1_0_0,
MCA_BML_BASE_VERSION_2_0_0,
"r2", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
OMPI_MINOR_VERSION, /* MCA component minor version */
@ -43,8 +42,6 @@ mca_bml_base_component_1_0_0_t mca_bml_r2_component = {
mca_bml_r2_component_open, /* component open */
mca_bml_r2_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT

27
ompi/mca/btl/btl.h
Просмотреть файл

@ -379,14 +379,14 @@ mca_btl_active_message_callback_t mca_btl_base_active_message_trigger[MCA_BTL_TA
* and component open/close/init functions.
*/
struct mca_btl_base_component_1_0_1_t {
struct mca_btl_base_component_2_0_0_t {
mca_base_component_t btl_version;
mca_base_component_data_1_0_0_t btl_data;
mca_base_component_data_t btl_data;
mca_btl_base_component_init_fn_t btl_init;
mca_btl_base_component_progress_fn_t btl_progress;
};
typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_1_0_1_t;
typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_t;
typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_2_0_0_t;
typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_t;
/* add the 1_0_0_t typedef for source compatibility
* we can do this safely because 1_0_0 components are the same as
@ -396,7 +396,8 @@ typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_t;
* just like the new one so long as we check the component version
* prior to invoking the new interface function.
*/
typedef struct mca_btl_base_component_1_0_1_t mca_btl_base_component_1_0_0_t;
typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_1_0_1_t;
typedef struct mca_btl_base_component_2_0_0_t mca_btl_base_component_1_0_0_t;
@ -788,13 +789,19 @@ struct mca_btl_base_module_t {
};
typedef struct mca_btl_base_module_t mca_btl_base_module_t;
/*
* Macro for use in modules that are of type btl v2.0.1
*/
#define MCA_BTL_BASE_VERSION_2_0_0 \
MCA_BASE_VERSION_2_0_0, \
"btl", 2, 0, 0
/*
* Macro for use in modules that are of type btl v1.0.1
* alows older btl sources to compile..
*/
#define MCA_BTL_BASE_VERSION_1_0_1 \
/* coll v1.0 is chained to MCA v1.0 */ \
MCA_BASE_VERSION_1_0_0, \
/* btl v1.0 */ \
MCA_BASE_VERSION_2_0_0, \
"btl", 1, 0, 1
@ -803,9 +810,7 @@ typedef struct mca_btl_base_module_t mca_btl_base_module_t;
* alows older btl sources to compile..
*/
#define MCA_BTL_BASE_VERSION_1_0_0 \
/* coll v1.0 is chained to MCA v1.0 */ \
MCA_BASE_VERSION_1_0_0, \
/* btl v1.0 */ \
MCA_BASE_VERSION_2_0_0, \
"btl", 1, 0, 0
END_C_DECLS

2
ompi/mca/btl/elan/btl_elan.h
Просмотреть файл

@ -41,7 +41,7 @@ BEGIN_C_DECLS
*/
struct mca_btl_elan_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
size_t queue_max_size;
/**< maximum amount of data transfered using the queues */

8
ompi/mca/btl/elan/btl_elan_component.c
Просмотреть файл

@ -48,9 +48,8 @@ mca_btl_elan_component_t mca_btl_elan_component = {
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"elan", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
OMPI_MINOR_VERSION, /* MCA component minor version */
@ -58,9 +57,6 @@ mca_btl_elan_component_t mca_btl_elan_component = {
mca_btl_elan_component_open, /* component open */
mca_btl_elan_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/gm/btl_gm.h
Просмотреть файл

@ -51,7 +51,7 @@ extern "C" {
*/
struct mca_btl_gm_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
size_t gm_num_btls; /**< number of hcas available to the GM component */
size_t gm_max_btls; /**< maximum number of supported hcas */

8
ompi/mca/btl/gm/btl_gm_component.c
Просмотреть файл

@ -63,10 +63,7 @@ mca_btl_gm_component_t mca_btl_gm_component = {
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"gm", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -75,9 +72,6 @@ mca_btl_gm_component_t mca_btl_gm_component = {
mca_btl_gm_component_open, /* component open */
mca_btl_gm_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/mx/btl_mx.h
Просмотреть файл

@ -55,7 +55,7 @@ BEGIN_C_DECLS
*/
struct mca_btl_mx_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
int32_t mx_num_btls;
int32_t mx_max_btls;

8
ompi/mca/btl/mx/btl_mx_component.c
Просмотреть файл

@ -48,10 +48,7 @@ mca_btl_mx_component_t mca_btl_mx_component = {
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"mx", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -60,9 +57,6 @@ mca_btl_mx_component_t mca_btl_mx_component = {
mca_btl_mx_component_open, /* component open */
mca_btl_mx_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/ofud/btl_ofud.h
Просмотреть файл

@ -56,7 +56,7 @@ extern "C" {
*/
struct mca_btl_ud_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
uint32_t max_btls; /**< Maximum number of BTL modules */
uint32_t num_btls; /**< Number of available/initialized BTL modules */

6
ompi/mca/btl/ofud/btl_ofud_component.c
Просмотреть файл

@ -47,9 +47,7 @@ mca_btl_ud_component_t mca_btl_ofud_component = {
/* First, the mca_base_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"ofud", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -58,8 +56,6 @@ mca_btl_ud_component_t mca_btl_ofud_component = {
mca_btl_ud_component_open, /* component open */
mca_btl_ud_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/openib/btl_openib.h
Просмотреть файл

@ -118,7 +118,7 @@ typedef enum {
} btl_openib_receive_queues_source_t;
struct mca_btl_openib_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
int ib_max_btls;
/**< maximum number of devices available to openib component */

8
ompi/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -99,10 +99,7 @@ mca_btl_openib_component_t mca_btl_openib_component = {
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"openib", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -111,9 +108,6 @@ mca_btl_openib_component_t mca_btl_openib_component = {
btl_openib_component_open, /* component open */
btl_openib_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/portals/btl_portals.h
Просмотреть файл

@ -38,7 +38,7 @@
*/
struct mca_btl_portals_component_t {
/* base BTL component */
mca_btl_base_component_1_0_1_t super;
mca_btl_base_component_2_0_0_t super;
/* output channel for debugging. Value settings when using
* output_verbose:

8
ompi/mca/btl/portals/btl_portals_component.c
Просмотреть файл

@ -41,10 +41,7 @@ mca_btl_portals_component_t mca_btl_portals_component = {
/* First, the mca_base_module_t struct containing meta
information about the module itself */
{
/* Indicate that we are a pml v1.0.0 module (which also
implies a specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"portals", /* MCA module name */
OMPI_MAJOR_VERSION, /* MCA module major version */
@ -53,9 +50,6 @@ mca_btl_portals_component_t mca_btl_portals_component = {
mca_btl_portals_component_open, /* module open */
mca_btl_portals_component_close /* module close */
},
/* Next the MCA v1.0.0 module meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/sctp/btl_sctp.h
Просмотреть файл

@ -68,7 +68,7 @@ extern "C" {
*/
struct mca_btl_sctp_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
uint32_t sctp_num_btls; /**< number of hcas available to the SCTP component */
struct mca_btl_sctp_module_t **sctp_btls; /**< array of available BTL modules */
struct mca_btl_sctp_proc_t* sctp_local; /**< local proc struct */

9
ompi/mca/btl/sctp/btl_sctp_component.c
Просмотреть файл

@ -74,10 +74,7 @@ mca_btl_sctp_component_t mca_btl_sctp_component = {
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"sctp", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -86,12 +83,8 @@ mca_btl_sctp_component_t mca_btl_sctp_component = {
mca_btl_sctp_component_open, /* component open */
mca_btl_sctp_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* Whether the component is checkpointable or not */
MCA_BASE_METADATA_PARAM_CHECKPOINT
},

2
ompi/mca/btl/self/btl_self.h
Просмотреть файл

@ -43,7 +43,7 @@ extern "C" {
* Shared Memory (SELF) BTL module.
*/
struct mca_btl_self_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
int free_list_num; /**< initial size of free lists */
int free_list_max; /**< maximum size of free lists */
int free_list_inc; /**< number of elements to alloc when growing free lists */

7
ompi/mca/btl/self/btl_self_component.c
Просмотреть файл

@ -49,9 +49,8 @@ mca_btl_self_component_t mca_btl_self_component = {
/* First, the mca_base_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"self", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
OMPI_MINOR_VERSION, /* MCA component minor version */
@ -59,8 +58,6 @@ mca_btl_self_component_t mca_btl_self_component = {
mca_btl_self_component_open, /* component open */
mca_btl_self_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT

2
ompi/mca/btl/sm/btl_sm.h
Просмотреть файл

@ -71,7 +71,7 @@ typedef struct mca_btl_sm_mem_node_t {
* Shared Memory (SM) BTL module.
*/
struct mca_btl_sm_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
int sm_free_list_num; /**< initial size of free lists */
int sm_free_list_max; /**< maximum size of free lists */
int sm_free_list_inc; /**< number of elements to alloc when growing free lists */

7
ompi/mca/btl/sm/btl_sm_component.c
Просмотреть файл

@ -67,9 +67,8 @@ mca_btl_sm_component_t mca_btl_sm_component = {
/* First, the mca_base_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"sm", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
OMPI_MINOR_VERSION, /* MCA component minor version */
@ -77,8 +76,6 @@ mca_btl_sm_component_t mca_btl_sm_component = {
mca_btl_sm_component_open, /* component open */
mca_btl_sm_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/tcp/btl_tcp.h
Просмотреть файл

@ -57,7 +57,7 @@ extern "C" {
*/
struct mca_btl_tcp_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
uint32_t tcp_addr_count; /**< total number of addresses */
uint32_t tcp_num_btls; /**< number of hcas available to the TCP component */
uint32_t tcp_num_links; /**< number of logical links per physical device */

8
ompi/mca/btl/tcp/btl_tcp_component.c
Просмотреть файл

@ -74,10 +74,7 @@ mca_btl_tcp_component_t mca_btl_tcp_component = {
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"tcp", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -86,9 +83,6 @@ mca_btl_tcp_component_t mca_btl_tcp_component = {
mca_btl_tcp_component_open, /* component open */
mca_btl_tcp_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT

3
ompi/mca/btl/template/btl_template.h
Просмотреть файл

@ -1,4 +1,3 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* University Research and Technology
@ -48,7 +47,7 @@ extern "C" {
*/
struct mca_btl_template_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
uint32_t template_num_btls;
/**< number of hcas available to the TEMPLATE component */

8
ompi/mca/btl/template/btl_template_component.c
Просмотреть файл

@ -41,10 +41,7 @@ mca_btl_template_component_t mca_btl_template_component = {
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_1,
MCA_BTL_BASE_VERSION_2_0_0,
"template", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -53,9 +50,6 @@ mca_btl_template_component_t mca_btl_template_component = {
mca_btl_template_component_open, /* component open */
mca_btl_template_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

2
ompi/mca/btl/udapl/btl_udapl.h
Просмотреть файл

@ -53,7 +53,7 @@ extern "C" {
*/
struct mca_btl_udapl_component_t {
mca_btl_base_component_1_0_1_t super; /**< base BTL component */
mca_btl_base_component_2_0_0_t super; /**< base BTL component */
int32_t udapl_verbosity; /**< report out level, see
"Report Out from uDAPL BTL" below for details. */

7
ompi/mca/btl/udapl/btl_udapl_component.c
Просмотреть файл

@ -68,10 +68,7 @@ mca_btl_udapl_component_t mca_btl_udapl_component = {
/* First, the mca_base_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_BTL_BASE_VERSION_1_0_0,
MCA_BTL_BASE_VERSION_2_0_0,
"udapl", /* MCA component name */
OMPI_MAJOR_VERSION, /* MCA component major version */
@ -80,8 +77,6 @@ mca_btl_udapl_component_t mca_btl_udapl_component = {
mca_btl_udapl_component_open, /* component open */
mca_btl_udapl_component_close /* component close */
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is not checkpoint ready */
MCA_BASE_METADATA_PARAM_NONE

35
ompi/mca/coll/base/coll_base_comm_select.c
Просмотреть файл

@ -12,6 +12,7 @@
* Copyright (c) 2007 Lawrence Livermore National Security, LLC. All
* rights reserved.
* Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -49,7 +50,7 @@ struct avail_coll_t {
opal_list_item_t super;
int ac_priority;
mca_coll_base_module_1_1_0_t *ac_module;
mca_coll_base_module_2_0_0_t *ac_module;
};
typedef struct avail_coll_t avail_coll_t;
@ -62,15 +63,15 @@ static opal_list_t *check_components(opal_list_t *components,
char **names, int num_names);
static int check_one_component(ompi_communicator_t *comm,
const mca_base_component_t *component,
mca_coll_base_module_1_1_0_t **module);
mca_coll_base_module_2_0_0_t **module);
static int query(const mca_base_component_t *component,
ompi_communicator_t *comm, int *priority,
mca_coll_base_module_1_1_0_t **module);
mca_coll_base_module_2_0_0_t **module);
static int query_1_1_0(const mca_coll_base_component_1_1_0_t *coll_component,
static int query_2_0_0(const mca_coll_base_component_2_0_0_t *coll_component,
ompi_communicator_t *comm, int *priority,
mca_coll_base_module_1_1_0_t **module);
mca_coll_base_module_2_0_0_t **module);
/*
* Stuff for the OBJ interface
@ -233,7 +234,7 @@ static opal_list_t *check_components(opal_list_t *components,
int i, priority;
const mca_base_component_t *component;
opal_list_item_t *item, *item2;
mca_coll_base_module_1_1_0_t *module;
mca_coll_base_module_2_0_0_t *module;
bool want_to_check;
opal_list_t *selectable;
avail_coll_t *avail, *avail2;
@ -313,7 +314,7 @@ static opal_list_t *check_components(opal_list_t *components,
*/
static int check_one_component(ompi_communicator_t *comm,
const mca_base_component_t *component,
mca_coll_base_module_1_1_0_t **module)
mca_coll_base_module_2_0_0_t **module)
{
int err;
int priority = -1;
@ -347,18 +348,16 @@ static int check_one_component(ompi_communicator_t *comm,
*/
static int query(const mca_base_component_t *component,
ompi_communicator_t *comm,
int *priority, mca_coll_base_module_1_1_0_t **module)
int *priority, mca_coll_base_module_2_0_0_t **module)
{
/* coll v1.1.0 */
*module = NULL;
if (1 == component->mca_type_major_version &&
1 == component->mca_type_minor_version &&
if (2 == component->mca_type_major_version &&
0 == component->mca_type_minor_version &&
0 == component->mca_type_release_version) {
const mca_coll_base_component_1_1_0_t *coll100 =
(mca_coll_base_component_1_1_0_t *) component;
const mca_coll_base_component_2_0_0_t *coll100 =
(mca_coll_base_component_2_0_0_t *) component;
return query_1_1_0(coll100, comm, priority, module);
return query_2_0_0(coll100, comm, priority, module);
}
/* Unknown coll API version -- return error */
@ -367,11 +366,11 @@ static int query(const mca_base_component_t *component,
}
static int query_1_1_0(const mca_coll_base_component_1_1_0_t *component,
static int query_2_0_0(const mca_coll_base_component_2_0_0_t *component,
ompi_communicator_t *comm, int *priority,
mca_coll_base_module_1_1_0_t **module)
mca_coll_base_module_2_0_0_t **module)
{
mca_coll_base_module_1_1_0_t *ret;
mca_coll_base_module_2_0_0_t *ret;
/* There's currently no need for conversion */

15
ompi/mca/coll/base/coll_base_find_available.c
Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -47,7 +48,7 @@ static int init_query(const mca_base_component_t *ls,
mca_base_component_priority_list_item_t *entry,
bool enable_progress_threads,
bool enable_mpi_threads);
static int init_query_1_1_0(const mca_base_component_t *ls,
static int init_query_2_0_0(const mca_base_component_t *ls,
mca_base_component_priority_list_item_t *entry,
bool enable_progress_threads,
bool enable_mpi_threads);
@ -157,10 +158,10 @@ static int init_query(const mca_base_component_t *m,
/* This component has already been successfully opened. So now query
it. */
if (1 == m->mca_type_major_version &&
1 == m->mca_type_minor_version &&
if (2 == m->mca_type_major_version &&
0 == m->mca_type_minor_version &&
0 == m->mca_type_release_version) {
ret = init_query_1_1_0(m, entry, enable_progress_threads,
ret = init_query_2_0_0(m, entry, enable_progress_threads,
enable_mpi_threads);
} else {
/* Unrecognized coll API version */
@ -197,13 +198,13 @@ static int init_query(const mca_base_component_t *m,
/*
* Query a specific component, coll v1.0.0
*/
static int init_query_1_1_0(const mca_base_component_t *component,
static int init_query_2_0_0(const mca_base_component_t *component,
mca_base_component_priority_list_item_t *entry,
bool enable_progress_threads,
bool enable_mpi_threads)
{
mca_coll_base_component_1_1_0_t *coll =
(mca_coll_base_component_1_1_0_t *) component;
mca_coll_base_component_2_0_0_t *coll =
(mca_coll_base_component_2_0_0_t *) component;
return coll->collm_init_query(enable_progress_threads,
enable_mpi_threads);

2
ompi/mca/coll/base/coll_base_open.c
Просмотреть файл

@ -54,7 +54,7 @@ int mca_coll_base_associative = 1;
bool mca_coll_base_components_opened_valid = false;
opal_list_t mca_coll_base_components_opened;
OBJ_CLASS_INSTANCE(mca_coll_base_module_1_1_0_t, opal_object_t, NULL, NULL);
OBJ_CLASS_INSTANCE(mca_coll_base_module_t, opal_object_t, NULL, NULL);
/*
* Function for finding and opening either all MCA components, or the one

83
ompi/mca/coll/basic/coll_basic.h
Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -32,7 +33,7 @@ BEGIN_C_DECLS
/* Globally exported variables */
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t
mca_coll_basic_component;
extern int mca_coll_basic_priority;
extern int mca_coll_basic_crossover;
@ -41,11 +42,11 @@ BEGIN_C_DECLS
int mca_coll_basic_init_query(bool enable_progress_threads,
bool enable_mpi_threads);
struct mca_coll_base_module_1_1_0_t
mca_coll_base_module_t
*mca_coll_basic_comm_query(struct ompi_communicator_t *comm,
int *priority);
int mca_coll_basic_module_enable(struct mca_coll_base_module_1_1_0_t *module,
int mca_coll_basic_module_enable(mca_coll_base_module_t *module,
struct ompi_communicator_t *comm);
int mca_coll_basic_allgather_intra(void *sbuf, int scount,
@ -53,13 +54,13 @@ BEGIN_C_DECLS
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_allgather_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_allgatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
@ -67,38 +68,38 @@ BEGIN_C_DECLS
int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_allgatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts,
int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_allreduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_alltoall_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_alltoall_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_alltoallv_intra(void *sbuf, int *scounts,
int *sdisps,
@ -107,7 +108,7 @@ BEGIN_C_DECLS
int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_alltoallv_inter(void *sbuf, int *scounts,
int *sdisps,
struct ompi_datatype_t *sdtype,
@ -115,7 +116,7 @@ BEGIN_C_DECLS
int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_alltoallw_intra(void *sbuf, int *scounts,
int *sdisps,
@ -124,7 +125,7 @@ BEGIN_C_DECLS
int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_alltoallw_inter(void *sbuf, int *scounts,
int *sdisps,
struct ompi_datatype_t **sdtypes,
@ -132,52 +133,52 @@ BEGIN_C_DECLS
int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_barrier_intra_lin(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_barrier_inter_lin(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_barrier_intra_log(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_bcast_lin_intra(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_bcast_lin_inter(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_bcast_log_intra(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_bcast_log_inter(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_exscan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_exscan_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_gather_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
@ -185,14 +186,14 @@ BEGIN_C_DECLS
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_gather_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_gatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
@ -200,7 +201,7 @@ BEGIN_C_DECLS
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_gatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
@ -208,57 +209,57 @@ BEGIN_C_DECLS
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_reduce_lin_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_reduce_lin_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_reduce_log_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_reduce_log_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_reduce_scatter_intra(void *sbuf, void *rbuf,
int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf,
int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_scan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_scan_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_scatter_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
@ -266,14 +267,14 @@ BEGIN_C_DECLS
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_scatter_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_scatterv_intra(void *sbuf, int *scounts, int *disps,
struct ompi_datatype_t *sdtype,
@ -281,14 +282,14 @@ BEGIN_C_DECLS
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_scatterv_inter(void *sbuf, int *scounts, int *disps,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_basic_ft_event(int status);
@ -305,7 +306,7 @@ BEGIN_C_DECLS
struct mca_coll_basic_module_t {
mca_coll_base_module_1_1_0_t super;
mca_coll_base_module_t super;
ompi_request_t **mccb_reqs;
int mccb_num_reqs;

4
ompi/mca/coll/basic/coll_basic_allgather.c
Просмотреть файл

@ -42,7 +42,7 @@ mca_coll_basic_allgather_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int err;
ptrdiff_t lb, extent;
@ -87,7 +87,7 @@ mca_coll_basic_allgather_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int rank, root = 0, size, rsize, err, i;
char *tmpbuf = NULL, *ptmp;

4
ompi/mca/coll/basic/coll_basic_allgatherv.c
Просмотреть файл

@ -40,7 +40,7 @@ mca_coll_basic_allgatherv_intra(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, size, rank ;
int err;
@ -121,7 +121,7 @@ mca_coll_basic_allgatherv_inter(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int size, rsize;
int err, i;

4
ompi/mca/coll/basic/coll_basic_allreduce.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_basic_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int err;
@ -76,7 +76,7 @@ mca_coll_basic_allreduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int err, i, rank, root = 0, rsize;
ptrdiff_t lb, extent;

4
ompi/mca/coll/basic/coll_basic_alltoall.c
Просмотреть файл

@ -40,7 +40,7 @@ mca_coll_basic_alltoall_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int rank;
@ -163,7 +163,7 @@ mca_coll_basic_alltoall_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int rank;

4
ompi/mca/coll/basic/coll_basic_alltoallv.c
Просмотреть файл

@ -40,7 +40,7 @@ mca_coll_basic_alltoallv_intra(void *sbuf, int *scounts, int *sdisps,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int size;
@ -161,7 +161,7 @@ mca_coll_basic_alltoallv_inter(void *sbuf, int *scounts, int *sdisps,
int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int rsize;

4
ompi/mca/coll/basic/coll_basic_alltoallw.c
Просмотреть файл

@ -39,7 +39,7 @@ mca_coll_basic_alltoallw_intra(void *sbuf, int *scounts, int *sdisps,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int size;
@ -154,7 +154,7 @@ mca_coll_basic_alltoallw_inter(void *sbuf, int *scounts, int *sdisps,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int size;

6
ompi/mca/coll/basic/coll_basic_barrier.c
Просмотреть файл

@ -37,7 +37,7 @@
*/
int
mca_coll_basic_barrier_intra_lin(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int err;
@ -103,7 +103,7 @@ mca_coll_basic_barrier_intra_lin(struct ompi_communicator_t *comm,
*/
int
mca_coll_basic_barrier_intra_log(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int err;
@ -182,7 +182,7 @@ mca_coll_basic_barrier_intra_log(struct ompi_communicator_t *comm,
*/
int
mca_coll_basic_barrier_inter_lin(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int rank;
int result;

8
ompi/mca/coll/basic/coll_basic_bcast.c
Просмотреть файл

@ -40,7 +40,7 @@ int
mca_coll_basic_bcast_lin_intra(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int size;
@ -112,7 +112,7 @@ int
mca_coll_basic_bcast_log_intra(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int size;
@ -210,7 +210,7 @@ int
mca_coll_basic_bcast_lin_inter(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int rsize;
@ -261,7 +261,7 @@ int
mca_coll_basic_bcast_log_inter(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
return OMPI_ERR_NOT_IMPLEMENTED;
}

25
ompi/mca/coll/basic/coll_basic_component.c
Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -44,39 +45,33 @@ int mca_coll_basic_crossover = 4;
/*
* Local function
*/
static int basic_open(void);
static int basic_register(void);
/*
* Instantiate the public struct with all of our public information
* and pointers to our public functions in it
*/
const mca_coll_base_component_1_1_0_t mca_coll_basic_component = {
const mca_coll_base_component_2_0_0_t mca_coll_basic_component = {
/* First, the mca_component_t struct containing meta information
* about the component itself */
{
/* Indicate that we are a coll v1.0.0 component (which also implies a
* specific MCA version) */
MCA_COLL_BASE_VERSION_1_1_0,
MCA_COLL_BASE_VERSION_2_0_0,
/* Component name and version */
"basic",
OMPI_MAJOR_VERSION,
OMPI_MINOR_VERSION,
OMPI_RELEASE_VERSION,
/* Component open and close functions */
basic_open,
NULL
NULL,
NULL,
NULL,
basic_register
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT
@ -90,7 +85,7 @@ const mca_coll_base_component_1_1_0_t mca_coll_basic_component = {
static int
basic_open(void)
basic_register(void)
{
/* Use a low priority, but allow other components to be lower */
@ -124,6 +119,6 @@ mca_coll_basic_module_destruct(mca_coll_basic_module_t *module)
OBJ_CLASS_INSTANCE(mca_coll_basic_module_t,
mca_coll_base_module_1_1_0_t,
mca_coll_base_module_t,
mca_coll_basic_module_construct,
mca_coll_basic_module_destruct);

4
ompi/mca/coll/basic/coll_basic_exscan.c
Просмотреть файл

@ -43,7 +43,7 @@ mca_coll_basic_exscan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int size, rank, err;
ptrdiff_t true_lb, true_extent, lb, extent;
@ -178,7 +178,7 @@ mca_coll_basic_exscan_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
return OMPI_ERR_NOT_IMPLEMENTED;
}

4
ompi/mca/coll/basic/coll_basic_gather.c
Просмотреть файл

@ -40,7 +40,7 @@ mca_coll_basic_gather_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int err;
@ -103,7 +103,7 @@ mca_coll_basic_gather_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i;
int err;

4
ompi/mca/coll/basic/coll_basic_gatherv.c
Просмотреть файл

@ -39,7 +39,7 @@ mca_coll_basic_gatherv_intra(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, err;
char *ptmp;
@ -112,7 +112,7 @@ mca_coll_basic_gatherv_inter(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, err;
char *ptmp;

4
ompi/mca/coll/basic/coll_basic_module.c
Просмотреть файл

@ -48,7 +48,7 @@ mca_coll_basic_init_query(bool enable_progress_threads,
* Look at the communicator and decide which set of functions and
* priority we want to return.
*/
mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_basic_comm_query(struct ompi_communicator_t *comm,
int *priority)
{
@ -137,7 +137,7 @@ mca_coll_basic_comm_query(struct ompi_communicator_t *comm,
* Init module on the communicator
*/
int
mca_coll_basic_module_enable(mca_coll_base_module_1_1_0_t *module,
mca_coll_basic_module_enable(mca_coll_base_module_t *module,
struct ompi_communicator_t *comm)
{
/* All done */

8
ompi/mca/coll/basic/coll_basic_reduce.c
Просмотреть файл

@ -39,7 +39,7 @@ mca_coll_basic_reduce_lin_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, err, size;
ptrdiff_t true_lb, true_extent, lb, extent;
@ -318,7 +318,7 @@ mca_coll_basic_reduce_log_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, size, rank, vrank;
int err, peer, dim, mask;
@ -527,7 +527,7 @@ mca_coll_basic_reduce_lin_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, err, size;
ptrdiff_t true_lb, true_extent, lb, extent;
@ -607,7 +607,7 @@ mca_coll_basic_reduce_log_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
return OMPI_ERR_NOT_IMPLEMENTED;
}

4
ompi/mca/coll/basic/coll_basic_reduce_scatter.c
Просмотреть файл

@ -59,7 +59,7 @@ mca_coll_basic_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, count, err = OMPI_SUCCESS;
ptrdiff_t true_lb, true_extent, lb, extent, buf_size;
@ -356,7 +356,7 @@ mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int err, i, rank, root = 0, rsize;
int totalcounts, tcount;

2
ompi/mca/coll/basic/coll_basic_scan.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_basic_scan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int size, rank, err;
ptrdiff_t true_lb, true_extent, lb, extent;

4
ompi/mca/coll/basic/coll_basic_scatter.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_basic_scatter_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, err;
char *ptmp;
@ -108,7 +108,7 @@ mca_coll_basic_scatter_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, err;
char *ptmp;

4
ompi/mca/coll/basic/coll_basic_scatterv.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_basic_scatterv_intra(void *sbuf, int *scounts,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, err;
char *ptmp;
@ -114,7 +114,7 @@ mca_coll_basic_scatterv_inter(void *sbuf, int *scounts,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, err;
char *ptmp;

105
ompi/mca/coll/coll.h
Просмотреть файл

@ -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) 2007 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007-2008 UT-Battelle, LLC
* $COPYRIGHT$
*
@ -128,8 +128,8 @@ typedef int (*mca_coll_base_component_init_query_fn_t)
* provide a module with the requested functionality or NULL if the
* component should not be used on the given communicator.
*/
typedef struct mca_coll_base_module_1_1_0_t *
(*mca_coll_base_component_comm_query_1_1_0_fn_t)
typedef struct mca_coll_base_module_2_0_0_t *
(*mca_coll_base_component_comm_query_2_0_0_fn_t)
(struct ompi_communicator_t *comm, int *priority);
@ -168,66 +168,66 @@ typedef struct mca_coll_base_module_1_1_0_t *
* @param[in] comm Communicator being created
*/
typedef int
(*mca_coll_base_module_enable_1_1_0_fn_t)(struct mca_coll_base_module_1_1_0_t* module,
(*mca_coll_base_module_enable_1_1_0_fn_t)(struct mca_coll_base_module_2_0_0_t* module,
struct ompi_communicator_t *comm);
typedef int (*mca_coll_base_module_allgather_fn_t)
(void *sbuf, int scount, struct ompi_datatype_t *sdtype,
void *rbuf, int rcount, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_allgatherv_fn_t)
(void *sbuf, int scount, struct ompi_datatype_t *sdtype,
void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_allreduce_fn_t)
(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype,
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_alltoall_fn_t)
(void *sbuf, int scount, struct ompi_datatype_t *sdtype,
void* rbuf, int rcount, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_alltoallv_fn_t)
(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_alltoallw_fn_t)
(void *sbuf, int *scounts, int *sdisps, struct ompi_datatype_t **sdtypes,
void *rbuf, int *rcounts, int *rdisps, struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_barrier_fn_t)
(struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
(struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_bcast_fn_t)
(void *buff, int count, struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_exscan_fn_t)
(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype,
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_gather_fn_t)
(void *sbuf, int scount, struct ompi_datatype_t *sdtype,
void *rbuf, int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_gatherv_fn_t)
(void *sbuf, int scount, struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_reduce_fn_t)
(void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype,
struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_reduce_scatter_fn_t)
(void *sbuf, void *rbuf, int *rcounts, struct ompi_datatype_t *dtype,
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_scan_fn_t)
(void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype,
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_scatter_fn_t)
(void *sbuf, int scount, struct ompi_datatype_t *sdtype,
void *rbuf, int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
typedef int (*mca_coll_base_module_scatterv_fn_t)
(void *sbuf, int *scounts, int *disps, struct ompi_datatype_t *sdtype,
void* rbuf, int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module);
int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_0_0_t *module);
/**
@ -254,18 +254,23 @@ typedef int (*mca_coll_base_module_ft_event_fn_t) (int state);
* mca_coll_[component_name]_component, must exist in any collective
* component.
*/
struct mca_coll_base_component_1_1_0_t {
struct mca_coll_base_component_2_0_0_t {
/** Base component description */
mca_base_component_t collm_version;
/** Base component data block */
mca_base_component_data_1_0_0_t collm_data;
mca_base_component_data_t collm_data;
/** Component initialization function */
mca_coll_base_component_init_query_fn_t collm_init_query;
/** Query whether component is useable for given communicator */
mca_coll_base_component_comm_query_1_1_0_fn_t collm_comm_query;
mca_coll_base_component_comm_query_2_0_0_fn_t collm_comm_query;
};
typedef struct mca_coll_base_component_1_1_0_t mca_coll_base_component_1_1_0_t;
typedef struct mca_coll_base_component_2_0_0_t mca_coll_base_component_2_0_0_t;
/** Per guidence in mca.h, use the unversioned struct name if you just
want to always keep up with the most recent version of the
interace. */
typedef struct mca_coll_base_component_2_0_0_t mca_coll_base_component_t;
/**
@ -282,7 +287,7 @@ typedef struct mca_coll_base_component_1_1_0_t mca_coll_base_component_1_1_0_t;
* function, so the component is free to create a structure that
* inherits from this one for use as the module structure.
*/
struct mca_coll_base_module_1_1_0_t {
struct mca_coll_base_module_2_0_0_t {
/** Collective modules all inherit from opal_object */
opal_object_t super;
@ -311,9 +316,13 @@ struct mca_coll_base_module_1_1_0_t {
/** Fault tolerance event trigger function */
mca_coll_base_module_ft_event_fn_t ft_event;
};
typedef struct mca_coll_base_module_1_1_0_t mca_coll_base_module_1_1_0_t;
OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_module_1_1_0_t);
typedef struct mca_coll_base_module_2_0_0_t mca_coll_base_module_2_0_0_t;
/** Per guidence in mca.h, use the unversioned struct name if you just
want to always keep up with the most recent version of the
interace. */
typedef struct mca_coll_base_module_2_0_0_t mca_coll_base_module_t;
OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_module_t);
/**
* Collectives communicator cache structure
@ -326,37 +335,37 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_module_1_1_0_t);
*/
struct mca_coll_base_comm_coll_t {
mca_coll_base_module_allgather_fn_t coll_allgather;
mca_coll_base_module_1_1_0_t *coll_allgather_module;
mca_coll_base_module_2_0_0_t *coll_allgather_module;
mca_coll_base_module_allgatherv_fn_t coll_allgatherv;
mca_coll_base_module_1_1_0_t *coll_allgatherv_module;
mca_coll_base_module_2_0_0_t *coll_allgatherv_module;
mca_coll_base_module_allreduce_fn_t coll_allreduce;
mca_coll_base_module_1_1_0_t *coll_allreduce_module;
mca_coll_base_module_2_0_0_t *coll_allreduce_module;
mca_coll_base_module_alltoall_fn_t coll_alltoall;
mca_coll_base_module_1_1_0_t *coll_alltoall_module;
mca_coll_base_module_2_0_0_t *coll_alltoall_module;
mca_coll_base_module_alltoallv_fn_t coll_alltoallv;
mca_coll_base_module_1_1_0_t *coll_alltoallv_module;
mca_coll_base_module_2_0_0_t *coll_alltoallv_module;
mca_coll_base_module_alltoallw_fn_t coll_alltoallw;
mca_coll_base_module_1_1_0_t *coll_alltoallw_module;
mca_coll_base_module_2_0_0_t *coll_alltoallw_module;
mca_coll_base_module_barrier_fn_t coll_barrier;
mca_coll_base_module_1_1_0_t *coll_barrier_module;
mca_coll_base_module_2_0_0_t *coll_barrier_module;
mca_coll_base_module_bcast_fn_t coll_bcast;
mca_coll_base_module_1_1_0_t *coll_bcast_module;
mca_coll_base_module_2_0_0_t *coll_bcast_module;
mca_coll_base_module_exscan_fn_t coll_exscan;
mca_coll_base_module_1_1_0_t *coll_exscan_module;
mca_coll_base_module_2_0_0_t *coll_exscan_module;
mca_coll_base_module_gather_fn_t coll_gather;
mca_coll_base_module_1_1_0_t *coll_gather_module;
mca_coll_base_module_2_0_0_t *coll_gather_module;
mca_coll_base_module_gatherv_fn_t coll_gatherv;
mca_coll_base_module_1_1_0_t *coll_gatherv_module;
mca_coll_base_module_2_0_0_t *coll_gatherv_module;
mca_coll_base_module_reduce_fn_t coll_reduce;
mca_coll_base_module_1_1_0_t *coll_reduce_module;
mca_coll_base_module_2_0_0_t *coll_reduce_module;
mca_coll_base_module_reduce_scatter_fn_t coll_reduce_scatter;
mca_coll_base_module_1_1_0_t *coll_reduce_scatter_module;
mca_coll_base_module_2_0_0_t *coll_reduce_scatter_module;
mca_coll_base_module_scan_fn_t coll_scan;
mca_coll_base_module_1_1_0_t *coll_scan_module;
mca_coll_base_module_2_0_0_t *coll_scan_module;
mca_coll_base_module_scatter_fn_t coll_scatter;
mca_coll_base_module_1_1_0_t *coll_scatter_module;
mca_coll_base_module_2_0_0_t *coll_scatter_module;
mca_coll_base_module_scatterv_fn_t coll_scatterv;
mca_coll_base_module_1_1_0_t *coll_scatterv_module;
mca_coll_base_module_2_0_0_t *coll_scatterv_module;
};
typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t;
@ -365,13 +374,11 @@ typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t;
/*
* Macro for use in components that are of type coll v1.1.0
* Macro for use in components that are of type coll
*/
#define MCA_COLL_BASE_VERSION_1_1_0 \
/* coll v1.1 is chained to MCA v1.0 */ \
MCA_BASE_VERSION_1_0_0, \
/* coll v1.1 */ \
"coll", 1, 1, 0
#define MCA_COLL_BASE_VERSION_2_0_0 \
MCA_BASE_VERSION_2_0_0, \
"coll", 2, 0, 0
/* ******************************************************************** */

73
ompi/mca/coll/demo/coll_demo.h
Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -31,7 +32,7 @@ BEGIN_C_DECLS
/* Globally exported variables */
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_demo_component;
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_demo_component;
extern int mca_coll_demo_priority_param;
extern int mca_coll_demo_verbose_param;
extern int mca_coll_demo_verbose;
@ -41,12 +42,12 @@ OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_demo_
int mca_coll_demo_init_query(bool enable_progress_threads,
bool enable_mpi_threads);
struct mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_demo_comm_query(struct ompi_communicator_t *comm, int *priority);
/* Module functions */
int mca_coll_demo_module_enable(struct mca_coll_base_module_1_1_0_t *module,
int mca_coll_demo_module_enable(mca_coll_base_module_t *module,
struct ompi_communicator_t *comm);
int mca_coll_demo_allgather_intra(void *sbuf, int scount,
@ -54,194 +55,194 @@ int mca_coll_demo_module_enable(struct mca_coll_base_module_1_1_0_t *module,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_allgather_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_allgatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void * rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_allgatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void * rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_allreduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_alltoall_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_alltoall_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_alltoallv_intra(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_alltoallv_inter(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_alltoallw_intra(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t **sdtypes,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_alltoallw_inter(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t **sdtypes,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_barrier_inter(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_bcast_intra(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_bcast_inter(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_exscan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_exscan_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_gather_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_gather_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_gatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_gatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_reduce_intra(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_reduce_inter(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_reduce_scatter_intra(void *sbuf, void *rbuf,
int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_reduce_scatter_inter(void *sbuf, void *rbuf,
int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_scan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_scan_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_scatter_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_scatter_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_scatterv_intra(void *sbuf, int *scounts, int *disps,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_scatterv_inter(void *sbuf, int *scounts, int *disps,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_demo_ft_event(int status);
struct mca_coll_demo_module_t {
mca_coll_base_module_1_1_0_t super;
mca_coll_base_module_t super;
mca_coll_base_comm_coll_t underlying;
};

4
ompi/mca/coll/demo/coll_demo_allgather.c
Просмотреть файл

@ -37,7 +37,7 @@ int mca_coll_demo_allgather_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo allgather_intra");
@ -59,7 +59,7 @@ int mca_coll_demo_allgather_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo allgather_inter");

4
ompi/mca/coll/demo/coll_demo_allgatherv.c
Просмотреть файл

@ -38,7 +38,7 @@ int mca_coll_demo_allgatherv_intra(void *sbuf, int scount,
void * rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_intra");
@ -61,7 +61,7 @@ int mca_coll_demo_allgatherv_inter(void *sbuf, int scount,
void * rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_inter");

4
ompi/mca/coll/demo/coll_demo_allreduce.c
Просмотреть файл

@ -37,7 +37,7 @@ int mca_coll_demo_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_intra");
@ -58,7 +58,7 @@ int mca_coll_demo_allreduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_inter");

4
ompi/mca/coll/demo/coll_demo_alltoall.c
Просмотреть файл

@ -38,7 +38,7 @@ int mca_coll_demo_alltoall_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_intra\n");
@ -61,7 +61,7 @@ int mca_coll_demo_alltoall_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_inter\n");

4
ompi/mca/coll/demo/coll_demo_alltoallv.c
Просмотреть файл

@ -39,7 +39,7 @@ mca_coll_demo_alltoallv_intra(void *sbuf, int *scounts, int *sdisps,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_intra");
@ -63,7 +63,7 @@ mca_coll_demo_alltoallv_inter(void *sbuf, int *scounts, int *sdisps,
int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_inter");

4
ompi/mca/coll/demo/coll_demo_alltoallw.c
Просмотреть файл

@ -38,7 +38,7 @@ int mca_coll_demo_alltoallw_intra(void *sbuf, int *scounts, int *sdisps,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_intra");
@ -61,7 +61,7 @@ int mca_coll_demo_alltoallw_inter(void *sbuf, int *scounts, int *sdisps,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_inter");

4
ompi/mca/coll/demo/coll_demo_barrier.c
Просмотреть файл

@ -34,7 +34,7 @@
* Returns: - MPI_SUCCESS or error code
*/
int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo barrier_intra");
@ -51,7 +51,7 @@ int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm,
* Returns: - MPI_SUCCESS or error code
*/
int mca_coll_demo_barrier_inter(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo barrier_inter");

4
ompi/mca/coll/demo/coll_demo_bcast.c
Просмотреть файл

@ -36,7 +36,7 @@
int mca_coll_demo_bcast_intra(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo bcast_intra");
@ -56,7 +56,7 @@ int mca_coll_demo_bcast_intra(void *buff, int count,
int mca_coll_demo_bcast_inter(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo bcast_inter");

15
ompi/mca/coll/demo/coll_demo_component.c
Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -52,32 +53,24 @@ static int demo_open(void);
* and pointers to our public functions in it
*/
const mca_coll_base_component_1_1_0_t mca_coll_demo_component = {
const mca_coll_base_component_2_0_0_t mca_coll_demo_component = {
/* First, the mca_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a coll v1.0.0 component (which also
implies a specific MCA version) */
MCA_COLL_BASE_VERSION_1_1_0,
MCA_COLL_BASE_VERSION_2_0_0,
/* Component name and version */
"demo",
OMPI_MAJOR_VERSION,
OMPI_MINOR_VERSION,
OMPI_RELEASE_VERSION,
/* Component open and close functions */
demo_open,
NULL
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT
@ -138,6 +131,6 @@ mca_coll_demo_module_destruct(mca_coll_demo_module_t *module)
OBJ_CLASS_INSTANCE(mca_coll_demo_module_t,
mca_coll_base_module_1_1_0_t,
mca_coll_base_module_t,
mca_coll_demo_module_construct,
mca_coll_demo_module_destruct);

2
ompi/mca/coll/demo/coll_demo_exscan.c
Просмотреть файл

@ -37,7 +37,7 @@ int mca_coll_demo_exscan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo exscan_intra");

4
ompi/mca/coll/demo/coll_demo_gather.c
Просмотреть файл

@ -37,7 +37,7 @@ int mca_coll_demo_gather_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo gather_intra");
@ -60,7 +60,7 @@ int mca_coll_demo_gather_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo gather_inter");

4
ompi/mca/coll/demo/coll_demo_gatherv.c
Просмотреть файл

@ -38,7 +38,7 @@ int mca_coll_demo_gatherv_intra(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_intra");
@ -61,7 +61,7 @@ int mca_coll_demo_gatherv_inter(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_inter");

4
ompi/mca/coll/demo/coll_demo_module.c
Просмотреть файл

@ -112,7 +112,7 @@ int mca_coll_demo_init_query(bool enable_progress_threads,
* Look at the communicator and decide which set of functions and
* priority we want to return.
*/
mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_demo_comm_query(struct ompi_communicator_t *comm, int *priority)
{
mca_coll_demo_module_t *demo_module;
@ -177,7 +177,7 @@ mca_coll_demo_comm_query(struct ompi_communicator_t *comm, int *priority)
} while (0)
int
mca_coll_demo_module_enable(mca_coll_base_module_1_1_0_t *module,
mca_coll_demo_module_enable(mca_coll_base_module_t *module,
struct ompi_communicator_t *comm)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;

4
ompi/mca/coll/demo/coll_demo_reduce.c
Просмотреть файл

@ -37,7 +37,7 @@ int mca_coll_demo_reduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo reduce_intra");
@ -58,7 +58,7 @@ int mca_coll_demo_reduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo reduce_inter");

4
ompi/mca/coll/demo/coll_demo_reduce_scatter.c
Просмотреть файл

@ -37,7 +37,7 @@ int mca_coll_demo_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra");
@ -58,7 +58,7 @@ int mca_coll_demo_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter");

2
ompi/mca/coll/demo/coll_demo_scan.c
Просмотреть файл

@ -37,7 +37,7 @@ int mca_coll_demo_scan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo scan_intra");

4
ompi/mca/coll/demo/coll_demo_scatter.c
Просмотреть файл

@ -39,7 +39,7 @@ int mca_coll_demo_scatter_intra(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra");
@ -63,7 +63,7 @@ int mca_coll_demo_scatter_inter(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter");

4
ompi/mca/coll/demo/coll_demo_scatterv.c
Просмотреть файл

@ -38,7 +38,7 @@ int mca_coll_demo_scatterv_intra(void *sbuf, int *scounts,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_intra");
@ -61,7 +61,7 @@ int mca_coll_demo_scatterv_inter(void *sbuf, int *scounts,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module;
opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_inter");

4
ompi/mca/coll/hierarch/coll_hierarch.c
Просмотреть файл

@ -76,7 +76,7 @@ int mca_coll_hierarch_init_query(bool allow_hierarch_user_threads,
* Look at the communicator and decide which set of functions and
* priority we want to return.
*/
mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority )
{
int size, rank;
@ -247,7 +247,7 @@ mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority )
/*
* Init module on the communicator
*/
int mca_coll_hierarch_module_enable (mca_coll_base_module_1_1_0_t *module,
int mca_coll_hierarch_module_enable (mca_coll_base_module_t *module,
struct ompi_communicator_t *comm)
{
int color;

39
ompi/mca/coll/hierarch/coll_hierarch.h
Просмотреть файл

@ -11,6 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007-2008 University of Houston. All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -37,7 +38,7 @@ BEGIN_C_DECLS
* Globally exported variable
*/
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_hierarch_component;
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_hierarch_component;
extern int mca_coll_hierarch_priority_param;
extern int mca_coll_hierarch_verbose_param;
@ -60,7 +61,7 @@ extern int mca_coll_hierarch_detection_alg_param;
*/
struct mca_coll_hierarch_module_t {
struct mca_coll_base_module_1_1_0_t super;
mca_coll_base_module_t super;
struct ompi_communicator_t *hier_comm; /* link back to the attached comm */
struct ompi_communicator_t *hier_lcomm; /* low level communicator */
@ -200,11 +201,11 @@ int mca_coll_hierarch_get_all_lleaders ( int rank, mca_coll_hierarch_module_t *h
*/
int mca_coll_hierarch_init_query(bool allow_hierarch_user_threads,
bool have_hidden_threads);
struct mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority );
int mca_coll_hierarch_module_enable( struct mca_coll_base_module_1_1_0_t *module,
int mca_coll_hierarch_module_enable( mca_coll_base_module_t *module,
struct ompi_communicator_t *comm);
int mca_coll_hierarch_module_finalize(struct ompi_communicator_t *comm);
@ -214,25 +215,25 @@ int mca_coll_hierarch_allgather_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module );
mca_coll_base_module_t *module );
int mca_coll_hierarch_allgatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void * rbuf, int *rcounts,
int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_alltoall_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_alltoallv_intra(void *sbuf, int *scounts,
int *sdisps,
struct ompi_datatype_t *sdtype,
@ -240,7 +241,7 @@ int mca_coll_hierarch_alltoallv_intra(void *sbuf, int *scounts,
int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_alltoallw_intra(void *sbuf, int *scounts,
int *sdisps,
struct ompi_datatype_t **sdtypes,
@ -248,14 +249,14 @@ int mca_coll_hierarch_alltoallw_intra(void *sbuf, int *scounts,
int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_barrier_intra(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_bcast_intra(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_exscan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
@ -266,42 +267,42 @@ int mca_coll_hierarch_gather_intra(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_gatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_reduce_intra(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_reduce_scatter_intra(void *sbuf, void *rbuf,
int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_scan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_scatter_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_hierarch_scatterv_intra(void *sbuf, int *scounts, int *disps,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
/*
* These are trivial implementations of these routines used during comm_query/init,

2
ompi/mca/coll/hierarch/coll_hierarch_allreduce.c
Просмотреть файл

@ -41,7 +41,7 @@ int mca_coll_hierarch_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
struct ompi_communicator_t *llcomm=NULL;
struct ompi_communicator_t *lcomm=NULL;

2
ompi/mca/coll/hierarch/coll_hierarch_barrier.c
Просмотреть файл

@ -36,7 +36,7 @@
* Returns: - MPI_SUCCESS or error code
*/
int mca_coll_hierarch_barrier_intra(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
struct ompi_communicator_t *llcomm=NULL;
struct ompi_communicator_t *lcomm=NULL;

2
ompi/mca/coll/hierarch/coll_hierarch_bcast.c
Просмотреть файл

@ -40,7 +40,7 @@ int mca_coll_hierarch_bcast_intra(void *buff,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
struct ompi_communicator_t *llcomm=NULL;
struct ompi_communicator_t *lcomm=NULL;

15
ompi/mca/coll/hierarch/coll_hierarch_component.c
Просмотреть файл

@ -11,6 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007-2008 University of Houston. All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -56,32 +57,24 @@ static int hierarch_open(void);
* and pointers to our public functions in it
*/
const mca_coll_base_component_1_1_0_t mca_coll_hierarch_component = {
const mca_coll_base_component_2_0_0_t mca_coll_hierarch_component = {
/* First, the mca_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a coll v1.1.0 component (which also implies a
specific MCA version) */
MCA_COLL_BASE_VERSION_1_1_0,
MCA_COLL_BASE_VERSION_2_0_0,
/* Component name and version */
"hierarch",
OMPI_MAJOR_VERSION,
OMPI_MINOR_VERSION,
OMPI_RELEASE_VERSION,
/* Component open and close functions */
hierarch_open,
NULL
},
/* Next the MCA v1.0.0 component meta data */
{
/* The component is checkpoint ready */
MCA_BASE_METADATA_PARAM_CHECKPOINT
@ -185,6 +178,6 @@ mca_coll_hierarch_module_destruct(mca_coll_hierarch_module_t *hierarch_module)
OBJ_CLASS_INSTANCE(mca_coll_hierarch_module_t,
mca_coll_base_module_1_1_0_t,
mca_coll_base_module_t,
mca_coll_hierarch_module_construct,
mca_coll_hierarch_module_destruct);

2
ompi/mca/coll/hierarch/coll_hierarch_reduce.c
Просмотреть файл

@ -41,7 +41,7 @@ int mca_coll_hierarch_reduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
struct ompi_communicator_t *llcomm=NULL;
struct ompi_communicator_t *lcomm=NULL;

4
ompi/mca/coll/inter/coll_inter.c
Просмотреть файл

@ -90,7 +90,7 @@ int mca_coll_inter_init_query(bool allow_inter_user_threads,
* Look at the communicator and decide which set of functions and
* priority we want to return.
*/
mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_inter_comm_query(struct ompi_communicator_t *comm, int *priority)
{
int size, rsize;
@ -148,7 +148,7 @@ mca_coll_inter_comm_query(struct ompi_communicator_t *comm, int *priority)
* Init module on the communicator
*/
int
mca_coll_inter_module_enable(struct mca_coll_base_module_1_1_0_t *module,
mca_coll_inter_module_enable(mca_coll_base_module_t *module,
struct ompi_communicator_t *comm)
{
int size, rank;

27
ompi/mca/coll/inter/coll_inter.h
Просмотреть файл

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2007 University of Houston. All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -35,7 +36,7 @@ BEGIN_C_DECLS
* Globally exported variable
*/
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_inter_component;
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_inter_component;
extern int mca_coll_inter_priority_param;
extern int mca_coll_inter_verbose_param;
@ -45,10 +46,10 @@ extern int mca_coll_inter_verbose_param;
*/
int mca_coll_inter_init_query(bool allow_inter_user_threads,
bool have_hidden_threads);
struct mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_inter_comm_query(struct ompi_communicator_t *comm, int *priority);
int mca_coll_inter_module_enable(struct mca_coll_base_module_1_1_0_t *module,
int mca_coll_inter_module_enable(mca_coll_base_module_t *module,
struct ompi_communicator_t *comm);
int mca_coll_inter_allgather_inter(void *sbuf, int scount,
@ -56,58 +57,58 @@ int mca_coll_inter_allgather_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_allgatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_allreduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_bcast_inter(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_gather_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_gatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_reduce_inter(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_scatter_inter(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_inter_scatterv_inter(void *sbuf, int *scounts, int *disps,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
struct mca_coll_inter_module_t {
mca_coll_base_module_1_1_0_t super;
mca_coll_base_module_t super;
/* Clarifying some terminology:
* comm: the input communicator, consisting of several lower level communicators.

2
ompi/mca/coll/inter/coll_inter_allgather.c
Просмотреть файл

@ -42,7 +42,7 @@ mca_coll_inter_allgather_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int rank, root = 0, size, rsize, err;
char *ptmp = NULL;

2
ompi/mca/coll/inter/coll_inter_allgatherv.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_inter_allgatherv_inter(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, size_local, total=0, err;
int *count=NULL,*displace=NULL;

2
ompi/mca/coll/inter/coll_inter_allreduce.c
Просмотреть файл

@ -40,7 +40,7 @@ mca_coll_inter_allreduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int err, rank, root = 0, rsize;
ptrdiff_t lb, extent;

2
ompi/mca/coll/inter/coll_inter_bcast.c
Просмотреть файл

@ -40,7 +40,7 @@ int
mca_coll_inter_bcast_inter(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int rsize;
int rank;

19
ompi/mca/coll/inter/coll_inter_component.c
Просмотреть файл

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2007 University of Houston. All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -52,35 +53,27 @@ static int inter_open(void);
* and pointers to our public functions in it
*/
const mca_coll_base_component_1_1_0_t mca_coll_inter_component = {
const mca_coll_base_component_2_0_0_t mca_coll_inter_component = {
/* First, the mca_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a coll v1.0.0 component (which also implies a
specific MCA version) */
MCA_COLL_BASE_VERSION_1_1_0,
MCA_COLL_BASE_VERSION_2_0_0,
/* Component name and version */
"inter",
OMPI_MAJOR_VERSION,
OMPI_MINOR_VERSION,
OMPI_RELEASE_VERSION,
/* Component open and close functions */
inter_open,
NULL
},
/* Next the MCA v1.0.0 component meta data */
{
/* Whether the component is checkpointable or not */
true
/* This component is checkpointable */
MCA_BASE_METADATA_PARAM_CHECKPOINT
},
/* Initialization / querying functions */
@ -125,6 +118,6 @@ mca_coll_inter_module_destruct(mca_coll_inter_module_t *module)
OBJ_CLASS_INSTANCE(mca_coll_inter_module_t,
mca_coll_base_module_1_1_0_t,
mca_coll_base_module_t,
mca_coll_inter_module_construct,
mca_coll_inter_module_destruct);

2
ompi/mca/coll/inter/coll_inter_gather.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_inter_gather_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int err;
int rank;

2
ompi/mca/coll/inter/coll_inter_gatherv.c
Просмотреть файл

@ -40,7 +40,7 @@ mca_coll_inter_gatherv_inter(void *sbuf, int scount,
void *rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, size_local, total=0, err;

2
ompi/mca/coll/inter/coll_inter_reduce.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_inter_reduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int rank, err, size;
ptrdiff_t true_lb, true_extent, lb, extent;

2
ompi/mca/coll/inter/coll_inter_scatter.c
Просмотреть файл

@ -40,7 +40,7 @@ mca_coll_inter_scatter_inter(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int rank, size, size_local, err;
char *ptmp = NULL;

2
ompi/mca/coll/inter/coll_inter_scatterv.c
Просмотреть файл

@ -41,7 +41,7 @@ mca_coll_inter_scatterv_inter(void *sbuf, int *scounts,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int i, rank, size, err, total, size_local;
int *counts=NULL,*displace=NULL;

41
ompi/mca/coll/self/coll_self.h
Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -33,7 +34,7 @@ BEGIN_C_DECLS
* Globally exported variable
*/
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_1_1_0_t mca_coll_self_component;
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_0_0_t mca_coll_self_component;
extern int mca_coll_self_priority_param;
@ -46,10 +47,10 @@ extern int mca_coll_self_priority_param;
int mca_coll_self_init_query(bool enable_progress_threads,
bool enable_mpi_threads);
struct mca_coll_base_module_1_1_0_t *
mca_coll_base_module_t *
mca_coll_self_comm_query(struct ompi_communicator_t *comm, int *priority);
int mca_coll_self_module_enable(struct mca_coll_base_module_1_1_0_t *module,
int mca_coll_self_module_enable(mca_coll_base_module_t *module,
struct ompi_communicator_t *comm);
int mca_coll_self_allgather_intra(void *sbuf, int scount,
@ -57,93 +58,93 @@ int mca_coll_self_allgather_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_allgatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void * rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_alltoall_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_alltoallv_intra(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t *sdtype,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_alltoallw_intra(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t **sdtypes,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_barrier_intra(struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_bcast_intra(void *buff, int count,
struct ompi_datatype_t *datatype,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_exscan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_gather_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_gatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int *rcounts, int *disps,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_reduce_intra(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_reduce_scatter_intra(void *sbuf, void *rbuf,
int *rcounts,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_scan_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_scatter_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_scatterv_intra(void *sbuf, int *scounts, int *disps,
struct ompi_datatype_t *sdtype,
void* rbuf, int rcount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module);
mca_coll_base_module_t *module);
int mca_coll_self_ft_event(int state);
struct mca_coll_self_module_t {
mca_coll_base_module_1_1_0_t super;
mca_coll_base_module_t super;
ompi_request_t **mccb_reqs;
int mccb_num_reqs;

2
ompi/mca/coll/self/coll_self_allgather.c
Просмотреть файл

@ -34,7 +34,7 @@ int mca_coll_self_allgather_intra(void *sbuf, int scount,
struct ompi_datatype_t *sdtype, void *rbuf,
int rcount, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
if (MPI_IN_PLACE == sbuf) {
return MPI_SUCCESS;

2
ompi/mca/coll/self/coll_self_allgatherv.c
Просмотреть файл

@ -35,7 +35,7 @@ int mca_coll_self_allgatherv_intra(void *sbuf, int scount,
void * rbuf, int *rcounts, int *disps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
if (MPI_IN_PLACE == sbuf) {
return MPI_SUCCESS;

2
ompi/mca/coll/self/coll_self_allreduce.c
Просмотреть файл

@ -34,7 +34,7 @@ int mca_coll_self_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
if (MPI_IN_PLACE == sbuf) {
return MPI_SUCCESS;

2
ompi/mca/coll/self/coll_self_alltoall.c
Просмотреть файл

@ -35,7 +35,7 @@ int mca_coll_self_alltoall_intra(void *sbuf, int scount,
void *rbuf, int rcount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
return ompi_ddt_sndrcv(sbuf, scount, sdtype,
rbuf, rcount, rdtype);

2
ompi/mca/coll/self/coll_self_alltoallv.c
Просмотреть файл

@ -36,7 +36,7 @@ mca_coll_self_alltoallv_intra(void *sbuf, int *scounts, int *sdisps,
void *rbuf, int *rcounts, int *rdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm,
struct mca_coll_base_module_1_1_0_t *module)
mca_coll_base_module_t *module)
{
int err;
ptrdiff_t lb, rextent, sextent;

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше