* Clean up the ompi_mca macro's support for different configuration

types and add STOP_AT_FIRST_PRIORITY type for framework configuration, which allows all components at the highest priority that succeeds to succeed * Use STOP_AT_FIRST_PRIORITY type for gpr framework, so that the null component isn't built when the replica and proxy components are available. This commit was SVN r15286.
2007-07-04 22:00:15 +00:00 · 2007-07-04 22:00:15 +00:00 · b27b9b5380
--- a/config/ompi_mca.m4
+++ b/config/ompi_mca.m4
@ -351,22 +351,17 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
    AC_MSG_CHECKING([for m4 configure components in framework $2])
    AC_MSG_RESULT([mca_$2_m4_config_component_list])

-    # if we only want the first successful component, set the variable
-    # happy_value to 0 so we stop on first assignment.  Otherwise, set
-    # it to zero so that components_looking_for_succeed is always 1
-    m4_if(OMPI_EVAL_ARG([MCA_]mca_framework[_CONFIGURE_MODE]), 
-          [STOP_AT_FIRST],
-          [happy_value=0],
-          [happy_value=1])
-
-    components_looking_for_succeed=1
-
    # configure components that don't have any component-specific
    # configuration.  See comment in CONFIGURE_PROJECT about the
-    # m4_ifval
-    # if there isn't a component list, abort
+    # m4_ifval in the m4_foreach.  If there isn't a component list,
+    # abort with a reasonable message.  If there are components in the
+    # list, but we're doing one of the "special" selection logics,
+    # abort with a reasonable message.
    m4_ifdef([mca_$2_no_config_component_list], [], 
             [m4_fatal([Could not find mca_$2_no_config_component_list - rerun autogen.sh without -l])])
+    m4_if(OMPI_EVAL_ARG([MCA_]mca_framework[_CONFIGURE_MODE]), [STOP_AT_FIRST],
+          [m4_ifval(mca_$2_no_config_component_list,
+                   [m4_fatal([Framework $2 using STOP_AT_FIRST but at least one component has no configure.m4])])])
    m4_foreach(mca_component, [mca_$2_no_config_component_list],
               [m4_ifval(mca_component,
                  [MCA_CONFIGURE_NO_CONFIG_COMPONENT($1, $2, mca_component, 
@ -374,27 +369,41 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
                                                     [static_components],
                                                     [dso_components],
                                                     [static_ltlibs],
-                                                     [$components_looking_for_succeed])])])
+                                                     [1])])])

-    # configure components that use built-in configuration scripts
-    # see comment in CONFIGURE_PROJECT about the m4_ifval
-    # if there isn't a component list, abort
+    # configure components that use built-in configuration scripts see
+    # comment in CONFIGURE_PROJECT about the m4_ifval in the
+    # m4_foreach.  if there isn't a component list, abort
    m4_ifdef([mca_$2_m4_config_component_list], [], 
             [m4_fatal([Could not find mca_$2_m4_config_component_list - rerun autogen.sh without -l])])
+    best_mca_component_priority=0
+    components_looking_for_succeed=1
+    components_last_result=0
    m4_foreach(mca_component, [mca_$2_m4_config_component_list],
               [m4_ifval(mca_component,
-                  [MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, $2, mca_component, 
+                  [m4_if(OMPI_EVAL_ARG([MCA_]mca_framework[_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
+                         [ # get the component's priority...
+                          infile="$srcdir/$1/mca/$2/mca_component/configure.params"
+                          mca_component_priority="`$GREP PARAM_CONFIG_PRIORITY= $infile | cut -d= -f2-`"
+                          AS_IF([test -z "$mca_component_priority"], [mca_component_priority=0])
+                          AS_IF([test $best_mca_component_priority -gt $mca_component_priority], [components_looking_for_succeed=0])])
+                   MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, $2, mca_component, 
                                                     [all_components],
                                                     [static_components],
                                                     [dso_components],
                                                     [static_ltlibs],
                                                     [$components_looking_for_succeed],
-                                                     [components_looking_for_succeed="$happy_value"])])])
+                                                     [components_last_result=1],
+                                                     [components_last_result=0])
+                   m4_if(OMPI_EVAL_ARG([MCA_]mca_framework[_CONFIGURE_MODE]), [STOP_AT_FIRST],
+                         [AS_IF([test $components_last_result -eq 1], [components_looking_for_succeed=0])])
+                   m4_if(OMPI_EVAL_ARG([MCA_]mca_framework[_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
+                         [AS_IF([test $components_last_result -eq 1], [best_mca_component_priority=$mca_component_priority])])])])

    # configure components that provide their own configure script.
    # It would be really hard to run these for "find first that
    # works", so we don't :)
-    AS_IF([test "$happy_value" = "1"],
+    m4_if(OMPI_EVAL_ARG([MCA_]mca_framework[_CONFIGURE_MODE]), [STOP_AT_FIRST], [],
          [MCA_CONFIGURE_ALL_CONFIG_COMPONENTS($1, $2, [all_components],
                                               [static_components], [dso_components],
                                               [static_ltlibs])])
--- a/orte/mca/gpr/configure.m4
+++ b/orte/mca/gpr/configure.m4
@ -0,0 +1,13 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2007      Los Alamos National Security, LLC.
+dnl                         All rights reserved. 
+dnl $COPYRIGHT$
+dnl 
+dnl Additional copyrights may follow
+dnl 
+dnl $HEADER$
+dnl
+
+dnl we only want same priority level components
+m4_define(MCA_gpr_CONFIGURE_MODE, STOP_AT_FIRST_PRIORITY)
--- a/orte/mca/gpr/null/configure.m4
+++ b/orte/mca/gpr/null/configure.m4
@ -0,0 +1,15 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2007      Los Alamos National Security, LLC.
+#                         All rights reserved. 
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# MCA_gpr_null_CONFIG(action-if-can-compile, 
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_gpr_null_CONFIG],[$1])
--- a/orte/mca/gpr/null/configure.params
+++ b/orte/mca/gpr/null/configure.params
@ -22,3 +22,4 @@
 # Specific to this module

 PARAM_CONFIG_FILES="Makefile"
+PARAM_CONFIG_PRIORITY=0
--- a/orte/mca/gpr/proxy/configure.m4
+++ b/orte/mca/gpr/proxy/configure.m4
@ -0,0 +1,15 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2007      Los Alamos National Security, LLC.
+#                         All rights reserved. 
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# MCA_gpr_proxy_CONFIG(action-if-can-compile, 
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_gpr_proxy_CONFIG],[$1])
--- a/orte/mca/gpr/proxy/configure.params
+++ b/orte/mca/gpr/proxy/configure.params
@ -22,3 +22,4 @@
 # Specific to this module

 PARAM_CONFIG_FILES="Makefile"
+PARAM_CONFIG_PRIORITY=10
--- a/orte/mca/gpr/replica/configure.m4
+++ b/orte/mca/gpr/replica/configure.m4
@ -0,0 +1,15 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2007      Los Alamos National Security, LLC.
+#                         All rights reserved. 
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# MCA_gpr_proxy_CONFIG(action-if-can-compile, 
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_gpr_replica_CONFIG],[$1])
--- a/orte/mca/gpr/replica/configure.params
+++ b/orte/mca/gpr/replica/configure.params
@ -22,3 +22,4 @@
 # Specific to this module

 PARAM_CONFIG_FILES="Makefile api_layer/Makefile transition_layer/Makefile functional_layer/Makefile communications/Makefile"
+PARAM_CONFIG_PRIORITY=10