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
9d96899aa8
Doc bugfix
2019-10-07 13:05:04 +01:00
Michael Marshall
86939dbf1a
Removed unnecessary function (for getting a parameter)
2019-10-04 13:59:59 +01:00
d2928761dd
Merge pull request #240 from guelpers/feature/bugfixafterGPUmerge
...
Fix after GPU merge: Phase in Free Propagator
2019-10-02 15:00:15 +01:00
f2a74c603f
Merge pull request #239 from mmphys/z2_momentum
...
z2-momentum phase module
2019-10-02 14:57:59 +01:00
5f22810f55
Fix after GPU merge: Phase in Free Propagator
2019-10-02 14:49:35 +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
3137628222
BaryonUtils.h is now part of Baryons
2019-09-17 13:19:20 +01:00
Michael Marshall
ce965ee6bb
Cleanup tests that are no longer required
2019-09-17 13:10:59 +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
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
Michael Marshall
04a661cafe
Remove unused modules BC2 and Baryon2
2019-09-10 14:49:24 +01:00
Peter Boyle
b473405652
Tensor ambiguous fix
2019-08-29 09:36:41 -05:00
Peter Boyle
9b7a6d197f
Fix for GCC preprocessor/pragma handling bug
2019-08-23 14:37:46 +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
28d6be2a4e
Fix GCC complaint
2019-08-22 18:56:37 +01:00
Peter Boyle
95f66cc93c
Merge branch 'feature/gpu-port' into develop
2019-08-15 02:19:31 +01: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
Peter Boyle
be37dfb6f8
Remove debug code
2019-08-15 01:31:40 +01:00
Peter Boyle
5e8437029f
nvcc error suppress
2019-08-15 01:31:12 +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
55c095f620
Merge pull request #226 from nils-asmussen/fix/Gauss
...
Fix compiling of MSource::Gauss for single precision
2019-08-14 17:50:38 +01:00
Peter Boyle
3e49dc8a67
Reduction finished and hopefully fixes CI regression fail on single precisoin and force
2019-08-14 15:18:34 +01:00
Peter Boyle
96ac56cace
Double precision variants for summation accuracy
2019-08-14 13:08:01 +01:00
Peter Boyle
2b037e3daa
Update todo list
2019-08-14 13:07:26 +01:00
Peter Boyle
2d2de7aede
Freeze the seed
2019-08-14 13:07:11 +01:00
e3966aa49b
Fix compiling of MSource::Gauss for single precision
2019-08-12 14:57:11 +01:00
Peter Boyle
ce97638bac
Think the reduction is now sorted and cleaned up
2019-08-11 11:09:01 +01:00
Peter Boyle
53e3ab4131
Fix force term
2019-08-11 11:06:13 +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
