portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-10-31 20:14:32 +00:00
Code Releases Activity

Merge branch 'master' of https://github.com/paboyle/Grid

Browse Source
This commit is contained in:
Peter Boyle
2015-03-04 11:44:18 +00:00
parent 09582509e5 eb15a8dacb
commit 9e200b9d7a
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Grid_Cartesian.h
View File

@@ -108,9 +108,8 @@ public:
for(int d=0;d<_ndimension;d++){ for(int d=0;d<_ndimension;d++){
_dimensions[d] = dimensions[d]; _dimensions[d] = dimensions[d];
_layout[d] = layout[d]; _layout[d] = layout[d];
// Use a reduced simd grid // Use a reduced simd grid
_rdimensions[d]= _dimensions[d]/_layout[d]; _rdimensions[d]= _dimensions[d]/_layout[d]; //<-- _layout[d] is zero
_osites *= _rdimensions[d]; _osites *= _rdimensions[d];
_isites *= _layout[d]; _isites *= _layout[d];

4
Grid_config.h
View File

@@ -2,10 +2,10 @@
/* Grid_config.h.in. Generated from configure.ac by autoheader. */ /* Grid_config.h.in. Generated from configure.ac by autoheader. */
/* AVX */ /* AVX */
#define AVX1 1 /* #undef AVX1 */
/* AVX2 */ /* AVX2 */
/* #undef AVX2 */ #define AVX2 1
/* AVX512 */ /* AVX512 */
/* #undef AVX512 */ /* #undef AVX512 */

9
Grid_main.cc
View File

@@ -46,12 +46,19 @@ int main (int argc, char ** argv)
simd_layout[2] = 2; simd_layout[2] = 2;
simd_layout[3] = 2; simd_layout[3] = 2;
#endif #endif
#ifdef AVX1 #if defined (AVX1)|| defined (AVX2)
simd_layout[0] = 1; simd_layout[0] = 1;
simd_layout[1] = 1; simd_layout[1] = 1;
simd_layout[2] = 2; simd_layout[2] = 2;
simd_layout[3] = 2; simd_layout[3] = 2;
#endif #endif
#if defined (SSE2)
simd_layout[0] = 1;
simd_layout[1] = 1;
simd_layout[2] = 1;
simd_layout[3] = 2;
#endif
GridCartesian Fine(latt_size,simd_layout); GridCartesian Fine(latt_size,simd_layout);
GridRedBlackCartesian rbFine(latt_size,simd_layout); GridRedBlackCartesian rbFine(latt_size,simd_layout);