Topic/test tomns ci

NEWS

@@ -28,6 +28,8 @@ Additional copyrights may follow
 
 $HEADER$
 
+exicting new stuff
+
 ===========================================================================
 
 This file contains the main features as well as overviews of specific

config/ompi_pmix_add_args.m4

@@ -0,0 +1,45 @@
+AC_DEFUN([OMPI_PMIX_ADD_ARGS],[
+    opal_show_subtitle "PMIx Configuration options"
+
+    AC_ARG_WITH([pmix-platform-patches-dir],
+                [AC_HELP_STRING([--with-pmix-platform-patches-dir=DIR],
+                                [Location of the platform patches directory. If you use this option, you must also use --with-pmix-platform.])])
+
+    AC_ARG_WITH([pmix-platform],
+                [AC_HELP_STRING([--with-pmix-platform=FILE],
+                                [Load options for build from FILE.  Options on the
+                                 command line not in FILE are used.  Options on the
+                                 command line and in FILE are replaced by what is on the command line])])
+
+	AC_ARG_WITH([jansson],
+                [AC_HELP_STRING([--with-jansson(=DIR)],
+                                [Build jansson support (default=no), optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
+    AC_ARG_WITH([jansson-libdir],
+                [AC_HELP_STRING([--with-jansson-libdir=DIR],
+                                [Search for Jansson libraries in DIR])])
+
+	AC_ARG_WITH([curl],
+                [AC_HELP_STRING([--with-curl(=DIR)],
+                                [Build curl support (default=no), optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
+    AC_ARG_WITH([curl-libdir],
+                [AC_HELP_STRING([--with-curl-libdir=DIR],
+                                [Search for Curl libraries in DIR])])
+
+   AC_ARG_WITH([zlib],
+                [AC_HELP_STRING([--with-zlib=DIR],
+                                [Search for zlib headers and libraries in DIR ])])
+    AC_ARG_WITH([zlib-libdir],
+                [AC_HELP_STRING([--with-zlib-libdir=DIR],
+                                [Search for zlib libraries in DIR ])])
+
+    AC_ARG_WITH([munge],
+                [AC_HELP_STRING([--with-munge=DIR],
+                                [Search for munge headers and libraries in DIR ])])
+    AC_ARG_WITH([munge-libdir],
+                [AC_HELP_STRING([--with-munge-libdir=DIR],
+                                [Search for munge libraries in DIR ])])
+
+    AC_ARG_ENABLE([dstore-pthlck],
+                  [AC_HELP_STRING([--disable-dstore-pthlck],
+                                  [Disable pthread-based locking in dstor (default: enabled)])])
+])

config/ompi_prrte_add_args.m4

@@ -0,0 +1,53 @@
+AC_DEFUN([OMPI_PRRTE_ADD_ARGS],[
+    opal_show_subtitle "PRRTE Configuration options"
+
+    AC_ARG_WITH([alps],
+                [AC_HELP_STRING([--with-alps(=DIR|yes|no)],
+                                [Build with ALPS scheduler component, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries (default: auto)])],[],with_alps=auto)
+    AC_ARG_WITH([alps-libdir],
+                [AC_HELP_STRING([--with-alps-libdir=DIR],
+                                [Location of alps libraries (alpslli, alpsutil) (default: /usr/lib/alps (/opt/cray/xe-sysroot/default/user on eslogin nodes))])])
+
+	AC_ARG_WITH([sge],
+                [AC_HELP_STRING([--with-sge],
+                               [Build SGE or Grid Engine support (default: no)])])
+
+    AC_ARG_WITH([tm],
+                [AC_HELP_STRING([--with-tm(=DIR)],
+                                [Build TM (Torque, PBSPro, and compatible) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
+
+    AC_ARG_WITH([moab],
+                [AC_HELP_STRING([--with-moab],
+                                [Build MOAB scheduler component (default: yes)])])
+    AC_ARG_WITH([moab-libdir],
+                [AC_HELP_STRING([--with-moab-libdir=DIR],
+                                [Search for Moab libraries in DIR])])
+
+    AC_ARG_WITH([lsf],
+                [AC_HELP_STRING([--with-lsf(=DIR)],
+                                [Build LSF support])])
+    AC_ARG_WITH([lsf-libdir],
+                [AC_HELP_STRING([--with-lsf-libdir=DIR],
+                                [Search for LSF libraries in DIR])])
+
+    AC_ARG_WITH([slurm],
+                [AC_HELP_STRING([--with-slurm],
+                                [Build SLURM scheduler component (default: yes)])])
+
+    AC_ARG_WITH([singularity],
+                [AC_HELP_STRING([--with-singularity(=DIR)],
+                                [Build support for the Singularity container, optionally adding DIR to the search path])])
+
+    AC_ARG_WITH([prte-platform-patches-dir],
+                [AC_HELP_STRING([--with-prte-platform-patches-dir=DIR],
+                                [Location of the platform patches directory. If you use this option, you must also use --with-prte-platform.])])
+    AC_ARG_WITH([prte-platform],
+                [AC_HELP_STRING([--with-prte-platform=FILE],
+                                [Load options for build from FILE.  Options on the
+                                 command line not in FILE are used.  Options on the
+                                 command line and in FILE are replaced by what is on the command line])])
+
+    AC_ARG_ENABLE([prte-ft],
+                  [AC_HELP_STRING([--enable-prte-ft],
+                  [Enable PRRTE fault tolerance support (default: disabled)])])
+])

config/opal_check_cuda.m4

@@ -91,8 +91,8 @@ AS_IF([test "$opal_check_cuda_happy" = "yes"],
 # If we have CUDA support, check to see if we have support for SYNC_MEMOPS
 # which was first introduced in CUDA 6.0.
 AS_IF([test "$opal_check_cuda_happy"="yes"],
-    AC_CHECK_DECL([CU_POINTER_ATTRIBUTE_SYNC_MEMOPS], [CUDA_SYNC_MEMOPS=1], [CUDA_SYNC_MEMOPS=0],
-        [#include <$opal_cuda_incdir/cuda.h>]),
+    [AC_CHECK_DECL([CU_POINTER_ATTRIBUTE_SYNC_MEMOPS], [CUDA_SYNC_MEMOPS=1], [CUDA_SYNC_MEMOPS=0],
+        [#include <$opal_cuda_incdir/cuda.h>])],
     [])
 
 # If we have CUDA support, check to see if we have CUDA 6.0 or later.