If XRC qp was specified in btl_openib_receive_queues we automatically should

choose xoob connection module.

This commit was SVN r16796.

ompi/mca/btl/openib/connect/btl_openib_connect_base.c

@@ -62,29 +62,32 @@ int ompi_btl_openib_connect_base_open(void)
              "Method used to make OpenFabrics connections (valid values: %s)",
              a);
 
-    mca_base_param_reg_string(&mca_btl_openib_component.super.btl_version,
-                              "btl_openib_connect",
-                              b, false, false,
-                              "oob", &param);
-
     /* For XRC qps we must to use XOOB connection manager */
-    if (mca_btl_openib_component.num_xrc_qps > 0 && 0 == strcmp("oob", param)) {
-        opal_show_help("help-mpi-btl-openib.txt",
-                "XRC with OOB", true,
-                orte_system_info.nodename, 
-                mca_btl_openib_component.num_xrc_qps);
-        return OMPI_ERROR;
-    }
-
-    /* XOOB connection manager may be used only with XRC qps */
-    if ((mca_btl_openib_component.num_srq_qps > 0 || mca_btl_openib_component.num_pp_qps > 0) 
-            && 0 == strcmp("xoob", param)) {
-        opal_show_help("help-mpi-btl-openib.txt",
-                "SRQ or PP with XOOB", true,
-                orte_system_info.nodename, 
-                mca_btl_openib_component.num_srq_qps,
-                mca_btl_openib_component.num_pp_qps);
-        return OMPI_ERROR;
+    if (mca_btl_openib_component.num_xrc_qps > 0) {
+        mca_base_param_reg_string(&mca_btl_openib_component.super.btl_version,
+                "btl_openib_connect",
+                b, false, false,
+                "xoob", &param);
+        if (0 != strcmp("xoob", param)) {
+            opal_show_help("help-mpi-btl-openib.txt",
+                    "XRC with wrong OOB", true,
+                    orte_system_info.nodename,
+                    mca_btl_openib_component.num_xrc_qps);
+            return OMPI_ERROR;
+        }
+    } else { /* For all others we should use OOB */
+        mca_base_param_reg_string(&mca_btl_openib_component.super.btl_version,
+                "btl_openib_connect",
+                b, false, false,
+                "oob", &param);
+        if (0 != strcmp("oob", param)) {
+            opal_show_help("help-mpi-btl-openib.txt",
+                    "SRQ or PP with wrong OOB", true,
+                    orte_system_info.nodename,
+                    mca_btl_openib_component.num_srq_qps,
+                    mca_btl_openib_component.num_pp_qps);
+            return OMPI_ERROR;
+        }
     }
 
     /* Call the open function on all the connect modules */

ompi/mca/btl/openib/help-mpi-btl-openib.txt

@@ -410,7 +410,7 @@ for this run.
 Host: %s
 btl_openib_receive_queues: %s
 #
-[XRC with OOB]
+[XRC with wrong OOB]
 WARNING: You must use the "xoob" OpenFabrics (openib) connection
 manager when XRC ("X") queues are specified in the
 btl_openib_receive_queues MCA parameter.  Either remove the X queues
@@ -421,12 +421,13 @@ will therefore be deactivated for this run.
 Host: %s
 num_xrc_qps: %d
 #
-[SRQ or PP with XOOB]
-WARNINGS: You cannot specify to use per-peer ("P") or SRQ ("S") queues
-in the btl_openib_receive_queues MCA parameter and also use the "xoob"
-connection manager.  The "xoob" connection manager is for XRC ("X)
-queues only; you must use one of the other connection managers for
-per-peer/SRQ queues (such as "oob").
+[SRQ or PP with wrong OOB]
+WARNING: You must use the "oob" OpenFabrics (openib) connection
+manager when PP("P") or SRQ ("S") queues are specified in the
+btl_openib_receive_queues MCA parameter.  Either remove the P or S queues
+from btl_openib_receive_queues or ensure to use the "oob" connection
+manager by setting btl_openib_connect to "oob".  The OpenFabrics BTL
+will therefore be deactivated for this run.
 
 Host: %s
 num_srq_qps: %d