portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-12 20:27:06 +01:00
Code Releases Activity

Merge branch 'release/v0.6.0' into feature/feynman-rules

Browse Source
This commit is contained in:
Antonin Portelli
2016-10-31 18:36:21 +00:00
parent 6efac3a252 07416e4567
commit d5e95bc350
6 changed files with 252 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/simd/Grid_avx512.h
View File

@ -382,14 +382,9 @@ namespace Optimization {
// Some Template specialization
// Hack for CLANG until mm512_reduce_add_ps etc... are implemented in GCC and Clang releases
<<<<<<< HEAD
#define GNU_CLANG_COMPILER
#ifdef GNU_CLANG_COMPILER
=======
#ifndef __INTEL_COMPILER
#warning "Slow reduction due to incomplete reduce intrinsics"
>>>>>>> develop
//Complex float Reduce
template<>
inline Grid::ComplexF Reduce<Grid::ComplexF, __m512>::operator()(__m512 in){