Ensure this module works in heterogeneous environments.

Note: this module is under development, which is why it is not set as the default. Use at your own risk!

This commit was SVN r18688.

orte/mca/grpcomm/basic/grpcomm_basic_module.c

@@ -542,17 +542,18 @@ static int modex(opal_list_t *procs)
                 goto cleanup;
             }
             
-            /* unpack its architecture */
+            if (OMPI_ENABLE_HETEROGENEOUS_SUPPORT) {
-            cnt=1;
+                /* unpack its architecture */
-            if (ORTE_SUCCESS != (rc = opal_dss.unpack(&rbuf, &arch, &cnt, OPAL_UINT32))) {
+                cnt=1;
-                ORTE_ERROR_LOG(rc);
+                if (ORTE_SUCCESS != (rc = opal_dss.unpack(&rbuf, &arch, &cnt, OPAL_UINT32))) {
-                goto cleanup;
+                    ORTE_ERROR_LOG(rc);
-            }
+                    goto cleanup;
-            
+                }
-            /* update the arch in the ESS */
+                /* update the arch in the ESS */
-            if (ORTE_SUCCESS != (rc = orte_ess.update_arch(&proc_name, arch))) {
+                if (ORTE_SUCCESS != (rc = orte_ess.update_arch(&proc_name, arch))) {
-                ORTE_ERROR_LOG(rc);
+                    ORTE_ERROR_LOG(rc);
-                goto cleanup;
+                    goto cleanup;
+                }
             }
             
             /* update the modex database */