From c4777879e60cafbcef500cd133fa298dc328c46e Mon Sep 17 00:00:00 2001 From: paboyle Date: Wed, 1 Jul 2015 13:04:02 +0100 Subject: [PATCH 1/5] Remove dependency on wrong file --- tests/Test_dwf_hdcr.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Test_dwf_hdcr.cc b/tests/Test_dwf_hdcr.cc index 8d1a5fce..bafdb639 100644 --- a/tests/Test_dwf_hdcr.cc +++ b/tests/Test_dwf_hdcr.cc @@ -1,6 +1,6 @@ #include #include -#include +//#include using namespace std; using namespace Grid; From 71e6733d4de82e6590fe03401d0bb7fa1f0ea4c1 Mon Sep 17 00:00:00 2001 From: paboyle Date: Wed, 1 Jul 2015 22:46:53 +0100 Subject: [PATCH 2/5] Modified memory bw test to display word size --- benchmarks/Benchmark_memory_bandwidth.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/Benchmark_memory_bandwidth.cc b/benchmarks/Benchmark_memory_bandwidth.cc index 5abdc6a3..5b436001 100644 --- a/benchmarks/Benchmark_memory_bandwidth.cc +++ b/benchmarks/Benchmark_memory_bandwidth.cc @@ -20,7 +20,7 @@ int main (int argc, char ** argv) std::cout << "Grid is setup to use "< Date: Wed, 1 Jul 2015 22:47:33 +0100 Subject: [PATCH 3/5] Temporarily disable gmp dependency simply because Cray XC30's I'm benchmarking have a downlevel gmp version that chokes on ::max_align_t where gmp had a bug as far as I recall. --- lib/algorithms/approx/Remez.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/algorithms/approx/Remez.h b/lib/algorithms/approx/Remez.h index 336382d2..e6a973df 100644 --- a/lib/algorithms/approx/Remez.h +++ b/lib/algorithms/approx/Remez.h @@ -15,7 +15,7 @@ #ifndef INCLUDED_ALG_REMEZ_H #define INCLUDED_ALG_REMEZ_H -#include +#include #define JMAX 10000 //Maximum number of iterations of Newton's approximation #define SUM_MAX 10 // Maximum number of terms in exponential From 46cf661ecd7409fb95391585891f6ccea6955f30 Mon Sep 17 00:00:00 2001 From: paboyle Date: Wed, 1 Jul 2015 22:48:58 +0100 Subject: [PATCH 4/5] More xc30 config commansd --- scripts/configure-commands | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/configure-commands b/scripts/configure-commands index 538f3661..4cb4b44f 100755 --- a/scripts/configure-commands +++ b/scripts/configure-commands @@ -16,10 +16,16 @@ echo -e $RED ============================== echo -e $YELLOW case $WD in -g++-sse4) +g++-avx) + CXX=g++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11" LIBS="-lgmp -lmpfr" --enable-comms=none + ;; +g++-avx-openmp) + CXX=g++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -std=c++11" LIBS="-fopenmp -lgmp -lmpfr" --enable-comms=none + ;; +g++5-sse4) CXX=g++-5 ../../configure --enable-simd=SSE4 CXXFLAGS="-msse4 -O3 -std=c++11" LIBS="-lgmp -lmpfr" --enable-comms=none ;; -g++-avx) +g++5-avx) CXX=g++-5 ../../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11" LIBS="-lgmp -lmpfr" --enable-comms=none ;; icpc-avx) @@ -52,6 +58,12 @@ CXX=clang++ ../../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -O3 -std=c clang-avx-openmp) CXX=clang-omp++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -std=c++11" LDFLAGS="-fopenmp" LIBS="-lgmp -lmpfr" --enable-comms=none ;; +clang-xc30) +CXX=$HOME/Clang/install/bin/clang++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11 -I/opt/gcc/4.9.2/snos/include/g++/x86_64-suse-linux/ -I/opt/gcc/4.9.2/snos/include/g++/ " LDFLAGS="" LIBS="-lgmp -lmpfr" --enable-comms=none + ;; +clang-xc30-openmp) +CXX=$HOME/Clang/install/bin/clang++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -std=c++11 -I/opt/gcc/4.9.2/snos/include/g++/x86_64-suse-linux/ -I/opt/gcc/4.9.2/snos/include/g++/ " LDFLAGS="-fopenmp" LIBS="-lgmp -lmpfr" --enable-comms=none + ;; clang-avx2-openmp) CXX=clang-omp++ ../../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" LDFLAGS="-fopenmp" LIBS="-lgmp -lmpfr" --enable-comms=none ;; From 1e29d9f778e2adba77c3fa7076e0f59be7421f4c Mon Sep 17 00:00:00 2001 From: paboyle Date: Wed, 1 Jul 2015 22:50:13 +0100 Subject: [PATCH 5/5] Some useful XC30 commands --- scripts/configure-cray | 10 ++++++++++ scripts/cray-modules | 2 ++ 2 files changed, 12 insertions(+) create mode 100755 scripts/configure-cray create mode 100644 scripts/cray-modules diff --git a/scripts/configure-cray b/scripts/configure-cray new file mode 100755 index 00000000..db581493 --- /dev/null +++ b/scripts/configure-cray @@ -0,0 +1,10 @@ +#!/bin/bash +DIRS="g++-avx-openmp g++-avx clang-xc30 clang-xc30-openmp" + +for D in $DIRS +do + mkdir -p builds/$D + cd builds/$D + ../../scripts/configure-commands $D + cd ../.. +done diff --git a/scripts/cray-modules b/scripts/cray-modules new file mode 100644 index 00000000..95de2b0b --- /dev/null +++ b/scripts/cray-modules @@ -0,0 +1,2 @@ +module swap PrgEnv-cray PrgEnv-intel +module swap intel/14.0.4.211 intel/15.0.2.164