mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-11-02 21:14:32 +00:00 
			
		
		
		
	Command line args and a general clean up
This commit is contained in:
		@@ -14,9 +14,11 @@ int main (int argc, char ** argv)
 | 
			
		||||
{
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> simd_layout({1,1,2,2});
 | 
			
		||||
  std::vector<int> mpi_layout ({1,1,1,1});
 | 
			
		||||
  std::vector<int> latt_size  ({8,8,8,8});
 | 
			
		||||
  std::vector<int> latt_size;
 | 
			
		||||
  std::vector<int> simd_layout;
 | 
			
		||||
  std::vector<int> mpi_layout;
 | 
			
		||||
 | 
			
		||||
  GridParseLayout(argv,argc,mpi_layout,simd_layout,latt_size);
 | 
			
		||||
    
 | 
			
		||||
  GridCartesian     Grid(latt_size,simd_layout,mpi_layout);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -25,15 +25,12 @@ int main (int argc, char ** argv)
 | 
			
		||||
{
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> latt_size(4);
 | 
			
		||||
  std::vector<int> latt_size;
 | 
			
		||||
  std::vector<int> simd_layout;
 | 
			
		||||
  std::vector<int> mpi_layout;
 | 
			
		||||
 | 
			
		||||
  std::vector<int> simd_layout(4);
 | 
			
		||||
  
 | 
			
		||||
  std::vector<int> mpi_layout(4);
 | 
			
		||||
  mpi_layout[0]=1;
 | 
			
		||||
  mpi_layout[1]=1;
 | 
			
		||||
  mpi_layout[2]=1;
 | 
			
		||||
  mpi_layout[3]=1;
 | 
			
		||||
  GridParseLayout(argv,argc,mpi_layout,simd_layout,latt_size);
 | 
			
		||||
  latt_size.resize(4);
 | 
			
		||||
 | 
			
		||||
#ifdef AVX512
 | 
			
		||||
 for(int omp=128;omp<236;omp+=16){
 | 
			
		||||
@@ -52,25 +49,6 @@ int main (int argc, char ** argv)
 | 
			
		||||
    latt_size[3] = lat;
 | 
			
		||||
    double volume = latt_size[0]*latt_size[1]*latt_size[2]*latt_size[3];
 | 
			
		||||
    
 | 
			
		||||
#ifdef AVX512
 | 
			
		||||
    simd_layout[0] = 1;
 | 
			
		||||
    simd_layout[1] = 2;
 | 
			
		||||
    simd_layout[2] = 2;
 | 
			
		||||
    simd_layout[3] = 2;
 | 
			
		||||
#endif
 | 
			
		||||
#if defined (AVX1)|| defined (AVX2)
 | 
			
		||||
    simd_layout[0] = 1;
 | 
			
		||||
    simd_layout[1] = 1;
 | 
			
		||||
    simd_layout[2] = 2;
 | 
			
		||||
    simd_layout[3] = 2;
 | 
			
		||||
#endif
 | 
			
		||||
#if defined (SSE4)
 | 
			
		||||
    simd_layout[0] = 1;
 | 
			
		||||
    simd_layout[1] = 1;
 | 
			
		||||
    simd_layout[2] = 1;
 | 
			
		||||
    simd_layout[3] = 2;
 | 
			
		||||
#endif
 | 
			
		||||
    
 | 
			
		||||
    GridCartesian Fine(latt_size,simd_layout,mpi_layout);
 | 
			
		||||
    GridRedBlackCartesian rbFine(latt_size,simd_layout,mpi_layout);
 | 
			
		||||
    GridParallelRNG       FineRNG(&Fine);
 | 
			
		||||
 
 | 
			
		||||
@@ -10,8 +10,12 @@ int main (int argc, char ** argv)
 | 
			
		||||
{
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> simd_layout({1,1,2,2});
 | 
			
		||||
  std::vector<int> mpi_layout ({1,1,1,1});
 | 
			
		||||
  std::vector<int> tmp_latt_size;
 | 
			
		||||
  std::vector<int> simd_layout;
 | 
			
		||||
  std::vector<int> mpi_layout;
 | 
			
		||||
 | 
			
		||||
  GridParseLayout(argv,argc,mpi_layout,simd_layout,tmp_latt_size);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> latt_size  ({16,16,16,32});
 | 
			
		||||
  std::vector<int> clatt_size  ({4,4,4,8});
 | 
			
		||||
  int orthodir=3;
 | 
			
		||||
 
 | 
			
		||||
@@ -106,9 +106,11 @@ int main (int argc, char ** argv)
 | 
			
		||||
{
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> simd_layout({1,1,2,2});
 | 
			
		||||
  std::vector<int> mpi_layout ({1,1,1,1});
 | 
			
		||||
  std::vector<int> latt_size  ({8,8,8,8});
 | 
			
		||||
  std::vector<int> latt_size;
 | 
			
		||||
  std::vector<int> simd_layout;
 | 
			
		||||
  std::vector<int> mpi_layout;
 | 
			
		||||
 | 
			
		||||
  GridParseLayout(argv,argc,mpi_layout,simd_layout,latt_size);
 | 
			
		||||
    
 | 
			
		||||
  GridCartesian     Grid(latt_size,simd_layout,mpi_layout);
 | 
			
		||||
  std::vector<int> seeds({1,2,3,4});
 | 
			
		||||
 
 | 
			
		||||
@@ -8,9 +8,11 @@ int main (int argc, char ** argv)
 | 
			
		||||
{
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> simd_layout({1,1,2,2});
 | 
			
		||||
  std::vector<int> mpi_layout ({2,2,1,2});
 | 
			
		||||
  std::vector<int> latt_size  ({8,8,8,8});
 | 
			
		||||
  std::vector<int> latt_size;
 | 
			
		||||
  std::vector<int> simd_layout;
 | 
			
		||||
  std::vector<int> mpi_layout;
 | 
			
		||||
 | 
			
		||||
  GridParseLayout(argv,argc,mpi_layout,simd_layout,latt_size);
 | 
			
		||||
 | 
			
		||||
  double volume = latt_size[0]*latt_size[1]*latt_size[2]*latt_size[3];
 | 
			
		||||
    
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user