1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-09-20 17:25:37 +01:00

Merge branch 'master' into hadrons

This commit is contained in:
Antonin Portelli 2016-05-01 14:53:38 -07:00
commit 978cf52f6b

View File

@ -33,19 +33,6 @@ matrix:
- libmpc-dev - libmpc-dev
- binutils-dev - binutils-dev
env: VERSION=-5 env: VERSION=-5
- compiler: clang
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
packages:
- clang-3.6
- libmpfr-dev
- libgmp-dev
- libmpc-dev
- binutils-dev
env: VERSION=-3.6
- compiler: clang - compiler: clang
addons: addons:
apt: apt:
@ -59,6 +46,19 @@ matrix:
- libmpc-dev - libmpc-dev
- binutils-dev - binutils-dev
env: VERSION=-3.7 env: VERSION=-3.7
- compiler: clang
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- clang-3.8
- libmpfr-dev
- libgmp-dev
- libmpc-dev
- binutils-dev
env: VERSION=-3.8
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
@ -74,6 +74,6 @@ script:
- ./scripts/reconfigure_script - ./scripts/reconfigure_script
- mkdir build - mkdir build
- cd build - cd build
- ../configure CXXFLAGS="-msse4.2 -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=SSE4 --enable-comms=none - ../configure CXXFLAGS="-fopenmp -msse4.2 -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=SSE4 --enable-comms=none
- make -j4 - make -j4
- ./benchmarks/Benchmark_dwf --threads 1 - ./benchmarks/Benchmark_dwf --threads 2