Michael Marshall
78bdb0ff6a
Grid
2019-10-20 14:22:45 +01:00
Michael Marshall
decab587a0
PerambFileName defaults to object name if empty
2019-10-20 14:14:06 +01:00
202f025fc7
Merge pull request #242 from mmphys/feature/baryons
...
Feature/baryons
2019-10-16 15:06:32 +01:00
Felix Erben
3c702b510b
result layout standardised, iterator size more elegant
2019-10-15 18:48:51 +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
2dee4791db
baryon input strings are now pairs of pairs of gammas - still ugly!!
2019-10-09 17:56:09 +01:00
Felix Erben
548b3bf43c
second update to pull request
2019-10-09 14:52:33 +01:00
Fionn O hOgain
a55d0ba8fe
Changing back interface for Gamma3pt
2019-10-08 15:52:01 +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
Felix Erben
2ce7f2b4d8
suggested changes for 1st pull request implemented
2019-10-08 13:19:47 +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
Felix Erben
e280ec6b0b
changed input parameters for easier use
2019-10-02 16:14:06 +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
c8fc0b3e0c
changed baryon interface
2019-10-02 11:36:39 +01:00
Felix Erben
ccb5e8374b
z2-momentum phase module
2019-09-30 17:36:15 +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
76c93aa44e
weird bug...
2019-09-17 14:36:26 +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
Felix Erben
f548114ff6
bugfix
2019-09-16 17:55:58 +01:00
Felix Erben
dab8c01c3d
added Baryon code
2019-09-16 17:20:54 +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
Fionn O hOgain
25150eb2e0
3pt contraction now takes a list of gammas
2019-08-15 12:09:30 +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
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
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
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
Felix Erben
dc2240d2d8
why does sliceSum in Nucleon.hpp not work
2019-07-10 11:34:16 +01:00
Felix Erben
98cf20cf06
continued work on baryons
2019-07-09 17:42:36 +01:00
Felix Erben
cc3346073e
continued work on baryons
2019-07-09 17:30:32 +01:00
Felix Erben
3848da7c50
added nucleon module (non-distillation)
2019-07-08 17:43:14 +01:00
c3d0c176ab
cleaning up Kl2 contraction
2019-07-05 16:29:46 +01:00
3a31ba2ea2
Merge remote-tracking branch 'upstream/develop' into feature/kl2QEDseq
2019-07-03 14:37:56 +01:00
eac6337466
Hadrons: EMLepton: multiple source-sink separations at once
2019-07-03 14:36:34 +01:00
Felix Erben
2c1a077369
continued on baryons
2019-07-02 17:55:28 +01:00
Michael Marshall
ae3abbe53d
Added the ability for Perambulator module to save unsmeared sinks through the addition of two optional parameters:
...
UnsmearedSinkFileName: If present, specifies the filename to write to
UnsmearedSinkMultiFile: defaults to true to write each sink vector to a different file, but can be set to 0 for a single file
2019-07-01 17:28:27 +01:00
Felix Erben
5fc0188205
started saving sinks
2019-07-01 14:51:59 +01:00
fionnoh
67690df3bd
Changes nedded to have a current insertion on every second time slice - avoids unnecessary contractions
2019-06-28 15:18:28 +08:00
fionnoh
1059189abf
Bugfix for A2ALoop module
2019-06-27 13:49:55 +08:00
fionnoh
ce29b18dc9
New modules for loading in MFs as diskvectors and producing propagaotrs from 4 quark contractions
2019-06-27 13:46:06 +08:00
fionnoh
421a0a8a36
Changes to A2Autils, A2AMatirx and DiskVector code that is needed for Hadrons 4 quark contraction module
2019-06-27 13:45:20 +08:00
fionnoh
ac530636ca
A2Aloop bugfix
2019-06-27 13:44:47 +08:00
Michael Marshall
015340d60c
Elided superfluous copy on write
2019-06-19 09:37:03 +01:00
Peter Boyle
b8f71b6777
Fix NVCC warning unused variable
2019-06-17 13:58:45 +01:00
Peter Boyle
cb336aa8f8
Thread loop constructs changing a little
2019-06-15 12:54:11 +01:00
Michael Marshall
9a8a63467e
BC2 now runs. setup() runs twice, which had resulted in doubling up of momenta. Also fixed initialisation of momentum phases.
2019-06-12 15:25:59 +01:00
Michael Marshall
54edb9906e
Housekeeping. #include <Grid.h> ---> #include <Grid/Grid.h>
2019-06-03 15:20:46 +01:00
620965781e
MSource::Convolution remove test code
2019-06-02 13:44:19 +01:00
9c18638b24
MSource::Convolution let mom argument be Nd dimensional
2019-06-02 13:41:39 +01:00
4bfe678218
MSource::Gauss Integer is unsigned...
2019-06-02 12:36:57 +01:00
fc6e584f2c
MSource::Gauss fix sign in exponent of normalization + use correct types
2019-06-02 11:52:05 +01:00
7c3f400fc5
MSource::Gauss add parameters tA and tB
2019-06-02 00:12:15 +01:00
4bca2c17ce
MSource::Convolution rename parameters
2019-06-02 00:04:07 +01:00
8d540a4e85
MSource::Gauss add mom parameter + avoid Cshifts
2019-06-01 23:56:14 +01:00
Michael Marshall
9ff459816f
ReadBinary needs to do case insensitive name comparison (since I changed the default case of perambulator column names)
2019-06-01 13:50:27 +01:00
Michael Marshall
eb737daeb5
Merge branch 'develop' into feature/distil
...
* develop: (34 commits)
Hadrons: EMLepton: Wall source
Revert "cleaning up Kl2 contraction"
cleaning up Kl2 contraction
posibility to save/load schedules directly from the application parameters
moving VERSION file to the empty ChangeLog one, this create compilation problems with #include <version> in recent versions of LLVM and case-insensitive FS (typically macOS)
Added precision tuning to Hadrons parameterfile writing
Kl2 QED cleanup
Added ZFIMPL to SeqGamma
Added ZFIMPL to SeqConserved module
F1 ensemble running with 96%~ acceptance etc..
Make detection of HPE 8600 automatic
Added variables that were missing from wall source setup
Exposed a coulomb/landau enum to the gauge fixing module
Coulomb gauge added as an option
More logging, timing, and 4d/5d logic for eigpack gauge transforms
Added gauge transform option to eigpack IO
Hadrons: Lepton Propagator for kl2, sign swap for antiperiodic boundary
A2A Lepton-Meson Field contraction
Verbose
Iteratoin range fix
...
2019-05-31 18:20:43 +01:00
