Michael Marshall 
							
						 
					 
					
						
						
							
						
						519ce19128 
					 
					
						
						
							
							Fixes to enable GPU build. NB: Contractor and ContractorBenchmark still not working  
						
						 
						
						
						
						
					 
					
						2019-10-14 22:40:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						88d6ff8f1d 
					 
					
						
						
							
							Peter's bugfix in ImplicitlyRestartedLanczos.h  
						
						 
						
						... 
						
						
						
						My bugfix in MomentumPhase.hpp 
						
						
					 
					
						2019-10-07 17:36:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						803329af99 
					 
					
						
						
							
							Merge branch 'develop' into feature/distil  
						
						 
						
						... 
						
						
						
						* develop:
  Fix after GPU merge: Phase in Free Propagator
  z2-momentum phase module
# Conflicts:
#	Hadrons/Modules/MSource/MomentumPhase.hpp 
						
						
					 
					
						2019-10-07 13:09:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						86939dbf1a 
					 
					
						
						
							
							Removed unnecessary function (for getting a parameter)  
						
						 
						
						
						
						
					 
					
						2019-10-04 13:59:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						92e25488f8 
					 
					
						
						
							
							Added MomentumPhase Hadrons module from z2_momentum branch (thankyou, Felix) so I can run Z_2 wall with momenta easily  
						
						 
						
						
						
						
					 
					
						2019-10-02 14:13:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						7606554b76 
					 
					
						
						
							
							Remove references to unused modules (now part of separate Baryons branch)  
						
						 
						
						
						
						
					 
					
						2019-10-02 13:16:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						ccb5e8374b 
					 
					
						
						
							
							z2-momentum phase module  
						
						 
						
						
						
						
					 
					
						2019-09-30 17:36:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						911fbb0f36 
					 
					
						
						
							
							Cleanup modules that are no longer required  
						
						 
						
						
						
						
					 
					
						2019-09-17 13:06:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						eb293e9909 
					 
					
						
						
							
							Restore Baryons modules per develop branch  
						
						 
						
						
						
						
					 
					
						2019-09-16 20:29:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						2f3dd0703d 
					 
					
						
						
							
							Ensure Distillation test (Test_distil) works  
						
						 
						
						
						
						
					 
					
						2019-09-16 17:00:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						2e963d1a78 
					 
					
						
						
							
							Fix location of Grid.h and remove reference to QCD namespace  
						
						 
						
						
						
						
					 
					
						2019-09-16 15:34:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						61d017d0a5 
					 
					
						
						
							
							Merge GPU support (upstream/develop) into distillation branch.  
						
						 
						
						... 
						
						
						
						This compiles and looks right ... but may need some testing
* develop: (762 commits)
  Tensor ambiguous fix
  Fix for GCC preprocessor/pragma handling bug
  Trips up NVCC for reasons I dont understand on summit
  Fix GCC complaint
  Zero() change
  Force a couple of things to compile on NVCC
  Remove debug code
  nvcc error suppress
  Merge develop
  Reduction finished and hopefully fixes CI regression fail on single precisoin and force
  Double precision variants for summation accuracy
  Update todo list
  Freeze the seed
  Fix compiling of MSource::Gauss for single precision
  Think the reduction is now sorted and cleaned up
  Fix force term
  Printing improvement
  GPU reduction fix and also exit backtrace option
  GPU friendly
  Simplify the comms benchmark
  ...
# Conflicts:
#	Grid/communicator/SharedMemoryMPI.cc
#	Grid/qcd/action/fermion/WilsonKernelsAsm.cc
#	Grid/qcd/action/fermion/implementation/StaggeredKernelsAsm.h
#	Grid/qcd/smearing/StoutSmearing.h
#	Hadrons/Modules.hpp
#	Hadrons/Utilities/Contractor.cc
#	Hadrons/modules.inc
#	tests/forces/Test_dwf_force_eofa.cc
#	tests/forces/Test_dwf_gpforce_eofa.cc 
						
						
					 
					
						2019-09-13 13:30:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						04a661cafe 
					 
					
						
						
							
							Remove unused modules BC2 and Baryon2  
						
						 
						
						
						
						
					 
					
						2019-09-10 14:49:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						59cd7f3b70 
					 
					
						
						
							
							Trips up NVCC for reasons I dont understand on summit  
						
						 
						
						
						
						
					 
					
						2019-08-23 06:03:49 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						12eb2a6a34 
					 
					
						
						
							
							Zero() change  
						
						 
						
						
						
						
					 
					
						2019-08-15 01:43:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						7c8902b04f 
					 
					
						
						
							
							Merge branch 'develop' into feature/gpu-port  
						
						 
						
						
						
						
					 
					
						2019-08-15 01:33:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						4278caa030 
					 
					
						
						
							
							Force a couple of things to compile on NVCC  
						
						 
						
						
						
						
					 
					
						2019-08-15 01:32:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e3966aa49b 
					 
					
						
						
							
							Fix compiling of MSource::Gauss for single precision  
						
						 
						
						
						
						
					 
					
						2019-08-12 14:57:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c2c4252a07 
					 
					
						
						
							
							Merge pull request  #216  from nils-asmussen/feature/GaussianSmearing  
						
						 
						
						... 
						
						
						
						feature/gaussian smearing 
						
						
					 
					
						2019-08-08 12:29:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						51bed48cd2 
					 
					
						
						
							
							added selfcontract module  
						
						 
						
						
						
						
					 
					
						2019-08-05 17:46:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						b875edceab 
					 
					
						
						
							
							Merge branch 'feature/distil' of  https://github.com/mmphys/Grid  into feature/distil  
						
						 
						
						... 
						
						
						
						Conflicts:
	Grid/qcd/utils/BaryonUtils.h
	Hadrons/Modules/MContraction/Baryon2.hpp 
						
						
					 
					
						2019-08-05 14:19:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						29df60c0cb 
					 
					
						
						
							
							some debugging stuff  
						
						 
						
						
						
						
					 
					
						2019-08-05 14:10:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						8d97e2a02a 
					 
					
						
						
							
							Say which A2AMatrix is being loaded, and which contraction is being performed (m of n)  
						
						 
						
						
						
						
					 
					
						2019-08-02 19:23:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						ed23f6be20 
					 
					
						
						
							
							Remove blank line from log  
						
						 
						
						
						
						
					 
					
						2019-08-02 15:59:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						cad76827b0 
					 
					
						
						
							
							Be consistent about separator usage. Log start / stop / duration  
						
						 
						
						
						
						
					 
					
						2019-08-02 15:47:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						310867d46a 
					 
					
						
						
							
							Additional option to specify the separator used between terms in correlator  
						
						 
						
						
						
						
					 
					
						2019-08-02 11:25:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						e598178d94 
					 
					
						
						
							
							TODO: Felix, please fix. I commented this out because of compiler errors  
						
						 
						
						
						
						
					 
					
						2019-08-01 20:51:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						723457d467 
					 
					
						
						
							
							Contractor updates ready for test on Tesseract:  
						
						 
						
						... 
						
						
						
						1) Move definitions of serialisable objects into header for re-use by external programs/utilities
2) Add "-s" switch for "Simple" correlators, i.e. only include A2AMatrix info for the actual fields included in each contraction 
						
						
					 
					
						2019-08-01 20:35:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						6f40021842 
					 
					
						
						
							
							Fixed compiler errors: TODO: Felix, please validate  
						
						 
						
						
						
						
					 
					
						2019-08-01 19:57:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						622d5eaa3e 
					 
					
						
						
							
							Merge branch 'feature/distil' of  https://github.com/mmphys/Grid  into feature/distil  
						
						 
						
						
						
						
					 
					
						2019-07-30 13:47:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						e66d48c142 
					 
					
						
						
							
							second way to compute baryons - qdp style  
						
						 
						
						
						
						
					 
					
						2019-07-30 13:46:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						f5ad4f3de8 
					 
					
						
						
							
							Added the ability to write a version of the validated XML file excluding any of the module IDs supplied in a separate exclude file  
						
						 
						
						
						
						
					 
					
						2019-07-26 19:46:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						e7050a7aed 
					 
					
						
						
							
							Support gamma structure names that have trailing white space  
						
						 
						
						
						
						
					 
					
						2019-07-19 11:58:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						e138bc7204 
					 
					
						
						
							
							debug output  
						
						 
						
						
						
						
					 
					
						2019-07-19 11:16:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						6d4fb35d84 
					 
					
						
						
							
							Ready for testing  
						
						 
						
						
						
						
					 
					
						2019-07-19 10:33:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						0695f8cec2 
					 
					
						
						
							
							Single precision compile fix. Soon deprecate single precision  
						
						 
						
						
						
						
					 
					
						2019-07-18 22:02:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						9fa705c5a0 
					 
					
						
						
							
							comma fix  
						
						 
						
						
						
						
					 
					
						2019-07-18 21:38:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						56cefadf9b 
					 
					
						
						
							
							gamma matrices as input  
						
						 
						
						
						
						
					 
					
						2019-07-18 17:46:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ferben 
							
						 
					 
					
						
						
							
						
						9d82855c5d 
					 
					
						
						
							
							bugfix in Baryonutils  
						
						 
						
						
						
						
					 
					
						2019-07-18 15:45:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ferben 
							
						 
					 
					
						
						
							
						
						97d61f2564 
					 
					
						
						
							
							bugfix in Baryonutils  
						
						 
						
						
						
						
					 
					
						2019-07-18 14:57:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						a23dc295ac 
					 
					
						
						
							
							Remove compiler errors and warnings  
						
						 
						
						
						
						
					 
					
						2019-07-18 14:47:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ferben 
							
						 
					 
					
						
						
							
						
						11a8668d19 
					 
					
						
						
							
							bugfix in Baryonutils  
						
						 
						
						
						
						
					 
					
						2019-07-18 14:44:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						08904f830e 
					 
					
						
						
							
							Merge develop  
						
						 
						
						
						
						
					 
					
						2019-07-16 11:59:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Boyle 
							
						 
					 
					
						
						
							
						
						fa9cd50c5b 
					 
					
						
						
							
							Merge branch 'develop' into feature/gpu-port  
						
						 
						
						
						
						
					 
					
						2019-07-16 11:55:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						5a62ebe7b1 
					 
					
						
						
							
							general baryons case added  
						
						 
						
						
						
						
					 
					
						2019-07-15 15:26:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						fa747173d1 
					 
					
						
						
							
							Debugging references were to l-values, so added const to stop errors  
						
						 
						
						
						
						
					 
					
						2019-07-14 11:08:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						12afb0395f 
					 
					
						
						
							
							Debugging transposeSpin - seems just not to be implemented for Lattice<x>  
						
						 
						
						
						
						
					 
					
						2019-07-11 17:42:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Erben 
							
						 
					 
					
						
						
							
						
						ec4aa978ab 
					 
					
						
						
							
							why cant I spinTranspose  
						
						 
						
						
						
						
					 
					
						2019-07-11 14:01:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						7bc4a06f3f 
					 
					
						
						
							
							This is probably what you want ...  
						
						 
						
						
						
						
					 
					
						2019-07-10 12:29:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Marshall 
							
						 
					 
					
						
						
							
						
						cd659525e1 
					 
					
						
						
							
							You probably want to add this to the build. And you may need to do a bootstrap  
						
						 
						
						
						
						
					 
					
						2019-07-10 12:08:37 +01:00