Minor cleanups
This commit was SVN r17100.
Этот коммит содержится в:
родитель
25814c07e0
Коммит
597c7e68f1
@ -220,7 +220,7 @@ OMPI_MODULE_DECLSPEC extern mca_btl_openib_component_t mca_btl_openib_component;
|
|||||||
|
|
||||||
typedef mca_btl_base_recv_reg_t mca_btl_openib_recv_reg_t;
|
typedef mca_btl_base_recv_reg_t mca_btl_openib_recv_reg_t;
|
||||||
|
|
||||||
struct mca_btl_openib_port_info_t {
|
struct mca_btl_openib_port_info {
|
||||||
uint32_t mtu;
|
uint32_t mtu;
|
||||||
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
|
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
|
||||||
uint8_t padding[4];
|
uint8_t padding[4];
|
||||||
@ -230,7 +230,7 @@ struct mca_btl_openib_port_info_t {
|
|||||||
uint16_t lid; /* used only in xrc */
|
uint16_t lid; /* used only in xrc */
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
typedef struct mca_btl_openib_port_info_t mca_btl_openib_port_info_t;
|
typedef struct mca_btl_openib_port_info mca_btl_openib_port_info_t;
|
||||||
|
|
||||||
#if HAVE_XRC
|
#if HAVE_XRC
|
||||||
#define MCA_BTL_OPENIB_LID_NTOH(hdr) (hdr).lid = ntohs((hdr).lid)
|
#define MCA_BTL_OPENIB_LID_NTOH(hdr) (hdr).lid = ntohs((hdr).lid)
|
||||||
|
@ -224,8 +224,8 @@ static void btl_openib_control(mca_btl_base_module_t* btl,
|
|||||||
rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.ival));
|
rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.ival));
|
||||||
|
|
||||||
if (ep->eager_rdma_remote.base.pval) {
|
if (ep->eager_rdma_remote.base.pval) {
|
||||||
BTL_ERROR(("Got RDMA connect twice!"));
|
BTL_ERROR(("Got RDMA connect twice!"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ep->eager_rdma_remote.rkey = rdma_hdr->rkey;
|
ep->eager_rdma_remote.rkey = rdma_hdr->rkey;
|
||||||
ep->eager_rdma_remote.base.lval = rdma_hdr->rdma_start.lval;
|
ep->eager_rdma_remote.base.lval = rdma_hdr->rdma_start.lval;
|
||||||
@ -1165,7 +1165,6 @@ btl_openib_component_init(int *num_btl_modules,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Parse the include and exclude lists, checking for errors */
|
/* Parse the include and exclude lists, checking for errors */
|
||||||
|
|
||||||
mca_btl_openib_component.if_include_list =
|
mca_btl_openib_component.if_include_list =
|
||||||
mca_btl_openib_component.if_exclude_list =
|
mca_btl_openib_component.if_exclude_list =
|
||||||
mca_btl_openib_component.if_list = NULL;
|
mca_btl_openib_component.if_list = NULL;
|
||||||
@ -1204,7 +1203,6 @@ btl_openib_component_init(int *num_btl_modules,
|
|||||||
dlist_for_each_data(dev_list, ib_dev, struct ibv_device)
|
dlist_for_each_data(dev_list, ib_dev, struct ibv_device)
|
||||||
num_devs++;
|
num_devs++;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(0 == num_devs) {
|
if(0 == num_devs) {
|
||||||
mca_btl_base_error_no_nics("OpenIB", "HCA");
|
mca_btl_base_error_no_nics("OpenIB", "HCA");
|
||||||
btl_openib_modex_send();
|
btl_openib_modex_send();
|
||||||
|
@ -46,7 +46,7 @@ struct mca_btl_openib_proc_t {
|
|||||||
orte_process_name_t proc_guid;
|
orte_process_name_t proc_guid;
|
||||||
/**< globally unique identifier for the process */
|
/**< globally unique identifier for the process */
|
||||||
|
|
||||||
struct mca_btl_openib_port_info_t* proc_ports;
|
mca_btl_openib_port_info_t* proc_ports;
|
||||||
size_t proc_port_count;
|
size_t proc_port_count;
|
||||||
/**< number of ports published by endpoint */
|
/**< number of ports published by endpoint */
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
*
|
*
|
||||||
* $HEADER$
|
* $HEADER$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ompi_config.h"
|
#include "ompi_config.h"
|
||||||
|
|
||||||
#include "btl_openib.h"
|
#include "btl_openib.h"
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user