1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-07 12:45:55 +01:00

552 Commits

Author SHA1 Message Date
Michael Marshall
3b3680c64e Reversed Felix's interim A2Autils.h changes ... these were finished and went into develop via a separate branch 2019-10-30 15:50:04 +00:00
Michael Marshall
2a926b3dc6 Merged latest changes from develop, in preparation for release. 2019-10-30 14:52:34 +00:00
Michael Marshall
eb8848a071 Merge branch 'develop' into feature/distil
* develop: (27 commits)
  Update README.md
  result layout standardised, iterator size more elegant
  updated syntac in Test_hadrons_spectrum
  chroma-regression test now prints difference correctly
  baryon input strings are now pairs of pairs of gammas - still ugly!!
  second update to pull request
  Changing back interface for Gamma3pt
  Removing old debug code
  Changes to A2Autils
  suggested changes for 1st pull request implemented
  changed input parameters for easier use
  Should compile everywhere now
  changed baryon interface
  added author information
  ready for pull request
  code compiling now - still need to test
  Baryons module works in 1 of 3 cases - still need SlicedProp and Msource part!!
  thread_for caused the problems - slow for loop for now
  still bugfix
  weird bug...
  ...

# Conflicts:
#	Hadrons/Modules.hpp
#	Hadrons/modules.inc
2019-10-30 14:13:00 +00:00
c97f780784
Merge pull request #243 from fionnoh/feature/A2A_current_insertion
Feature/a2 a current insertion
2019-10-22 13:55:53 +01:00
202f025fc7
Merge pull request #242 from mmphys/feature/baryons
Feature/baryons
2019-10-16 15:06:32 +01:00
Michael Marshall
519ce19128 Fixes to enable GPU build. NB: Contractor and ContractorBenchmark still not working 2019-10-14 22:40:13 +01:00
Felix Erben
548b3bf43c second update to pull request 2019-10-09 14:52:33 +01:00
Fionn O hOgain
6a3b09cf02 Merge branch 'develop' of github.com:fionnoh/Grid into feature/A2A_current_insertion 2019-10-08 13:25:51 +01:00
Fionn O hOgain
10de4bfc23 Changes to A2Autils 2019-10-08 13:24:56 +01:00
Felix Erben
2ce7f2b4d8 suggested changes for 1st pull request implemented 2019-10-08 13:19:47 +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
d5a180d914 Merge branch 'fix/removeQCDremnants' into fix/remQCDns_ignore_ws 2019-10-02 16:11:27 +01:00
5f22810f55 Fix after GPU merge: Phase in Free Propagator 2019-10-02 14:49:35 +01:00
Michael Marshall
89ef2b7dc2 Should compile everywhere now 2019-10-02 13:20:07 +01:00
Felix Erben
b88fd436e7 added author information 2019-09-30 17:07:46 +01:00
Felix Erben
155bcd4ff3 ready for pull request 2019-09-30 16:58:20 +01:00
Fionn O hOgain
d1daab601a Merge branch 'develop' of github.com:fionnoh/Grid into feature/A2A_current_insertion
Peter's GPU branch changes merged with A2A CI code
2019-09-30 16:53:44 +01:00
Felix Erben
e5d7910fa7 code compiling now - still need to test 2019-09-30 13:55:26 +01:00
Felix Erben
94b9a9474c Baryons module works in 1 of 3 cases - still need SlicedProp and Msource part!! 2019-09-27 15:08:56 +01:00
Felix Erben
bf62ec163d thread_for caused the problems - slow for loop for now 2019-09-26 13:33:49 +01:00
Felix Erben
8415e23fc6 still bugfix 2019-09-26 11:09:09 +01:00
Felix Erben
76c93aa44e weird bug... 2019-09-17 14:36:26 +01:00
Michael Marshall
3137628222 BaryonUtils.h is now part of Baryons 2019-09-17 13:19:20 +01:00
Felix Erben
dab8c01c3d added Baryon code 2019-09-16 17:20:54 +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
bf52e7cc96 Latest BaryonUtils.h from Felix + my fixes 2019-09-13 18:11:10 +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
gfilaci
a7fa86dc29 MooeeInv improvement for DW EOFA + comments 2019-09-05 12:05:21 +01:00
gfilaci
fdd9b14e82 speed up MooeeInvDag for DWF EOFA 2019-09-02 14:49:51 +01:00
gfilaci
e66669d300 fast MooeeInv for EOFA 2019-09-02 14:26:13 +01:00
gfilaci
0efaf3c4fa access M5D coeffs through pointers 2019-09-02 11:33:00 +01:00
gfilaci
3ef519aaa4 fast MooeeInv 2019-09-02 11:18:14 +01:00
ad01290545 remove remnants of the namespace QCD 2019-08-19 20:30:33 +01:00
Peter Boyle
e279b2be29 Merge develop 2019-08-14 23:01:59 +01:00
Peter Boyle
48e6efc7c9 Merge branch 'develop' into feature/gpu-port
Conflicts:
	Grid/qcd/action/fermion/WilsonKernelsAsm.cc
	Grid/qcd/action/fermion/implementation/ImprovedStaggeredFermionImplementation.h
	Grid/qcd/action/fermion/implementation/StaggeredKernelsAsm.h
	benchmarks/Benchmark_comms.cc
2019-08-14 18:56:54 +01:00
Peter Boyle
53e3ab4131 Fix force term 2019-08-11 11:06:13 +01:00
Fionn O hOgain
d566637cec Merge branch 'develop' of github.com:fionnoh/Grid into feature/A2A_current_insertion 2019-08-07 12:11:40 +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
6f40021842 Fixed compiler errors: TODO: Felix, please validate 2019-08-01 19:57:59 +01:00
Felix Erben
e66d48c142 second way to compute baryons - qdp style 2019-07-30 13:46:59 +01:00
Peter Boyle
8c6016f717
Merge pull request #219 from mmphys/feature/include
Housekeeping. #include <Grid.h> ---> #include <Grid/Grid.h>
2019-07-29 23:08:01 +01:00
Peter Boyle
1282e1067f Do the force term on the accelerator too. Needed particularly because comms buffers
are device memory.
2019-07-29 22:58:35 +01:00
Peter Boyle
fe700a183a Getting HMC to run 2019-07-26 12:18:29 +01:00
Peter Boyle
25ba4c5f80 Merge branch 'develop' into feature/gpu-port
Conflicts:
	HMC/Mobius2p1fEOFA.cc
	tests/forces/Test_rect_force.cc
2019-07-19 11:01:55 +01:00
Peter Boyle
9e926e3fc5 Build fix in develop 2019-07-19 10:01:52 +01:00
Felix Erben
56cefadf9b gamma matrices as input 2019-07-18 17:46:43 +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
ferben
cded7670d0 new utils for baryons 2019-07-18 14:29:04 +01:00