From 015fc08ff4f23471e88cdb2bb22560186ae7d956 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 26 Jul 2007 21:10:51 +0000 Subject: [PATCH] Remove the ib_static_rate MCA parameter; it will be replaced with a dynamic mechanism to adjust the rate only if necessary (e.g., two ports of differing speeds are connected). This commit was SVN r15653. --- ompi/mca/btl/openib/btl_openib.h | 1 - ompi/mca/btl/openib/btl_openib_endpoint.c | 3 ++- ompi/mca/btl/openib/btl_openib_mca.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ompi/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h index 1554d4a04e..29058fef4d 100644 --- a/ompi/mca/btl/openib/btl_openib.h +++ b/ompi/mca/btl/openib/btl_openib.h @@ -144,7 +144,6 @@ struct mca_btl_openib_component_t { uint32_t ib_rnr_retry; uint32_t ib_max_rdma_dst_ops; uint32_t ib_service_level; - uint32_t ib_static_rate; uint32_t use_eager_rdma; int32_t eager_rdma_threshold; /**< After this number of msg, use RDMA for short messages, always */ uint32_t eager_rdma_num; diff --git a/ompi/mca/btl/openib/btl_openib_endpoint.c b/ompi/mca/btl/openib/btl_openib_endpoint.c index 1c4e762446..5470a43161 100644 --- a/ompi/mca/btl/openib/btl_openib_endpoint.c +++ b/ompi/mca/btl/openib/btl_openib_endpoint.c @@ -1219,7 +1219,8 @@ int mca_btl_openib_endpoint_qp_init_query( attr->ah_attr.sl = mca_btl_openib_component.ib_service_level; attr->ah_attr.src_path_bits = openib_btl->src_path_bits; attr->ah_attr.port_num = port_num; - attr->ah_attr.static_rate = mca_btl_openib_component.ib_static_rate; + /* JMS to be filled in later dynamically */ + attr->ah_attr.static_rate = 0; if(ibv_modify_qp(qp, attr, IBV_QP_STATE | diff --git a/ompi/mca/btl/openib/btl_openib_mca.c b/ompi/mca/btl/openib/btl_openib_mca.c index e84b57676f..4830051d72 100644 --- a/ompi/mca/btl/openib/btl_openib_mca.c +++ b/ompi/mca/btl/openib/btl_openib_mca.c @@ -355,11 +355,6 @@ int btl_openib_register_mca_params(void) } mca_btl_openib_component.ib_service_level = (uint32_t) ival; - CHECK(reg_int("ib_static_rate", "InfiniBand static rate " - "(must be >= 0)", - 0, &ival, REGINT_GE_ZERO)); - mca_btl_openib_component.ib_static_rate = (uint32_t) ival; - CHECK(reg_int("use_eager_rdma", "Use RDMA for eager messages", 1, &ival, 0)); mca_btl_openib_component.use_eager_rdma = (uint32_t) (ival != 0);