Merge branch 'fe_reorg' into openmpi

Conflicts: src/fe/Makefile.am src/fe/Makefile.in src/fe/configure src/fe/configure.ac src/fe/launchmon/Makefile.am src/fe/launchmon/Makefile.in
hpc · Mar 28, 2014 · 4c83074 · 4c83074
2 parents e420870 + 4a181e6
commit 4c83074
Show file tree

Hide file tree

Showing 49 changed files with 2,090 additions and 890 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -152,6 +152,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_LMON = @HAVE_LMON@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/config.h.in b/config.h.in
@@ -21,6 +21,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Build with LaunchMON support */
+#undef HAVE_LMON
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

diff --git a/configure b/configure
@@ -822,13 +822,16 @@ SOCKETS_FALSE
 SOCKETS_TRUE
 PIPES_FALSE
 PIPES_TRUE
-LMON_DYNAMIC_FALSE
-LMON_DYNAMIC_TRUE
 TESTRM
 AM_CFLAGS
+LMON_DYNAMIC_FALSE
+LMON_DYNAMIC_TRUE
+LMON_FALSE
+LMON_TRUE
 LAUNCHMON_RMCOMM
 LAUNCHMON_LIB
 LAUNCHMON_INC
+HAVE_LMON
 LAUNCHMON_STATIC_LIBS
 CXXCPP
 CPP
@@ -5128,13 +5131,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5131: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5134: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5134: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5137: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5137: output\"" >&5)
+  (eval echo "\"\$as_me:5140: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6340,7 +6343,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6343 "configure"' > conftest.$ac_ext
+  echo '#line 6346 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8931,11 +8934,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8934: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8937: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8938: \$? = $ac_status" >&5
+   echo "$as_me:8941: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9270,11 +9273,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9273: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9276: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9277: \$? = $ac_status" >&5
+   echo "$as_me:9280: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9375,11 +9378,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9378: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9381: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9382: \$? = $ac_status" >&5
+   echo "$as_me:9385: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9430,11 +9433,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9433: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9436: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9437: \$? = $ac_status" >&5
+   echo "$as_me:9440: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12233,7 +12236,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12236 "configure"
+#line 12239 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12329,7 +12332,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12332 "configure"
+#line 12335 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14349,11 +14352,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14352: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14356: \$? = $ac_status" >&5
+   echo "$as_me:14359: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14448,11 +14451,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14451: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14455: \$? = $ac_status" >&5
+   echo "$as_me:14458: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14500,11 +14503,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14503: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14506: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14507: \$? = $ac_status" >&5
+   echo "$as_me:14510: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15557,24 +15560,25 @@ if test "${with_launchmon+set}" = set; then
   withval=$with_launchmon; LAUNCHMON_INC_DIR="${withval}/include";
         LAUNCHMON_LIB_DIR="${withval}/lib";
         LAUNCHMON_RMCOMM_DIR="${withval}/lib"
+        EXPLICIT_LMON=true
 fi
 
 
 # Check whether --with-launchmon-incdir was given.
 if test "${with_launchmon_incdir+set}" = set; then
-  withval=$with_launchmon_incdir; LAUNCHMON_INC_DIR="${withval}";
+  withval=$with_launchmon_incdir; LAUNCHMON_INC_DIR="${withval}";EXPLICIT_LMON=true
 fi
 
 
 # Check whether --with-launchmon-libdir was given.
 if test "${with_launchmon_libdir+set}" = set; then
-  withval=$with_launchmon_libdir; LAUNCHMON_LIB_DIR="${withval}";
+  withval=$with_launchmon_libdir; LAUNCHMON_LIB_DIR="${withval}";EXPLICIT_LMON=true
 fi
 
 
 # Check whether --with-launchmon-rmcommdir was given.
 if test "${with_launchmon_rmcommdir+set}" = set; then
-  withval=$with_launchmon_rmcommdir; LAUNCHMON_RMCOMM_DIR="${withval}";
+  withval=$with_launchmon_rmcommdir; LAUNCHMON_RMCOMM_DIR="${withval}";EXPLICIT_LMON=true
 fi
 
 
@@ -15719,27 +15723,32 @@ if test "x$ac_cv_header_lmon_api_lmon_fe_h" = x""yes; then
   { $as_echo "$as_me:$LINENO: Found launchmon headers" >&5
 $as_echo "$as_me: Found launchmon headers" >&6;}
 else
-  { { $as_echo "$as_me:$LINENO: error: Couldn't find or build LaunchMON includes" >&5
-$as_echo "$as_me: error: Couldn't find or build LaunchMON includes" >&2;}
+  if test "x$EXPLICIT_LMON" == "xtrue";
+                   then { { $as_echo "$as_me:$LINENO: error: Could not find or build LaunchMON includes" >&5
+$as_echo "$as_me: error: Could not find or build LaunchMON includes" >&2;}
    { (exit 1); exit 1; }; }
+                   else { $as_echo "$as_me:$LINENO: WARNING: Could not find or build LaunchMON includes" >&5
+$as_echo "$as_me: WARNING: Could not find or build LaunchMON includes" >&2;}; HAVE_LMON=false
+                 fi
 fi
 
 
 CPPFLAGS=$CPPFLAGS_HOLD
 
-LDFLAGS_HOLD=$LDFLAGS
-LIBS_HOLD=$LIBS
-if test "x$LAUNCHMON_LIB_DIR" != "x"; then
-  LAUNCHMON_LIB=-L$LAUNCHMON_LIB_DIR
-  LAUNCHMON_BIN=$LAUNCHMON_LIB_DIR/../bin
-fi
-LDFLAGS="$LDFLAGS $LAUNCHMON_LIB"
+if test "xHAVE_LMON" != "xfalse"; then
+  LDFLAGS_HOLD=$LDFLAGS
+  LIBS_HOLD=$LIBS
+  if test "x$LAUNCHMON_LIB_DIR" != "x"; then
+    LAUNCHMON_LIB=-L$LAUNCHMON_LIB_DIR
+    LAUNCHMON_BIN=$LAUNCHMON_LIB_DIR/../bin
+  fi
+  LDFLAGS="$LDFLAGS $LAUNCHMON_LIB"
 
-if test "x$LAUNCHMON_RMCOMM_DIR" != "x"; then
-  LAUNCHMON_RMCOMM="-Wl,-rpath=$LAUNCHMON_RMCOMM_DIR"
-fi
+  if test "x$LAUNCHMON_RMCOMM_DIR" != "x"; then
+    LAUNCHMON_RMCOMM="-Wl,-rpath=$LAUNCHMON_RMCOMM_DIR"
+  fi
 
-{ $as_echo "$as_me:$LINENO: checking for LMON_fe_init in -lmonfeapi" >&5
+  { $as_echo "$as_me:$LINENO: checking for LMON_fe_init in -lmonfeapi" >&5
 $as_echo_n "checking for LMON_fe_init in -lmonfeapi... " >&6; }
 if test "${ac_cv_lib_monfeapi_LMON_fe_init+set}" = set; then
   $as_echo_n "(cached) " >&6
@@ -15806,24 +15815,31 @@ fi
 $as_echo "$ac_cv_lib_monfeapi_LMON_fe_init" >&6; }
 if test "x$ac_cv_lib_monfeapi_LMON_fe_init" = x""yes; then
   { $as_echo "$as_me:$LINENO: Found launchmon libraries" >&5
-$as_echo "$as_me: Found launchmon libraries" >&6;}
+$as_echo "$as_me: Found launchmon libraries" >&6;};HAVE_LMON=true
 else
-  { { $as_echo "$as_me:$LINENO: error: Couldn't find LaunchMON libraries" >&5
-$as_echo "$as_me: error: Couldn't find LaunchMON libraries" >&2;}
+  if test "x$EXPLICIT_LMON" == "xtrue";
+                   then { { $as_echo "$as_me:$LINENO: error: Could not find or build LaunchMON libraries" >&5
+$as_echo "$as_me: error: Could not find or build LaunchMON libraries" >&2;}
    { (exit 1); exit 1; }; }
+                   else { $as_echo "$as_me:$LINENO: WARNING: Could not find or build LaunchMON libraries" >&5
+$as_echo "$as_me: WARNING: Could not find or build LaunchMON libraries" >&2;}; HAVE_LMON=false
+                fi
 fi
 
-ac_ext=cpp
+fi
+
+if test "xHAVE_LMON" != "xfalse"; then
+  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether we can statically link launchmon" >&5
+  { $as_echo "$as_me:$LINENO: checking whether we can statically link launchmon" >&5
 $as_echo_n "checking whether we can statically link launchmon... " >&6; }
-LAUNCHMON_STATIC_LIBS_TEST="$LAUNCHMON_LIB_DIR/libmonbeapi.a $LAUNCHMON_LIB_DIR/libcobo.a $LAUNCHMON_LIB_DIR/libgcrypt.a $LAUNCHMON_LIB_DIR/libgpg-error.a"
-LIBS="$LIBS $LAUNCHMON_STATIC_LIBS_TEST"
-cat >conftest.$ac_ext <<_ACEOF
+  LAUNCHMON_STATIC_LIBS_TEST="$LAUNCHMON_LIB_DIR/libmonbeapi.a $LAUNCHMON_LIB_DIR/libcobo.a $LAUNCHMON_LIB_DIR/libgcrypt.a $LAUNCHMON_LIB_DIR/libgpg-error.a"
+  LIBS="$LIBS $LAUNCHMON_STATIC_LIBS_TEST"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15860,7 +15876,7 @@ $as_echo "$ac_try_echo") >&5
 	 $as_test_x conftest$ac_exeext
        }; then
   LAUNCHMON_STATIC_LIBS=$LAUNCHMON_STATIC_LIBS_TEST
-               { $as_echo "$as_me:$LINENO: result: yes" >&5
+                 { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   $as_echo "$as_me: failed program was:" >&5
@@ -15873,14 +15889,17 @@ fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-ac_ext=c
+  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-LDFLAGS=$LDFLAGS_HOLD
-LIBS=$LIBS_HOLD
+  LDFLAGS=$LDFLAGS_HOLD
+  LIBS=$LIBS_HOLD
+fi
+
+
 
 
 
@@ -15892,6 +15911,31 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+ if test "x$HAVE_LMON" == "xtrue"; then
+  LMON_TRUE=
+  LMON_FALSE='#'
+else
+  LMON_TRUE='#'
+  LMON_FALSE=
+fi
+
+ if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then
+  LMON_DYNAMIC_TRUE=
+  LMON_DYNAMIC_FALSE='#'
+else
+  LMON_DYNAMIC_TRUE='#'
+  LMON_DYNAMIC_FALSE=
+fi
+
+
+if test "x$HAVE_LMON" == "xtrue"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LMON 1
+_ACEOF
+
+fi
+
 
   { $as_echo "$as_me:$LINENO: checking for thread local storage (TLS) class" >&5
 $as_echo_n "checking for thread local storage (TLS) class... " >&6; }
@@ -16075,14 +16119,6 @@ if test "${enable_cobo+set}" = set; then
 fi
 
 
- if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then
-  LMON_DYNAMIC_TRUE=
-  LMON_DYNAMIC_FALSE='#'
-else
-  LMON_DYNAMIC_TRUE='#'
-  LMON_DYNAMIC_FALSE=
-fi
-
  if test x$CLIENT_SERVER_COM == xpipes; then
   PIPES_TRUE=
   PIPES_FALSE='#'
@@ -16926,6 +16962,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${LMON_TRUE}" && test -z "${LMON_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"LMON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"LMON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${LMON_DYNAMIC_TRUE}" && test -z "${LMON_DYNAMIC_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"LMON_DYNAMIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5

diff --git a/configure.common.ac b/configure.common.ac
@@ -52,7 +52,6 @@ AC_ARG_ENABLE(cobo,
               [AS_HELP_STRING([--enable-cobo],[Use msocket for inter-server communication])],
               [SERVER_SERVER_COM=cobo;],)
 
-AM_CONDITIONAL([LMON_DYNAMIC], [test "x$LAUNCHMON_STATIC_LIBS" == "x"])
 AM_CONDITIONAL([PIPES], [test x$CLIENT_SERVER_COM == xpipes])
 AM_CONDITIONAL([SOCKETS], [test x$CLIENT_SERVER_COM == xsocket])
 AM_CONDITIONAL([SHMEM], [test x$CLIENT_SERVER_COM == xshmem])