And more dependencies fixes. The big commit will follow shortly.
This commit was SVN r7319.
Этот коммит содержится в:
George Bosilca
родитель
fd1431bf0f
Коммит
c9fb1f32f2
@ -21,7 +21,7 @@
|
||||
#include "mca/bml/base/base.h"
|
||||
#include "mca/btl/base/base.h"
|
||||
#include "ompi/mca/bml/base/static-components.h"
|
||||
|
||||
#include "opal/mca/base/base.h"
|
||||
|
||||
opal_list_t mca_bml_base_components_available;
|
||||
|
||||
|
||||
@ -20,16 +20,15 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef MCA_BML_H
|
||||
#define MCA_BML_H
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "mca/btl/btl.h"
|
||||
|
||||
#include "mca/bml/base/bml_base_btl.h"
|
||||
#include "mca/bml/base/bml_base_endpoint.h"
|
||||
|
||||
|
||||
#ifndef MCA_BML_H
|
||||
#define MCA_BML_H
|
||||
|
||||
#include "include/types.h"
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "mca/pml/pml.h"
|
||||
@ -199,14 +198,14 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_find(
|
||||
* of BTLs used to reach a destinationation
|
||||
*/
|
||||
struct mca_bml_base_endpoint_t {
|
||||
mca_pml_proc_t super;
|
||||
ompi_proc_t *btl_proc; /**< back-pointer to ompi_proc_t */
|
||||
opal_mutex_t btl_lock; /**< lock to protect against concurrent access */
|
||||
int btl_flags; /**< prefered method of accessing this peer */
|
||||
size_t btl_rdma_offset; /**< max of min rdma size for available rmda btls */
|
||||
mca_bml_base_btl_array_t btl_eager; /**< array of btls to use for first fragments */
|
||||
mca_bml_base_btl_array_t btl_send; /**< array of btls to use for remaining fragments */
|
||||
mca_bml_base_btl_array_t btl_rdma; /**< array of btls that support (prefer) rdma */
|
||||
mca_pml_proc_t super;
|
||||
struct ompi_proc_t *btl_proc; /**< back-pointer to ompi_proc_t */
|
||||
opal_mutex_t btl_lock; /**< lock to protect against concurrent access */
|
||||
int btl_flags; /**< prefered method of accessing this peer */
|
||||
size_t btl_rdma_offset; /**< max of min rdma size for available rmda btls */
|
||||
mca_bml_base_btl_array_t btl_eager; /**< array of btls to use for first fragments */
|
||||
mca_bml_base_btl_array_t btl_send; /**< array of btls to use for remaining fragments */
|
||||
mca_bml_base_btl_array_t btl_rdma; /**< array of btls that support (prefer) rdma */
|
||||
};
|
||||
typedef struct mca_bml_base_endpoint_t mca_bml_base_endpoint_t;
|
||||
|
||||
|
||||
@ -20,13 +20,14 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "class/ompi_bitmap.h"
|
||||
#include "mca/bml/bml.h"
|
||||
#include "mca/btl/btl.h"
|
||||
#include "mca/btl/base/base.h"
|
||||
#include "mca/bml/base/bml_base_endpoint.h"
|
||||
#include "mca/bml/base/bml_base_btl.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
#include "ompi/mca/btl/base/base.h"
|
||||
#include "ompi/mca/bml/base/bml_base_endpoint.h"
|
||||
#include "ompi/mca/bml/base/bml_base_btl.h"
|
||||
#include "bml_r2.h"
|
||||
#include "class/orte_proc_table.h"
|
||||
#include "orte/class/orte_proc_table.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
|
||||
extern mca_bml_base_component_t mca_bml_r2_component;
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#include "datatype/convertor.h"
|
||||
#include "mca/mpool/base/base.h"
|
||||
#include "mca/mpool/mpool.h"
|
||||
|
||||
#include "ompi/proc/proc.h"
|
||||
|
||||
mca_btl_gm_module_t mca_btl_gm_module = {
|
||||
{
|
||||
|
||||
@ -24,21 +24,21 @@
|
||||
#include <errno.h>
|
||||
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "include/sys/atomic.h"
|
||||
#include "opal/util/output.h"
|
||||
#include "opal/util/if.h"
|
||||
#include "util/proc_info.h"
|
||||
#include "opal/util/printf.h"
|
||||
#include "util/sys_info.h"
|
||||
#include "class/ompi_fifo.h"
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/btl/btl.h"
|
||||
#include "ompi/class/ompi_fifo.h"
|
||||
#include "ompi/class/ompi_free_list.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
#include "mca/mpool/base/base.h"
|
||||
#include "btl_self.h"
|
||||
#include "btl_self_frag.h"
|
||||
|
||||
#include "ompi/proc/proc.h"
|
||||
|
||||
mca_btl_base_module_t mca_btl_self = {
|
||||
&mca_btl_self_component.super,
|
||||
|
||||
@ -24,24 +24,24 @@
|
||||
#include <errno.h>
|
||||
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "include/sys/atomic.h"
|
||||
#include "opal/util/output.h"
|
||||
#include "opal/util/if.h"
|
||||
#include "util/proc_info.h"
|
||||
#include "opal/util/printf.h"
|
||||
#include "util/sys_info.h"
|
||||
#include "class/ompi_fifo.h"
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/btl/btl.h"
|
||||
#include "ompi/class/ompi_fifo.h"
|
||||
#include "ompi/class/ompi_free_list.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
#include "mca/mpool/base/base.h"
|
||||
#include "mca/common/sm/common_sm_mmap.h"
|
||||
#include "btl_sm.h"
|
||||
#include "btl_sm_endpoint.h"
|
||||
#include "btl_sm_frag.h"
|
||||
#include "btl_sm_fifo.h"
|
||||
|
||||
#include "ompi/proc/proc.h"
|
||||
|
||||
mca_btl_sm_t mca_btl_sm[2] = {
|
||||
{
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
#include <string.h>
|
||||
#include "util/output.h"
|
||||
#include "util/if.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/btl/btl.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
|
||||
#include "btl_tcp.h"
|
||||
#include "btl_tcp_frag.h"
|
||||
@ -28,7 +28,7 @@
|
||||
#include "datatype/convertor.h"
|
||||
#include "mca/mpool/base/base.h"
|
||||
#include "mca/mpool/mpool.h"
|
||||
|
||||
#include "ompi/proc/proc.h"
|
||||
|
||||
mca_btl_tcp_module_t mca_btl_tcp_module = {
|
||||
{
|
||||
|
||||
@ -42,6 +42,7 @@
|
||||
#include "ompi/mca/btl/base/base.h"
|
||||
#include "ompi/mca/mpool/mpool.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
#include "opal/class/opal_hash_table.h"
|
||||
|
||||
#define MCA_BTL_TCP_STATISTICS 0
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
|
||||
@ -12,8 +12,7 @@
|
||||
#include "ompi/mca/btl/base/btl_base_error.h"
|
||||
#include "btl_tcp_frag.h"
|
||||
#include "btl_tcp_endpoint.h"
|
||||
|
||||
|
||||
#include "orte/util/proc_info.h"
|
||||
|
||||
static void mca_btl_tcp_frag_common_constructor(mca_btl_tcp_frag_t* frag)
|
||||
{
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include "mca/base/base.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/pml/base/base.h"
|
||||
|
||||
#include "opal/runtime/opal_progress.h"
|
||||
|
||||
int mca_pml_base_close(void)
|
||||
{
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "class/opal_hash_table.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
#include "opal/threads/condition.h"
|
||||
#include "opal/util/output.h"
|
||||
#include "util/proc_info.h"
|
||||
@ -215,12 +215,6 @@ static void mca_pml_base_modex_registry_callback(
|
||||
bool isnew = false;
|
||||
int rc;
|
||||
|
||||
#if 0
|
||||
opal_output(0, "[%lu,%lu,%lu] mca_pml_base_modex_registry_callback\n",
|
||||
ORTE_NAME_ARGS(orte_process_info.my_name));
|
||||
orte_gpr_base_dump_notify_data(data,0);
|
||||
#endif
|
||||
|
||||
if(data->cnt) {
|
||||
new_procs = (ompi_proc_t**)malloc(sizeof(ompi_proc_t*) * data->cnt);
|
||||
if(NULL == new_procs) {
|
||||
|
||||
@ -25,9 +25,9 @@
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#include "proc/proc.h"
|
||||
#include "mca/mca.h"
|
||||
|
||||
struct ompi_proc_t;
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
@ -123,7 +123,7 @@ OMPI_DECLSPEC int mca_pml_base_modex_send(mca_base_component_t *source_component
|
||||
* number of bytes is split into two parts.
|
||||
*/
|
||||
OMPI_DECLSPEC int mca_pml_base_modex_recv(mca_base_component_t *dest_component,
|
||||
ompi_proc_t *source_proc,
|
||||
struct ompi_proc_t *source_proc,
|
||||
void **buffer, size_t *size);
|
||||
|
||||
/*
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "request/request.h"
|
||||
#include "communicator/communicator.h"
|
||||
/*#include "communicator/communicator.h"*/
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
@ -49,8 +49,8 @@ struct mca_pml_base_request_t {
|
||||
size_t req_count; /**< count of user datatype elements */
|
||||
int32_t req_peer; /**< peer process - rank w/in this communicator */
|
||||
int32_t req_tag; /**< user defined tag */
|
||||
ompi_communicator_t *req_comm; /**< communicator pointer */
|
||||
ompi_proc_t* req_proc; /**< peer process */
|
||||
struct ompi_communicator_t *req_comm; /**< communicator pointer */
|
||||
struct ompi_proc_t* req_proc; /**< peer process */
|
||||
uint64_t req_sequence; /**< sequence number for MPI pt-2-pt ordering */
|
||||
struct ompi_datatype_t *req_datatype; /**< pointer to data type */
|
||||
mca_pml_base_request_type_t req_type; /**< MPI request type - used for test */
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include "mca/base/base.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/pml/base/base.h"
|
||||
|
||||
#include "opal/runtime/opal_progress.h"
|
||||
|
||||
typedef struct opened_component_t {
|
||||
opal_list_item_t super;
|
||||
|
||||
@ -59,10 +59,7 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "communicator/communicator.h"
|
||||
#include "request/request.h"
|
||||
#include "mca/mca.h"
|
||||
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||
#include "mpi.h" /* needed for MPI_ANY_TAG */
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
@ -78,9 +75,9 @@ struct mca_ptl_addr_t;
|
||||
|
||||
struct mca_pml_proc_t {
|
||||
opal_list_item_t super;
|
||||
ompi_proc_t *proc_ompi; /**< back-pointer to ompi_proc_t */
|
||||
struct ompi_proc_t *proc_ompi; /**< back-pointer to ompi_proc_t */
|
||||
opal_mutex_t proc_lock; /**< lock to protect against concurrent access */
|
||||
int proc_flags; /**< prefered method of accessing this peer */
|
||||
int proc_flags; /**< prefered method of accessing this peer */
|
||||
};
|
||||
|
||||
typedef struct mca_pml_proc_t mca_pml_proc_t;
|
||||
@ -359,7 +356,7 @@ typedef int (*mca_pml_base_module_send_fn_t)(
|
||||
*/
|
||||
typedef int (*mca_pml_base_module_start_fn_t)(
|
||||
size_t count,
|
||||
ompi_request_t** requests
|
||||
struct ompi_request_t** requests
|
||||
);
|
||||
|
||||
/**
|
||||
@ -376,7 +373,7 @@ typedef int (*mca_pml_base_module_start_fn_t)(
|
||||
typedef int (*mca_pml_base_module_iprobe_fn_t)(
|
||||
int src,
|
||||
int tag,
|
||||
ompi_communicator_t* comm,
|
||||
struct ompi_communicator_t* comm,
|
||||
int *matched,
|
||||
ompi_status_public_t *status
|
||||
);
|
||||
@ -394,7 +391,7 @@ typedef int (*mca_pml_base_module_iprobe_fn_t)(
|
||||
typedef int (*mca_pml_base_module_probe_fn_t)(
|
||||
int src,
|
||||
int tag,
|
||||
ompi_communicator_t* comm,
|
||||
struct ompi_communicator_t* comm,
|
||||
ompi_status_public_t *status
|
||||
);
|
||||
|
||||
@ -406,7 +403,7 @@ typedef int (*mca_pml_base_module_probe_fn_t)(
|
||||
*
|
||||
*/
|
||||
typedef int (*mca_pml_base_module_cancel_fn_t)(
|
||||
ompi_request_t* request
|
||||
struct ompi_request_t* request
|
||||
);
|
||||
|
||||
|
||||
@ -418,7 +415,7 @@ typedef int (*mca_pml_base_module_cancel_fn_t)(
|
||||
*
|
||||
*/
|
||||
typedef int (*mca_pml_base_module_cancelled_fn_t)(
|
||||
ompi_request_t* request,
|
||||
struct ompi_request_t* request,
|
||||
int *flag
|
||||
);
|
||||
|
||||
@ -430,7 +427,7 @@ typedef int (*mca_pml_base_module_cancelled_fn_t)(
|
||||
*
|
||||
*/
|
||||
typedef int (*mca_pml_base_module_free_fn_t)(
|
||||
ompi_request_t** request
|
||||
struct ompi_request_t** request
|
||||
);
|
||||
|
||||
|
||||
@ -442,7 +439,7 @@ typedef int (*mca_pml_base_module_free_fn_t)(
|
||||
*
|
||||
*/
|
||||
typedef int (*mca_pml_base_module_null_fn_t)(
|
||||
ompi_request_t** request
|
||||
struct ompi_request_t** request
|
||||
);
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
#include "mca/pml/pml.h"
|
||||
#include "pml_ptl_array.h"
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
|
||||
static void mca_ptl_array_construct(mca_ptl_array_t* array)
|
||||
{
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
#include "mpi.h"
|
||||
#include "mca/mca.h"
|
||||
#include "mca/base/base.h"
|
||||
#include "proc/proc.h"
|
||||
|
||||
/*
|
||||
* ******************************************************************
|
||||
@ -135,6 +134,8 @@ typedef mca_topo_base_comm_1_0_0_t mca_topo_base_comm_t;
|
||||
* ******************************************************************
|
||||
*/
|
||||
|
||||
struct ompi_proc_t;
|
||||
|
||||
/*
|
||||
* ***********************************************************************
|
||||
* ************************ Interface function definitions **************
|
||||
@ -157,7 +158,7 @@ typedef int (*mca_topo_base_module_cart_coords_fn_t)
|
||||
typedef int (*mca_topo_base_module_cart_create_fn_t)
|
||||
(mca_topo_base_comm_t *topo_data,
|
||||
int *proc_count,
|
||||
ompi_proc_t **proc_pointers,
|
||||
struct ompi_proc_t **proc_pointers,
|
||||
int *new_rank,
|
||||
int ndims,
|
||||
int *dims,
|
||||
@ -202,7 +203,7 @@ typedef int (*mca_topo_base_module_cart_sub_fn_t)
|
||||
typedef int (*mca_topo_base_module_graph_create_fn_t)
|
||||
(mca_topo_base_comm_t *topo_data,
|
||||
int *proc_count,
|
||||
ompi_proc_t **proc_pointers,
|
||||
struct ompi_proc_t **proc_pointers,
|
||||
int *new_rank,
|
||||
int nnodes,
|
||||
int *index,
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user