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

Revert "btl/openib: fix warnings"

Просмотр исходного кода 
This reverts commit 6e6c786b49.
Этот коммит содержится в:
Nathan Hjelm 2014-11-19 23:16:16 -07:00
родитель 4c8fa17234
Коммит b1f9569b7d
4 изменённых файлов: 11 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
opal/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -1447,11 +1447,15 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
size_t* size, size_t* size,
uint32_t flags) uint32_t flags)
{ {
mca_btl_openib_module_t *openib_btl;
mca_btl_openib_com_frag_t *frag = NULL; mca_btl_openib_com_frag_t *frag = NULL;
struct iovec iov; struct iovec iov;
uint32_t iov_count = 1; uint32_t iov_count = 1;
size_t max_data = *size; size_t max_data = *size;
void *ptr; void *ptr;
int rc;
openib_btl = (mca_btl_openib_module_t*)btl;
assert(MCA_BTL_NO_ORDER == order); assert(MCA_BTL_NO_ORDER == order);

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

@ -743,7 +743,7 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
void *local_address, uint64_t remote_address, void *local_address, uint64_t remote_address,
struct mca_btl_base_registration_handle_t *local_handle, struct mca_btl_base_registration_handle_t *local_handle,
struct mca_btl_base_registration_handle_t *remote_handle, mca_btl_base_atomic_op_t op, struct mca_btl_base_registration_handle_t *remote_handle, mca_btl_base_atomic_op_t op,
uint64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc, int64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
void *cbcontext, void *cbdata); void *cbcontext, void *cbdata);
/** /**
@ -788,8 +788,8 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
int mca_btl_openib_atomic_cswap (struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint, int mca_btl_openib_atomic_cswap (struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint,
void *local_address, uint64_t remote_address, void *local_address, uint64_t remote_address,
struct mca_btl_base_registration_handle_t *local_handle, struct mca_btl_base_registration_handle_t *local_handle,
struct mca_btl_base_registration_handle_t *remote_handle, uint64_t compare, struct mca_btl_base_registration_handle_t *remote_handle, int64_t compare,
uint64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc, int64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
void *cbcontext, void *cbdata); void *cbcontext, void *cbdata);
/** /**

6
opal/mca/btl/openib/btl_openib_atomic.c
Просмотреть файл

@ -107,7 +107,7 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
void *local_address, uint64_t remote_address, void *local_address, uint64_t remote_address,
struct mca_btl_base_registration_handle_t *local_handle, struct mca_btl_base_registration_handle_t *local_handle,
struct mca_btl_base_registration_handle_t *remote_handle, mca_btl_base_atomic_op_t op, struct mca_btl_base_registration_handle_t *remote_handle, mca_btl_base_atomic_op_t op,
uint64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc, int64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
void *cbcontext, void *cbdata) void *cbcontext, void *cbdata)
{ {
@ -123,8 +123,8 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
int mca_btl_openib_atomic_cswap (struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint, int mca_btl_openib_atomic_cswap (struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint,
void *local_address, uint64_t remote_address, void *local_address, uint64_t remote_address,
struct mca_btl_base_registration_handle_t *local_handle, struct mca_btl_base_registration_handle_t *local_handle,
struct mca_btl_base_registration_handle_t *remote_handle, uint64_t compare, struct mca_btl_base_registration_handle_t *remote_handle, int64_t compare,
uint64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc, int64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
void *cbcontext, void *cbdata) void *cbcontext, void *cbdata)
{ {
return mca_btl_openib_atomic_internal (btl, endpoint, local_address, remote_address, local_handle, return mca_btl_openib_atomic_internal (btl, endpoint, local_address, remote_address, local_handle,

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

@ -2044,7 +2044,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
from the default, we're ok. But if the from the default, we're ok. But if the
component.receive_queues value came from the 1st component.receive_queues value came from the 1st
device's INI file, we must error. */ device's INI file, we must error. */
else if ((mca_base_var_source_t) BTL_OPENIB_RQ_SOURCE_DEVICE_INI == else if (BTL_OPENIB_RQ_SOURCE_DEVICE_INI ==
mca_btl_openib_component.receive_queues_source) { mca_btl_openib_component.receive_queues_source) {
opal_show_help("help-mpi-btl-openib.txt", opal_show_help("help-mpi-btl-openib.txt",
"locally conflicting receive_queues", true, "locally conflicting receive_queues", true,