diff --git a/Makefile.in b/Makefile.in index c905f84b..b6894ef6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,11 +75,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ subdir = . DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) COPYING TODO \ - compile depcomp install-sh missing + compile config.guess config.sub depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -246,14 +249,22 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +host = @host@ host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ @@ -273,7 +284,11 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +target = @target@ target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/benchmarks/Grid_comms b/benchmarks/Grid_comms deleted file mode 100755 index 9013b3da..00000000 Binary files a/benchmarks/Grid_comms and /dev/null differ diff --git a/benchmarks/Grid_memory_bandwidth b/benchmarks/Grid_memory_bandwidth deleted file mode 100755 index 632fb5eb..00000000 Binary files a/benchmarks/Grid_memory_bandwidth and /dev/null differ diff --git a/benchmarks/Grid_su3 b/benchmarks/Grid_su3 deleted file mode 100755 index 72d8a8d0..00000000 Binary files a/benchmarks/Grid_su3 and /dev/null differ diff --git a/benchmarks/Grid_wilson b/benchmarks/Grid_wilson deleted file mode 100755 index ca7a454a..00000000 Binary files a/benchmarks/Grid_wilson and /dev/null differ diff --git a/config.guess b/config.guess new file mode 120000 index 00000000..5f6aa02d --- /dev/null +++ b/config.guess @@ -0,0 +1 @@ +/usr/share/automake-1.14/config.guess \ No newline at end of file diff --git a/config.sub b/config.sub new file mode 120000 index 00000000..0abfe18c --- /dev/null +++ b/config.sub @@ -0,0 +1 @@ +/usr/share/automake-1.14/config.sub \ No newline at end of file diff --git a/configure b/configure index f6bc2da7..e7d9f32f 100755 --- a/configure +++ b/configure @@ -679,6 +679,18 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +target_os +target_vendor +target_cpu +target +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build target_alias host_alias build_alias @@ -1337,6 +1349,11 @@ Program names: --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF fi @@ -2309,8 +2326,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' - ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2340,6 +2355,119 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } +if ${ac_cv_target+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; +esac +target=$ac_cv_target +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac + + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + +am__api_version='1.14' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2920,6 +3048,58 @@ fi ac_config_headers="$ac_config_headers lib/Grid_config.h" +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: + +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +Configuring $PACKAGE v$VERSION for $host +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +" >&5 +$as_echo "$as_me: + +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +Configuring $PACKAGE v$VERSION for $host +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +" >&6;} # Checks for programs. ac_ext=cpp @@ -4334,6 +4514,11 @@ fi done + + + + + # Check whether --enable-simd was given. if test "${enable_simd+set}" = set; then : enableval=$enable_simd; \ @@ -5891,3 +6076,22 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + + +echo " +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Summary of configuration for $PACKAGE v$VERSION +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The following features are enabled: + +- architecture (build) : $build_cpu +- os (build) : $build_os +- architecture (target) : $target_cpu +- os (target) : $target_os +---------------------------------------------------------- +- enabled simd support : ${ac_SIMD} +- communications type : ${ac_COMMS} + + +" diff --git a/configure.ac b/configure.ac index 14fd45bb..14170f4e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,25 @@ +# -*- Autoconf -*- # Process this file with autoconf to produce a configure script. +# +# Project Grid package +# +# Time-stamp: <2015-05-18 17:14:20 neo> + +AC_PREREQ([2.69]) AC_INIT([Grid], [1.0], [paboyle@ph.ed.ac.uk]) +AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(subdir-objects) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([lib/Grid.h]) AC_CONFIG_HEADERS([lib/Grid_config.h]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +AC_MSG_NOTICE([ + +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +Configuring $PACKAGE v$VERSION for $host +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +]) # Checks for programs. AC_LANG(C++) @@ -32,6 +48,11 @@ AC_TYPE_UINT64_T # Checks for library functions. AC_CHECK_FUNCS([gettimeofday]) + + + + + AC_ARG_ENABLE([simd],[AC_HELP_STRING([--enable-simd=SSE|AVX|AVX2|AVX512|MIC],\ [Select instructions to be SSE4.0, AVX 1.0, AVX 2.0+FMA, AVX 512, MIC])],\ [ac_SIMD=${enable_simd}],[ac_SIMD=AVX2]) @@ -84,3 +105,22 @@ AC_CONFIG_FILES(lib/Makefile) AC_CONFIG_FILES(tests/Makefile) AC_CONFIG_FILES(benchmarks/Makefile) AC_OUTPUT + + +echo " +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Summary of configuration for $PACKAGE v$VERSION +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The following features are enabled: + +- architecture (build) : $build_cpu +- os (build) : $build_os +- architecture (target) : $target_cpu +- os (target) : $target_os +---------------------------------------------------------- +- enabled simd support : ${ac_SIMD} +- communications type : ${ac_COMMS} + + +" diff --git a/lib/algorithms/approx/bigfloat.h b/lib/algorithms/approx/bigfloat.h index 7f59ea33..32561a73 100755 --- a/lib/algorithms/approx/bigfloat.h +++ b/lib/algorithms/approx/bigfloat.h @@ -322,7 +322,7 @@ public: friend bigfloat abs_bf(const bigfloat& x){ bigfloat a; - a.x=abs(x.x); + a.x=fabs(x.x); return a; } diff --git a/tests/Grid_cshift b/tests/Grid_cshift deleted file mode 100755 index 54d76474..00000000 Binary files a/tests/Grid_cshift and /dev/null differ diff --git a/tests/Grid_gamma b/tests/Grid_gamma deleted file mode 100755 index 641d5c88..00000000 Binary files a/tests/Grid_gamma and /dev/null differ diff --git a/tests/Grid_main b/tests/Grid_main deleted file mode 100755 index 97e4f39e..00000000 Binary files a/tests/Grid_main and /dev/null differ diff --git a/tests/Grid_nersc_io b/tests/Grid_nersc_io deleted file mode 100755 index 2ab85598..00000000 Binary files a/tests/Grid_nersc_io and /dev/null differ diff --git a/tests/Grid_rng b/tests/Grid_rng deleted file mode 100755 index 039db066..00000000 Binary files a/tests/Grid_rng and /dev/null differ diff --git a/tests/Grid_simd b/tests/Grid_simd deleted file mode 100755 index 381b4a3e..00000000 Binary files a/tests/Grid_simd and /dev/null differ diff --git a/tests/Grid_stencil b/tests/Grid_stencil deleted file mode 100755 index 92d844ee..00000000 Binary files a/tests/Grid_stencil and /dev/null differ