Changeset 5681

Timestamp:

11/04/09 10:24:13 (3 weeks ago)

Author:

balaji

Message:

Export the MPICH2 version and other relevant information for Hydra to
pick up (this will be displayed in mpiexec -info). This required
replacing the "VERSION" string to "MPICH2_VERSION" since VERSION seems
to be overwritten by autoconf.

Reviewed by buntinas.

Location:

mpich2/trunk

Files:

• configure.in (modified) (5 diffs)
• src/include/mpi.h.in (modified) (1 diff)
• src/pm/hydra/configure.in (modified) (2 diffs)
• src/pm/hydra/ui/mpiexec/utils.c (modified) (1 diff)

mpich2/trunk/configure.in

@@ -138 +138 @@
 # Try to find the version
 if test -s "$srcdir/maint/Version" ; then
-    VERSION="`cat $srcdir/maint/Version`"
+    MPICH2_VERSION="`cat $srcdir/maint/Version`"
+    export MPICH2_VERSION
 else
     AC_MSG_ERROR([Version information not found. Configuration aborted.])
@@ -162 +163 @@
 # 2 digits for REV, 1 digit for EXT and 2 digits for EXT_NUMBER.
 changequote(<<,>>)
-V1=`expr $VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*[a-zA-Z]*[0-9]*'`
-V2=`expr $VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*[a-zA-Z]*[0-9]*'`
-V3=`expr $VERSION : '[0-9]*\.[0-9]*\.*\([0-9]*\)[a-zA-Z]*[0-9]*'`
-V4=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*\([a-zA-Z]*\)[0-9]*'`
-V5=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*[a-zA-Z]*\([0-9]*\)'`
+V1=`expr $MPICH2_VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*[a-zA-Z]*[0-9]*'`
+V2=`expr $MPICH2_VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*[a-zA-Z]*[0-9]*'`
+V3=`expr $MPICH2_VERSION : '[0-9]*\.[0-9]*\.*\([0-9]*\)[a-zA-Z]*[0-9]*'`
+V4=`expr $MPICH2_VERSION : '[0-9]*\.[0-9]*\.*[0-9]*\([a-zA-Z]*\)[0-9]*'`
+V5=`expr $MPICH2_VERSION : '[0-9]*\.[0-9]*\.*[0-9]*[a-zA-Z]*\([0-9]*\)'`
 changequote([,])
 
@@ -186 +187 @@
 if test "$V5" -le 9 ; then V5=0$V5 ; fi
 
-NUMVERSION=`expr $V1$V2$V3$V4$V5 + 0`
-AC_SUBST(NUMVERSION)
-AC_SUBST(VERSION)
+MPICH2_NUMVERSION=`expr $V1$V2$V3$V4$V5 + 0`
+AC_SUBST(MPICH2_NUMVERSION)
+AC_SUBST(MPICH2_VERSION)
 
 
@@ -203 +204 @@
 # libtool manual) 
 changequote(<<,>>)
-V1=`expr $VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*[a-zA-Z]*[0-9]*'`
-V2=`expr $VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*[a-zA-Z]*[0-9]*'`
+V1=`expr $MPICH2_VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*[a-zA-Z]*[0-9]*'`
+V2=`expr $MPICH2_VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*[a-zA-Z]*[0-9]*'`
 changequote([,])
 ABIVERSION="${V1}:${V2}"
@@ -213 +214 @@
 AC_SUBST(CONFIGURE_ARGUMENTS)
 if test -n "$ac_configure_args" ; then
-    echo "Configuring MPICH2 version $VERSION with $ac_configure_args"
+    echo "Configuring MPICH2 version $MPICH2_VERSION with $ac_configure_args"
 else 
-    echo "Configuring MPICH2 version $VERSION"
+    echo "Configuring MPICH2 version $MPICH2_VERSION"
 fi
 # Add the information on the system:

mpich2/trunk/src/include/mpi.h.in

@@ -302 +302 @@
  * 1.0.7rc1 will have the numeric version 10007201.
  */
-#define MPICH2_VERSION "@VERSION@"
-#define MPICH2_NUMVERSION @NUMVERSION@
+#define MPICH2_VERSION "@MPICH2_VERSION@"
+#define MPICH2_NUMVERSION @MPICH2_NUMVERSION@
 
 #define MPICH2_RELEASE_TYPE_ALPHA  0

mpich2/trunk/src/pm/hydra/configure.in

@@ -5 +5 @@
 #
 
-AC_INIT([Hydra], [0.1])
+AC_INIT([Hydra], [0])
 AC_CONFIG_AUX_DIR(mpl/confdb)
 AC_CONFIG_MACRO_DIR(mpl/confdb)
@@ -34 +34 @@
 PAC_C_GNU_ATTRIBUTE
 PAC_CC_FUNCTION_NAME_SYMBOL
+
+# Build information
+if test "x$MPICH2_VERSION" = "x" ; then
+   HYDRA_VERSION="unknown"
+else
+   HYDRA_VERSION=$MPICH2_VERSION
+fi
+AC_DEFINE_UNQUOTED(HYDRA_VERSION,"$HYDRA_VERSION",[Hydra version information])
+AC_DEFINE_UNQUOTED(HYDRA_CC,"$CC",[C compiler])
+AC_DEFINE_UNQUOTED(HYDRA_CXX,"$CXX",[C++ compiler])
+AC_DEFINE_UNQUOTED(HYDRA_F77,"$F77",[Fortran 77 compiler])
+AC_DEFINE_UNQUOTED(HYDRA_F90,"$F90",[Fortran 90 compiler])
+AC_DEFINE_UNQUOTED(HYDRA_CONFIGURE_ARGS_CLEAN,"$ac_configure_args",[Configure arguments])
 
 # Find the full path of the source dir (for VPATH builds)

mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c

@@ -875 +875 @@
     }
 
-    printf("HYDRA build details:\n");
-    printf("    Process Manager: pmi\n");
-    printf("    Boot-strap servers available: %s\n", HYDRA_BSS_NAMES);
-    printf("    Communication sub-systems available: none\n");
-    printf("    Binding libraries available: %s\n", HYDRA_BINDLIB_NAMES);
-    printf("    Checkpointing libraries available: %s\n", HYDRA_CKPOINTLIB_NAMES);
+    HYDU_dump_noprefix(stdout,
+                       "HYDRA build details:\n");
+    HYDU_dump_noprefix(stdout,
+                       "    Version:                                 %s\n", HYDRA_VERSION);
+    HYDU_dump_noprefix(stdout,
+                       "    CC:                                      %s\n", HYDRA_CC);
+    HYDU_dump_noprefix(stdout,
+                       "    CXX:                                     %s\n", HYDRA_CXX);
+    HYDU_dump_noprefix(stdout,
+                       "    F77:                                     %s\n", HYDRA_F77);
+    HYDU_dump_noprefix(stdout,
+                       "    F90:                                     %s\n", HYDRA_F90);
+    HYDU_dump_noprefix(stdout,
+                       "    Configure options:                       %s\n",
+                       HYDRA_CONFIGURE_ARGS_CLEAN);
+    HYDU_dump_noprefix(stdout,
+                       "    Process Manager:                         pmi\n");
+    HYDU_dump_noprefix(stdout,
+                       "    Boot-strap servers available:            %s\n",
+                       HYDRA_BSS_NAMES);
+    HYDU_dump_noprefix(stdout,
+                       "    Communication sub-systems available:     none\n");
+    HYDU_dump_noprefix(stdout,
+                       "    Binding libraries available:             %s\n",
+                       HYDRA_BINDLIB_NAMES);
+    HYDU_dump_noprefix(stdout,
+                       "    Checkpointing libraries available:       %s\n",
+                       HYDRA_CKPOINTLIB_NAMES);
 
     HYDU_ERR_SETANDJUMP(status, HYD_GRACEFUL_ABORT, "");