Silence trivial warning

Update PMIx/PRRTE pointers

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

3rd-party/openpmix

@@ -18,6 +18,7 @@
 # Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2020      Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
+# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -143,6 +144,10 @@ AC_DEFUN([OMPI_SETUP_PRRTE_INTERNAL], [
           [internal_prrte_args="--enable-prte-ft $internal_prrte_args"],
           [])
 
+    if test "$WANT_DEBUG" = "1"; then
+        internal_prrte_args="$internal_prrte_args --enable-debug"
+    fi
+
     # Pass all our compiler/linker flags to PRRTE, so that it
     # picks up how to build an internal HWLOC, libevent, and PMIx, plus
     # picks up any user-specified compiler flags from the master

3rd-party/prrte

@@ -21,6 +21,7 @@ dnl Copyright (c) 2020      Triad National Security, LLC. All rights
 dnl                         reserved.
 dnl Copyright (c) 2020      Amazon.com, Inc. or its affiliates.  All Rights
 dnl                         reserved.
+dnl Copyright (c) 2021      Nanook Consulting.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -86,6 +87,10 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
          AS_IF([test ! -z "$internal_pmix_libs"],
                [internal_pmix_args="$internal_pmix_args --with-prte-extra-lib=\"$internal_pmix_libs\""])
 
+         if test "$WANT_DEBUG" = "1"; then
+             internal_pmix_args="$internal_pmix_args --enable-debug"
+         fi
+
          # Pass all our compiler/linker flags to PMIx, so that it
          # picks up how to build an internal HWLOC and libevent, plus
          # picks up any user-specified compiler flags from the master

config/ompi_setup_prrte.m4

@@ -21,6 +21,7 @@
  * Copyright (c) 2018      Triad National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2020      Google, LLC. All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -417,6 +418,7 @@ int mca_base_var_load_extra_files(char* files, bool rel_path_search) {
     resolve_relative_paths(&tmp1, mca_base_param_file_path, rel_path_search, &mca_base_var_files, OPAL_ENV_SEP);
     read_files (tmp1, &mca_base_var_file_values, ',');
     free(tmp1);
+    return OPAL_SUCCESS;
 }
 
 int mca_base_var_cache_files(bool rel_path_search)

config/opal_config_pmix.m4

@@ -8,6 +8,7 @@
  * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -131,25 +132,13 @@ int opal_pmix_convert_nspace(opal_jobid_t *jobid, pmix_nspace_t nspace)
 
     /* set a default */
     if (NULL != jobid) {
-        *jobid = OPAL_JOBID_INVALID;
+        *jobid = OPAL_JOBID_WILDCARD;
     }
 
     /* if the nspace is empty, there is nothing more to do */
     if (0 == strlen(nspace)) {
         return OPAL_SUCCESS;
     }
-    if (NULL != strstr(nspace, "JOBID_WILDCARD")) {
-        if (NULL != jobid) {
-            *jobid = OPAL_JOBID_WILDCARD;
-        }
-        return OPAL_SUCCESS;
-    }
-    if (NULL != strstr(nspace, "JOBID_INVALID")) {
-        if (NULL != jobid) {
-            *jobid = OPAL_JOBID_INVALID;
-        }
-        return OPAL_SUCCESS;
-    }
 
     /* cycle across our list of known nspace's */
     OPAL_LIST_FOREACH(nptr, &localnspaces, opal_nptr_t) {
@@ -163,12 +152,12 @@ int opal_pmix_convert_nspace(opal_jobid_t *jobid, pmix_nspace_t nspace)
 
     /* if we get here, we don't know this nspace */
     /* find the "." at the end that indicates the child job */
-    if (NULL != (p = strrchr(nspace, '.'))) {
+    if (NULL != (p = strrchr(nspace, '@'))) {
         *p = '\0';
     }
     OPAL_HASH_STR(nspace, hash32);
     if (NULL != p) {
-        *p = '.';
+        *p = '@';
         ++p;
         localjob = strtoul(p, NULL, 10);
     }

opal/mca/base/mca_base_var.c

@@ -23,7 +23,7 @@ void ompitest_warning( char* filename, int lineno, const char* fmt, ... )
     va_list va_list;
 
     va_start(va_list, fmt);
-    opal_vasprintf( &buf, fmt, va_list );
+    vasprintf( &buf, fmt, va_list );
     va_end(va_list);
     printf( "*warning* %s:%d %s\n", filename, lineno, buf );
     free(buf);
@@ -35,7 +35,7 @@ void ompitest_error( char* filename, int lineno, const char* fmt, ... )
     va_list va_list;
 
     va_start(va_list, fmt);
-    opal_vasprintf( &buf, fmt, va_list );
+    vasprintf( &buf, fmt, va_list );
     va_end(va_list);
     printf( "*error* %s:%d %s\n", filename, lineno, buf );
     free(buf);