configury: add check for prte_launch

being available for the selected prrte (external or internal).

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

config/ompi_setup_prrte.m4

@@ -21,6 +21,8 @@ dnl Copyright (c) 2021      Nanook Consulting.  All rights reserved.
 dnl Copyright (c) 2021-2022 IBM Corporation.  All rights reserved.
 dnl Copyright (c) 2023-2024 Jeffrey M. Squyres.  All rights reserved.
 dnl Copyright (c) 2025      Advanced Micro Devices, Inc. All rights reserved.
+dnl Copyright (c) 2025      Triad National Security, LLC. All rights
+dnl                         reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -98,6 +100,7 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy prrte_setup_external_happy targe
     AS_IF([test "$prrte_setup_external_happy" = "0" -a "$prrte_setup_internal_happy" = "1"],
           [opal_prrte_mode="internal"
            OMPI_USING_INTERNAL_PRRTE=1
+           OMPI_HAVE_PRTE_LAUNCH=1
            _OMPI_SETUP_PRRTE_INTERNAL_POST()],
           [OMPI_USING_INTERNAL_PRRTE=0])
 
@@ -124,6 +127,9 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy prrte_setup_external_happy targe
     AC_SUBST(OMPI_SCHIZO_OMPI_RST_CONTENT_DIR)
     AM_CONDITIONAL(OMPI_HAVE_PRRTE_RST, [test $OMPI_HAVE_PRRTE_RST -eq 1])
 
+    AC_DEFINE_UNQUOTED([OMPI_HAVE_PRTE_LAUNCH], $OMPI_HAVE_PRTE_LAUNCH,
+                       [Whether prte_launch support available])
+
     OPAL_SUMMARY_ADD([Miscellaneous], [PRRTE], [], [$opal_prrte_mode])
 
     OPAL_VAR_SCOPE_POP
@@ -197,6 +203,9 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
     opal_prrte_CPPFLAGS_save="${CPPFLAGS}"
     OPAL_FLAGS_APPEND_UNIQ([CPPFLAGS], [${opal_pmix_CPPFLAGS}])
 
+    AC_DEFINE_UNQUOTED([OMPI_HAVE_PRTE_LAUNCH], [1],
+                     [prte_launch support available in ompi (aka internal) prrte])
+
     AC_MSG_CHECKING([if PMIx version is 4.0.0 or greater])
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pmix_version.h>]],
             [[
@@ -299,6 +308,11 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_EXTERNAL], [
            AS_IF([test "${ompi_setup_prrte_cv_version_happy}" = "no"],
                  [setup_prrte_external_happy="no"])])
 
+    AS_IF([test "${setup_prrte_external_happy}" = "yes"],
+          [AC_CHECK_DECL([prte_launch],
+                  [OMPI_HAVE_PRTE_LAUNCH=1], [OMPI_HAVE_PRTE_LAUNCH=0],
+                  [#include "prte.h"])],[])
+
     CPPFLAGS="$opal_prrte_CPPFLAGS_save"
 
     # If an external build and the user told us where to find PRRTE,

ompi/tools/mpirun/main.c

@@ -80,7 +80,7 @@ static void setup_mca_prefixes(void)
 }
 
 
-#if OMPI_USING_INTERNAL_PRRTE
+#if OMPI_HAVE_PRTE_LAUNCH
 
 /* we can use prte_launch */
 
@@ -111,7 +111,9 @@ int main(int argc, char *argv[])
     /* as a special case, if OPAL_PREFIX was set and either PRRTE or
      * PMIx are internal builds, set their prefix variables as well */
     if (NULL != opal_prefix) {
+#if OMPI_USING_INTERNAL_PRRTE
         setenv("PRTE_PREFIX", opal_prefix, 1);
+#endif
 #if OPAL_USING_INTERNAL_PMIX
         setenv("PMIX_PREFIX", opal_prefix, 1);
 #endif
@@ -140,8 +142,6 @@ int main(int argc, char *argv[])
 
 #else
 
-/* using external prrte so cannot assume there's a prte_launch */
-
 static char *find_prterun(void)
 {
     char *filename = NULL;
@@ -202,6 +202,9 @@ int main(int argc, char *argv[])
     /* as a special case, if OPAL_PREFIX was set and either PRRTE or
      * PMIx are internal builds, set their prefix variables as well */
     if (NULL != opal_prefix) {
+#if OMPI_USING_INTERNAL_PRRTE
+        setenv("PRTE_PREFIX", opal_prefix, 1);
+#endif
 #if OPAL_USING_INTERNAL_PMIX
         setenv("PMIX_PREFIX", opal_prefix, 1);
 #endif
@@ -237,11 +240,11 @@ int main(int argc, char *argv[])
      * TODO: Need to handle --prefix rationally here. */
     for (i = 1; NULL != argv[i]; i++) {
         opal_argv_append_nosize(&prterun_args, argv[i]);
-    }   
+    }
     ret = execv(full_prterun_path, prterun_args);
     opal_show_help("help-mpirun.txt", "prterun-exec-failed",
                    1, full_prterun_path, strerror(errno));
     exit(1);       
 }   
-#endif /*  OMPI_USING_INTERNAL_PRRTE */
+#endif /* OMPI_HAVE_PRTE_LAUNCH */