Merge branch 'master' into hadrons

configure.ac

@@ -53,7 +53,6 @@ echo
 echo Checking libraries 
 echo :::::::::::::::::::::::::::::::::::::::::::
 
-
 AC_CHECK_FUNCS([gettimeofday])
 
 #AC_CHECK_LIB([gmp],[__gmpf_init],,
@@ -66,12 +65,18 @@ AC_CHECK_FUNCS([gettimeofday])
 #Please install or provide the correct path to your installation
 #Info at: http://www.mpfr.org/)])
 
+#
+# SIMD instructions selection
+#
+
 AC_ARG_ENABLE([simd],[AC_HELP_STRING([--enable-simd=SSE4|AVX|AVXFMA4|AVX2|AVX512|IMCI],\
 	[Select instructions to be SSE4.0, AVX 1.0, AVX 2.0+FMA, AVX 512, IMCI])],\
 	[ac_SIMD=${enable_simd}],[ac_SIMD=AVX2])
 
 supported=no
 
+ac_ZMM=no;
+
 case ${ac_SIMD} in
      SSE4)
        echo Configuring for SSE4
@@ -113,11 +118,13 @@ case ${ac_SIMD} in
        echo Configuring for AVX512 
        AC_DEFINE([AVX512],[1],[AVX512 Intrinsics for Knights Landing] )
        supported="cross compilation"
+       ac_ZMM=yes;
      ;;
      IMCI)
        echo Configuring for IMCI
        AC_DEFINE([IMCI],[1],[IMCI Intrinsics for Knights Corner] )
        supported="cross compilation"
+       ac_ZMM=yes;
      ;;
      NEONv8)
        echo Configuring for experimental ARMv8a support 
@@ -133,6 +140,17 @@ case ${ac_SIMD} in
      ;;
 esac
 
+case ${ac_ZMM} in
+yes)
+	echo Enabling ZMM source code
+;;
+no)
+	echo Disabling ZMM source code
+;;
+esac
+
+AM_CONDITIONAL(BUILD_ZMM,[ test "X${ac_ZMM}X" == "XyesX" ])
+
 AC_ARG_ENABLE([precision],[AC_HELP_STRING([--enable-precision=single|double],[Select default word size of Real])],[ac_PRECISION=${enable_precision}],[ac_PRECISION=double])
 case ${ac_PRECISION} in
      single)
@@ -145,6 +163,10 @@ case ${ac_PRECISION} in
      ;;
 esac
 
+#
+# Comms selection
+#
+
 AC_ARG_ENABLE([comms],[AC_HELP_STRING([--enable-comms=none|mpi],[Select communications])],[ac_COMMS=${enable_comms}],[ac_COMMS=none])
 
 case ${ac_COMMS} in
@@ -156,14 +178,54 @@ case ${ac_COMMS} in
        echo Configuring for MPI communications
        AC_DEFINE([GRID_COMMS_MPI],[1],[GRID_COMMS_MPI] )
      ;;
+     shmem)
+       echo Configuring for SHMEM communications
+       AC_DEFINE([GRID_COMMS_SHMEM],[1],[GRID_COMMS_SHMEM] )
+     ;;
      *)
      AC_MSG_ERROR([${ac_COMMS} unsupported --enable-comms option]); 
      ;;
 esac
 
+AM_CONDITIONAL(BUILD_COMMS_SHMEM,[ test "X${ac_COMMS}X" == "XshmemX" ])
 AM_CONDITIONAL(BUILD_COMMS_MPI,[ test "X${ac_COMMS}X" == "XmpiX" ])
 AM_CONDITIONAL(BUILD_COMMS_NONE,[ test "X${ac_COMMS}X" == "XnoneX" ])
 
+#
+# RNG selection
+#
+AC_ARG_ENABLE([rng],[AC_HELP_STRING([--enable-rng=ranlux48|mt19937],\
+	[Select Random Number Generator to be used])],\
+	[ac_RNG=${enable_rng}],[ac_RNG=ranlux48])
+case ${ac_RNG} in
+     ranlux48)
+     AC_DEFINE([RNG_RANLUX],[1],[RNG_RANLUX] )
+     ;;
+     mt19937)
+     AC_DEFINE([RNG_MT19937],[1],[RNG_MT19937] )
+     ;;
+     *)
+     AC_MSG_ERROR([${ac_RNG} unsupported --enable-rng option]); 
+     ;;
+esac
+#
+# Chroma regression tests
+#
+AC_ARG_ENABLE([chroma],[AC_HELP_STRING([--enable-chroma],[Expect chroma compiled under c++11 ])],ac_CHROMA=yes,ac_CHROMA=no)
+
+case ${ac_CHROMA} in
+     yes)
+       echo Enabling tests regressing to Chroma
+     ;;
+     no)
+       echo Disabling tests regressing to Chroma
+     ;;
+     *)
+     AC_MSG_ERROR([${ac_CHROMA} unsupported --enable-chroma option]); 
+     ;;
+esac
+
+AM_CONDITIONAL(BUILD_CHROMA_REGRESSION,[ test "X${ac_CHROMA}X" == "XyesX" ])
 
 ###################################################################
 # Checks for doxygen support
@@ -184,6 +246,7 @@ echo :::::::::::::::::::::::::::::::::::::::::::
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(lib/Makefile)
 AC_CONFIG_FILES(tests/Makefile)
+AC_CONFIG_FILES(tests/qdpxx/Makefile)
 AC_CONFIG_FILES(benchmarks/Makefile)
 AC_CONFIG_FILES(programs/Makefile)
 AC_CONFIG_FILES(programs/Hadrons/Makefile)
@@ -205,8 +268,10 @@ The following features are enabled:
 - graphs and diagrams           : `if test "x$enable_dot" = xyes; then echo yes; else echo no; fi`
 - Supported SIMD flags          : $SIMD_FLAGS
 ----------------------------------------------------------
-- enabled simd support          : ${ac_SIMD}   (supported: $supported )
+- enabled simd support          : ${ac_SIMD}   (config macro says supported: $supported )
 - communications type           : ${ac_COMMS}
+- default precision             : ${ac_PRECISION}
+- RNG choice                    : ${ac_RNG} 
 
 
 "