From b5af3fbe45c7270baec80d4309362edcdc84237d Mon Sep 17 00:00:00 2001 From: neo Date: Tue, 19 May 2015 13:36:03 +0900 Subject: [PATCH] Merging with upstream --- README.md | 2 ++ lib/simd/Grid_vector_types.h | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 80714d76..e18ca474 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ MPI, OpenMP, and SIMD parallelism are present in the library. by setting variables in the command line or in the environment. Here are examples: + ./configure CXX=clang++ CXXFLAGS="-std=c++11 -O3 -msse4" --enable-simd=SSE4 + ./configure CXX=clang++ CXXFLAGS="-std=c++11 -O3 -mavx" --enable-simd=AVX1 ./configure CXX=clang++ CXXFLAGS="-std=c++11 -O3 -mavx2" --enable-simd=AVX2 diff --git a/lib/simd/Grid_vector_types.h b/lib/simd/Grid_vector_types.h index 14b2ddf0..360e9f1b 100644 --- a/lib/simd/Grid_vector_types.h +++ b/lib/simd/Grid_vector_types.h @@ -37,7 +37,6 @@ namespace Grid { /* @brief Grid_simd class for the SIMD vector type operations - */ template < class Scalar_type, class Vector_type > class Grid_simd { @@ -100,14 +99,9 @@ namespace Grid { template < class S = Scalar_type,typename std::enable_if < std::is_integral < S >::value, int >::type = 0 > friend inline void vzero(Grid_simd &ret) { vsplat(ret,0); } - - // do not compile if real or integer, send an error message from the compiler template < class S = Scalar_type,typename std::enable_if < is_complex < S >::value, int >::type = 0 > friend inline void vcomplex_i(Grid_simd &ret){ vsplat(ret,0.0,1.0);} - - - //////////////////////////////////// // Arithmetic operator overloads +,-,*