Merge pull request #7652 from rhc54/topic/het

Cleanup heterogeneous builds

Author: rhc54

config/ompi_setup_prrte.m4

@@ -102,7 +102,7 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
             opal_prrte_prefix_arg=
         fi
 
-        opal_prrte_args="--prefix=$prefix $opal_prrte_prefix_arg $opal_prrte_libevent_arg $opal_prrte_hwloc_arg $opal_prrte_pmix_arg"
+        opal_prrte_args="--prefix=$prefix --with-proxy-version-string=$OPAL_VERSION --with-proxy-package-name=\"Open MPI\" --with-proxy-bugreport=\"https://www.open-mpi.org/community/help/\" $opal_prrte_prefix_arg $opal_prrte_libevent_arg $opal_prrte_hwloc_arg $opal_prrte_pmix_arg"
         AS_IF([test "$enable_debug" = "yes"],
               [opal_prrte_args="--enable-debug $opal_prrte_args"
                CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],

contrib/platform/intel/bend/mac

@@ -6,7 +6,7 @@ enable_mem_debug=yes
 enable_mem_profile=no
 enable_debug_symbols=yes
 enable_binaries=yes
-enable_heterogeneous=no
+enable_heterogeneous=yes
 enable_picky=yes
 enable_debug=yes
 enable_shared=yes

ompi/mca/mtl/psm2/mtl_psm2_component.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2006-2010 QLogic Corporation. All rights reserved.
  * Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2013-2017 Intel, Inc. All rights reserved
+ * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2018      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
@@ -346,15 +346,12 @@ ompi_mtl_psm2_component_close(void)
 static int
 get_local_rank(int *out_rank)
 {
-    ompi_node_rank_t my_node_rank;
-
     *out_rank = 0;
 
-    if (OMPI_NODE_RANK_INVALID == (my_node_rank =
-        ompi_process_info.my_node_rank)) {
+    if (OMPI_NODE_RANK_INVALID == ompi_process_info.my_node_rank) {
         return OMPI_ERROR;
     }
-    *out_rank = (int)my_node_rank;
+    *out_rank = (int)ompi_process_info.my_node_rank;
     return OMPI_SUCCESS;
 }
 

ompi/proc/proc.c

@@ -144,19 +144,24 @@ int ompi_proc_complete_init_single (ompi_proc_t *proc)
     {
         uint32_t *ui32ptr;
         int ret;
-        ui32ptr = &(proc->super.proc_arch);
-        OPAL_MODEX_RECV_VALUE(ret, PMIX_ARCH, &proc->super.proc_name,
-                              (void**)&ui32ptr, OPAL_UINT32);
-        if (OPAL_SUCCESS == ret) {
-            /* if arch is different than mine, create a new convertor for this proc */
-            if (proc->super.proc_arch != opal_local_arch) {
-                OBJ_RELEASE(proc->super.proc_convertor);
-                proc->super.proc_convertor = opal_convertor_create(proc->super.proc_arch, 0);
-            }
-        } else if (OMPI_ERR_NOT_IMPLEMENTED == ret) {
+        /* if the proc is local, then no need to fetch it */
+        if (OPAL_PROC_ON_LOCAL_NODE(proc->super.proc_flags)) {
             proc->super.proc_arch = opal_local_arch;
         } else {
-            return ret;
+            ui32ptr = &(proc->super.proc_arch);
+            OPAL_MODEX_RECV_VALUE_OPTIONAL(ret, "OMPI_ARCH", &proc->super.proc_name,
+                                           (void**)&ui32ptr, OPAL_UINT32);
+            if (OPAL_SUCCESS == ret) {
+                /* if arch is different than mine, create a new convertor for this proc */
+                if (proc->super.proc_arch != opal_local_arch) {
+                    OBJ_RELEASE(proc->super.proc_convertor);
+                    proc->super.proc_convertor = opal_convertor_create(proc->super.proc_arch, 0);
+                }
+            } else if (OMPI_ERR_NOT_IMPLEMENTED == ret) {
+                proc->super.proc_arch = opal_local_arch;
+            } else {
+                return ret;
+            }
         }
     }
 #else
@@ -258,7 +263,7 @@ int ompi_proc_init(void)
 #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
     /* add our arch to the modex */
     OPAL_MODEX_SEND_VALUE(ret, PMIX_GLOBAL,
-                          PMIX_ARCH, &opal_local_arch, OPAL_UINT32);
+                          "OMPI_ARCH", &opal_local_arch, OPAL_UINT32);
     if (OPAL_SUCCESS != ret) {
         return ret;
     }