merge in changes from release branch
This commit was SVN r8637.
Этот коммит содержится в:
родитель
7eade5b856
Коммит
63d0438991
@ -380,7 +380,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src(
|
||||
}
|
||||
|
||||
iov.iov_len = max_data;
|
||||
iov.iov_base = frag->segment.seg_addr.pval + reserve;
|
||||
iov.iov_base = (unsigned char*)frag->segment.seg_addr.pval + reserve;
|
||||
|
||||
rc = ompi_convertor_pack(convertor, &iov, &iov_count, &max_data, &free_after);
|
||||
*size = max_data;
|
||||
@ -409,7 +409,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src(
|
||||
max_data = btl->btl_max_send_size - reserve;
|
||||
}
|
||||
iov.iov_len = max_data;
|
||||
iov.iov_base = (unsigned char*) frag->segment.seg_addr.pval + reserve;
|
||||
iov.iov_base = (unsigned char*)frag->segment.seg_addr.pval + reserve;
|
||||
|
||||
rc = ompi_convertor_pack(convertor, &iov, &iov_count, &max_data, &free_after);
|
||||
*size = max_data;
|
||||
|
@ -174,7 +174,7 @@ int mca_btl_mvapi_component_open(void)
|
||||
mca_btl_mvapi_param_register_int("ib_rnr_retry", "IB rnr retry",
|
||||
7, (int*) &mca_btl_mvapi_component.ib_rnr_retry);
|
||||
mca_btl_mvapi_param_register_int("ib_max_rdma_dst_ops", "IB max rdma destination operations",
|
||||
16, (int*) &mca_btl_mvapi_component.ib_max_rdma_dst_ops);
|
||||
4, (int*) &mca_btl_mvapi_component.ib_max_rdma_dst_ops);
|
||||
mca_btl_mvapi_param_register_int("ib_service_level", "IB service level",
|
||||
0, (int*) &mca_btl_mvapi_component.ib_service_level);
|
||||
mca_btl_mvapi_param_register_int("ib_static_rate", "IB static rate",
|
||||
@ -201,13 +201,10 @@ int mca_btl_mvapi_component_open(void)
|
||||
MCA_BTL_EXCLUSIVITY_DEFAULT, (int*) &mca_btl_mvapi_module.super.btl_exclusivity);
|
||||
mca_btl_mvapi_param_register_int ("eager_limit", "eager send limit",
|
||||
(32*1024),(int*) &mca_btl_mvapi_module.super.btl_eager_limit);
|
||||
mca_btl_mvapi_module.super.btl_eager_limit -= sizeof(mca_btl_mvapi_header_t);
|
||||
mca_btl_mvapi_param_register_int ("min_send_size", "minimum send size",
|
||||
(32*1024),(int*) &mca_btl_mvapi_module.super.btl_min_send_size);
|
||||
mca_btl_mvapi_module.super.btl_min_send_size -= sizeof(mca_btl_mvapi_header_t);
|
||||
mca_btl_mvapi_param_register_int ("max_send_size", "maximum send size",
|
||||
(64*1024), (int*) &mca_btl_mvapi_module.super.btl_max_send_size);
|
||||
mca_btl_mvapi_module.super.btl_max_send_size -= sizeof(mca_btl_mvapi_header_t);
|
||||
mca_btl_mvapi_param_register_int("min_rdma_size", "minimum rdma size",
|
||||
1024*1024, (int*) &mca_btl_mvapi_module.super.btl_min_rdma_size);
|
||||
mca_btl_mvapi_param_register_int("max_rdma_size", "maximium rdma size",
|
||||
|
@ -382,7 +382,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
|
||||
}
|
||||
|
||||
iov.iov_len = max_data;
|
||||
iov.iov_base = (unsigned char*) (unsigned long) (frag->segment.seg_addr.lval + reserve);
|
||||
iov.iov_base = (unsigned char*)frag->segment.seg_addr.pval + reserve;
|
||||
|
||||
rc = ompi_convertor_pack(convertor, &iov, &iov_count, &max_data, &free_after);
|
||||
*size = max_data;
|
||||
@ -411,7 +411,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
|
||||
max_data = btl->btl_max_send_size - reserve;
|
||||
}
|
||||
iov.iov_len = max_data;
|
||||
iov.iov_base = (unsigned char*) frag->segment.seg_addr.pval + reserve;
|
||||
iov.iov_base = (unsigned char*)frag->segment.seg_addr.pval + reserve;
|
||||
|
||||
rc = ompi_convertor_pack(convertor, &iov, &iov_count, &max_data, &free_after);
|
||||
*size = max_data;
|
||||
|
@ -160,7 +160,7 @@ int mca_btl_openib_component_open(void)
|
||||
mca_btl_openib_param_register_int("ib_rnr_retry", "IB rnr retry",
|
||||
7, (int*) &mca_btl_openib_component.ib_rnr_retry);
|
||||
mca_btl_openib_param_register_int("ib_max_rdma_dst_ops", "IB max rdma destination operations",
|
||||
16, (int*) &mca_btl_openib_component.ib_max_rdma_dst_ops);
|
||||
4, (int*) &mca_btl_openib_component.ib_max_rdma_dst_ops);
|
||||
mca_btl_openib_param_register_int("ib_service_level", "IB service level",
|
||||
0, (int*) &mca_btl_openib_component.ib_service_level);
|
||||
mca_btl_openib_param_register_int("ib_static_rate", "IB static rate",
|
||||
@ -186,13 +186,10 @@ int mca_btl_openib_component_open(void)
|
||||
|
||||
mca_btl_openib_param_register_int ("eager_limit", "eager send limit",
|
||||
(64*1024),(int*) &mca_btl_openib_module.super.btl_eager_limit);
|
||||
mca_btl_openib_module.super.btl_eager_limit -= sizeof(mca_btl_openib_header_t);
|
||||
mca_btl_openib_param_register_int ("min_send_size", "minimum send size",
|
||||
(64*1024),(int*) &mca_btl_openib_module.super.btl_min_send_size);
|
||||
mca_btl_openib_module.super.btl_min_send_size -= sizeof(mca_btl_openib_header_t);
|
||||
mca_btl_openib_param_register_int ("max_send_size", "maximum send size",
|
||||
(128*1024), (int*) &mca_btl_openib_module.super.btl_max_send_size);
|
||||
mca_btl_openib_module.super.btl_max_send_size -= sizeof(mca_btl_openib_header_t);
|
||||
mca_btl_openib_param_register_int("min_rdma_size", "minimum rdma size",
|
||||
1024*1024, (int*) &mca_btl_openib_module.super.btl_min_rdma_size);
|
||||
mca_btl_openib_param_register_int("max_rdma_size", "maximium rdma size",
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user