From 17198a4abd849ef245d01a24cd9b8b53aeac6aef Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 10:43:14 -0700 Subject: [PATCH 01/11] Travis update --- .travis.yml | 87 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index be429bd3..84dd4d2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,77 @@ -# Ubuntu 14.04 Trusty support -sudo: required -dist: trusty -# Enable C++ support language: cpp -# Compiler selection -# Build steps -script: - - ./scripts/reconfigure_script - - mkdir build - - cd build - - ../configure CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none - - make - - ./benchmarks/Benchmark_dwf --threads 1 + matrix: include: - - compiler: gcc-4.9 + - os: osx + osx_image: xcode7.2 + compiler: clang + - os: osx + osx_image: xcode7.2 + compiler: gcc + env: VERSION=-5 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.7 + env: VERSION=-4.7 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + env: VERSION=-4.8 + - compiler: gcc addons: apt: sources: - ubuntu-toolchain-r-test packages: - g++-4.9 - - libmpfr-dev - - libgmp-dev - - libmpc-dev - - binutils-dev - env: CXX=g++-4.9 + env: VERSION=-4.9 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + env: VERSION=-5 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.6 + packages: + - clang-3.6 + env: VERSION=-3.6 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - clang-3.7 + env: VERSION=-3.7 + +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi + +install: + - export CC=$CC$VERSION + - export CXX=$CXX$VERSION + +script: + - ./scripts/reconfigure_script + - mkdir build + - cd build + - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none + - make + - ./benchmarks/Benchmark_dwf --threads 1 From 662880614262d13ad50b550e4ba6e31746670485 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 10:47:13 -0700 Subject: [PATCH 02/11] Travis debug --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 84dd4d2d..2e9ceeaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,5 +73,6 @@ script: - mkdir build - cd build - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none + - cat config.log - make - ./benchmarks/Benchmark_dwf --threads 1 From 0fd0661be35a6b629f1b35d5b9e3e76cb45c702c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 10:49:36 -0700 Subject: [PATCH 03/11] Travis fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e9ceeaf..de292c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ script: - ./scripts/reconfigure_script - mkdir build - cd build - - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none + - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" --enable-precision=single --enable-simd=AVX2 --enable-comms=none - cat config.log - make - ./benchmarks/Benchmark_dwf --threads 1 From e15f0b47c1092eac58febdc2e413b120fe6e235d Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 10:54:43 -0700 Subject: [PATCH 04/11] Travis fix --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index de292c67..71a64c78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,6 @@ matrix: osx_image: xcode7.2 compiler: gcc env: VERSION=-5 - - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.7 - env: VERSION=-4.7 - compiler: gcc addons: apt: @@ -73,6 +65,5 @@ script: - mkdir build - cd build - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" --enable-precision=single --enable-simd=AVX2 --enable-comms=none - - cat config.log - make - ./benchmarks/Benchmark_dwf --threads 1 From 10bbfdc3b26f07dbdbb6308c038b73539fee5034 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 10:58:03 -0700 Subject: [PATCH 05/11] Travis update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 71a64c78..c2350acd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,5 +65,5 @@ script: - mkdir build - cd build - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" --enable-precision=single --enable-simd=AVX2 --enable-comms=none - - make + - make -j4 - ./benchmarks/Benchmark_dwf --threads 1 From 1c4c287925c01094c111ce0e88e02d85313bcfb7 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 11:18:25 -0700 Subject: [PATCH 06/11] Make.inc generation fix --- scripts/filelist | 2 +- tests/Make.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/filelist b/scripts/filelist index 9d376e42..efa4589b 100755 --- a/scripts/filelist +++ b/scripts/filelist @@ -18,7 +18,7 @@ TESTS=`ls T*.cc` TESTLIST=`echo ${TESTS} | sed s/.cc//g ` echo > Make.inc -echo bin_PROGRAMS = ${TESTLIST} | sed s/Test_zmm//g >> Make.inc +echo bin_PROGRAMS += ${TESTLIST} | sed s/Test_zmm//g >> Make.inc echo >> Make.inc for f in $TESTS diff --git a/tests/Make.inc b/tests/Make.inc index b5991fa0..f1e2cd9d 100644 --- a/tests/Make.inc +++ b/tests/Make.inc @@ -1,5 +1,5 @@ -bin_PROGRAMS += Test_GaugeAction Test_RectPlaq Test_cayley_cg Test_cayley_coarsen_support Test_cayley_even_odd Test_cayley_ldop_cr Test_cf_coarsen_support Test_cf_cr_unprec Test_cheby Test_contfrac_cg Test_contfrac_even_odd Test_contfrac_force Test_cshift Test_cshift_red_black Test_cshift_red_black_rotate Test_cshift_rotate Test_dwf_cg_prec Test_dwf_cg_schur Test_dwf_cg_unprec Test_dwf_cr_unprec Test_dwf_even_odd Test_dwf_force Test_dwf_fpgcr Test_dwf_gpforce Test_dwf_hdcr Test_dwf_lanczos Test_dwf_rb5d Test_gamma Test_gp_rect_force Test_gparity Test_gpdwf_force Test_gpwilson_even_odd Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonRatio Test_lie_generators Test_main Test_multishift_sqrt Test_nersc_io Test_partfrac_force Test_quenched_update Test_rect_force Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio Test_rng Test_rng_fixed Test_serialisation Test_simd Test_stencil Test_synthetic_lanczos Test_wilson_cg_prec Test_wilson_cg_schur Test_wilson_cg_unprec Test_wilson_cr_unprec Test_wilson_even_odd Test_wilson_force Test_wilson_force_phiMdagMphi Test_wilson_force_phiMphi Test_wilson_tm_even_odd +bin_PROGRAMS += Test_GaugeAction Test_RectPlaq Test_cayley_cg Test_cayley_coarsen_support Test_cayley_even_odd Test_cayley_ldop_cr Test_cf_coarsen_support Test_cf_cr_unprec Test_cheby Test_contfrac_cg Test_contfrac_even_odd Test_contfrac_force Test_cshift Test_cshift_red_black Test_cshift_red_black_rotate Test_cshift_rotate Test_dwf_cg_prec Test_dwf_cg_schur Test_dwf_cg_unprec Test_dwf_cr_unprec Test_dwf_even_odd Test_dwf_force Test_dwf_fpgcr Test_dwf_gpforce Test_dwf_hdcr Test_dwf_lanczos Test_dwf_rb5d Test_gamma Test_gp_rect_force Test_gparity Test_gpdwf_force Test_gpwilson_even_odd Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonRatio Test_lie_generators Test_main Test_multishift_sqrt Test_nersc_io Test_partfrac_force Test_quenched_update Test_rect_force Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio Test_rng Test_rng_fixed Test_serialisation Test_simd Test_stencil Test_synthetic_lanczos Test_wilson_cg_prec Test_wilson_cg_schur Test_wilson_cg_unprec Test_wilson_cr_unprec Test_wilson_even_odd Test_wilson_force Test_wilson_force_phiMdagMphi Test_wilson_force_phiMphi Test_wilson_tm_even_odd Test_GaugeAction_SOURCES=Test_GaugeAction.cc From 1d03f515b99e442d0ff00059f3cc9ffbffe0a9e5 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 11:18:47 -0700 Subject: [PATCH 07/11] Travis status in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31a49f3c..0a17bd45 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Grid +# Grid [![Build Status](https://travis-ci.org/paboyle/Grid.svg?branch=master)](https://travis-ci.org/paboyle/Grid) Data parallel C++ mathematical object library Last update 2015/7/30 From de82b08f702e85c0c703e6ad6b5961f1b3598d22 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 11:18:58 -0700 Subject: [PATCH 08/11] Travis fix --- .travis.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2350acd..4818646c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,10 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-4.8 + - libmpfr-dev + - libgmp-dev + - libmpc-dev + - binutils-dev env: VERSION=-4.8 - compiler: gcc addons: @@ -24,6 +28,10 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-4.9 + - libmpfr-dev + - libgmp-dev + - libmpc-dev + - binutils-dev env: VERSION=-4.9 - compiler: gcc addons: @@ -32,6 +40,10 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-5 + - libmpfr-dev + - libgmp-dev + - libmpc-dev + - binutils-dev env: VERSION=-5 - compiler: clang addons: @@ -41,6 +53,10 @@ matrix: - llvm-toolchain-precise-3.6 packages: - clang-3.6 + - libmpfr-dev + - libgmp-dev + - libmpc-dev + - binutils-dev env: VERSION=-3.6 - compiler: clang addons: @@ -50,10 +66,15 @@ matrix: - llvm-toolchain-precise-3.7 packages: - clang-3.7 + - libmpfr-dev + - libgmp-dev + - libmpc-dev + - binutils-dev env: VERSION=-3.7 before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libmpc; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi install: @@ -64,6 +85,6 @@ script: - ./scripts/reconfigure_script - mkdir build - cd build - - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" --enable-precision=single --enable-simd=AVX2 --enable-comms=none + - ../configure CXXFLAGS="-mavx -mfma -O3 -std=c++11" --enable-precision=single --enable-simd=AVX --enable-comms=none - make -j4 - ./benchmarks/Benchmark_dwf --threads 1 From 65c2b794b505d58a14769df333e69289ffaab977 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 11:23:57 -0700 Subject: [PATCH 09/11] Travis update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4818646c..ec7c2c1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,6 +85,6 @@ script: - ./scripts/reconfigure_script - mkdir build - cd build - - ../configure CXXFLAGS="-mavx -mfma -O3 -std=c++11" --enable-precision=single --enable-simd=AVX --enable-comms=none + - ../configure CXXFLAGS="-mavx -mfma -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=AVX --enable-comms=none - make -j4 - ./benchmarks/Benchmark_dwf --threads 1 From d27ceb75dd327ea8a685155a285cbffcafda380a Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 11:32:28 -0700 Subject: [PATCH 10/11] Travis fix --- .travis.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec7c2c1b..fbea43db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,6 @@ matrix: osx_image: xcode7.2 compiler: gcc env: VERSION=-5 - - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - libmpfr-dev - - libgmp-dev - - libmpc-dev - - binutils-dev - env: VERSION=-4.8 - compiler: gcc addons: apt: @@ -75,16 +63,17 @@ matrix: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libmpc; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi - + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; f + install: - export CC=$CC$VERSION - export CXX=$CXX$VERSION + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LDFLAGS='-L/usr/local/lib'; fi script: - ./scripts/reconfigure_script - mkdir build - cd build - - ../configure CXXFLAGS="-mavx -mfma -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=AVX --enable-comms=none + - ../configure CXXFLAGS="-msse4.2 -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=SSE4 --enable-comms=none - make -j4 - ./benchmarks/Benchmark_dwf --threads 1 From 7ee577eee6698d8e2e63354a11eeaea5b8b264f1 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 11:34:20 -0700 Subject: [PATCH 11/11] Travis fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fbea43db..e5ff8640 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ matrix: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libmpc; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; f + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi install: - export CC=$CC$VERSION