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
ad01290545
remove remnants of the namespace QCD
2019-08-19 20:30:33 +01: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
166feb6483
Hadrons: EMLepton: Wall source
2019-05-30 10:07:08 +01:00
f569813b60
remove commented code
2019-05-29 17:07:07 +01:00
0190ada714
Merge branch 'develop' into feature/GaussianSmearing
2019-05-29 17:01:17 +01:00
de1a1dccb3
MSource::Gauss and MSource::Convolution: change LatticeComplex to ComplexField
2019-05-29 16:25:45 +01:00
0b3f40ce16
MSource::Convolution fix sign in Momentum
2019-05-29 16:06:10 +01:00
e35e8da111
Revert "cleaning up Kl2 contraction"
...
This reverts commit f244fed6ab
2019-05-29 11:23:17 +02:00
6fdf93d695
move momentum phase from MSource::Gauss to MSource::Convolution
2019-05-28 17:26:55 +01:00
6064f96fde
MSource::Gauss remove superfluous comment
2019-05-24 20:18:37 +01:00
4e52e46a2c
MSource::Gauss fix missing factor
2019-05-24 20:16:09 +01:00
6b27369ade
MSource::Convolution use type PropagatorField
2019-05-24 16:07:08 +01:00
ab2e5f88cd
add fields as input (for scheduler)
2019-05-24 15:57:30 +01:00
f244fed6ab
cleaning up Kl2 contraction
2019-05-24 13:08:35 +01:00
9b3701ae27
posibility to save/load schedules directly from the application parameters
2019-05-24 13:08:20 +01:00
c7c0a1065f
Merge pull request #214 from guelpers/feature/kl2QEDseq
...
Kl2 contraction with sequential propagators
2019-05-23 20:31:41 +01:00
fionnoh
0aee73ea6b
Added precision tuning to Hadrons parameterfile writing
2019-05-23 18:43:25 +01:00
e43d59045e
add option mom to MSource::Gauss
2019-05-23 17:33:32 +01:00
e553678599
add modules MSource::Gauss and MSource::Convolution
2019-05-23 16:38:13 +01:00
9a34edcf9f
Kl2 QED cleanup
2019-05-23 13:43:22 +01:00
fionnoh
246f10001e
Added ZFIMPL to SeqGamma
2019-05-23 12:42:40 +01:00
fionnoh
a66d110b88
Added ZFIMPL to SeqConserved module
2019-05-23 11:49:54 +01:00
ae5ad986e2
Merge remote-tracking branch 'upstream/develop' into feature/kl2QED
2019-05-19 14:35:46 +01:00
fionnoh
dbd7f3f0fc
Added variables that were missing from wall source setup
2019-05-17 19:10:09 +01:00
fionnoh
d14512ee03
Exposed a coulomb/landau enum to the gauge fixing module
2019-05-17 19:01:52 +01:00
Felix Erben
8ce7ebdca3
fixed contraction issue
2019-05-17 10:52:55 +01:00
Felix Erben
435653490e
fixed contraction issue
2019-05-17 10:50:15 +01:00
Michael Marshall
10a052d695
3 issues preventing compilation under clang. Marked these with FELIX_ISSUE and made minimal change to make compile (as fix not obvious)
2019-05-17 09:59:01 +01:00
Felix Erben
acd5a01b65
some work on baryons
2019-05-16 15:11:50 +01:00
fionnoh
ce102ac550
More logging, timing, and 4d/5d logic for eigpack gauge transforms
2019-05-15 14:31:25 +01:00
fionnoh
94accec311
Added gauge transform option to eigpack IO
2019-05-15 13:35:47 +01:00
Michael Marshall
ec7d96ce3b
Merge branch 'develop' into feature/distil
...
* develop:
Hadron WeakEye and A2ALoop bug fixes, and WWVVContraction bug fix
DiskVector: fix of memory bug triggering segfault when the cache is accessed following a certain pattern
MFermion::GaugeProp fix for 4d fields
2019-05-14 13:10:40 +01:00
d8512b03f8
Merge pull request #195 from nils-asmussen/fix_GaugeProp_4d
...
MFermion::GaugeProp fix for 4d fields
2019-05-12 21:31:18 +02:00
79e930ba12
Hadrons: Lepton Propagator for kl2, sign swap for antiperiodic boundary
2019-05-10 12:46:18 +01:00
fionnoh
2acd8ece65
Hadron WeakEye and A2ALoop bug fixes, and WWVVContraction bug fix
2019-05-08 10:57:36 +01:00
Michael Marshall
c16916cc45
Multiple local slice fixes
2019-05-06 10:35:42 +01:00
Michael Marshall
a865caf0d2
Forgot a const in IndexName only version of NamedTensor constructor
2019-05-03 22:17:25 +01:00
edeb590818
DiskVector: fix of memory bug triggering segfault when the cache is accessed following a certain pattern
2019-05-03 17:09:47 +01:00
Michael Marshall
ec24a1f828
Fixed 2 bugs in LapEvec: 1) InsertLocalSlice 2) ensure convergence assertion stops entire machine
2019-05-03 16:03:56 +01:00
Michael Marshall
b7ead6c16a
Fixed bug: iff stout smearing disabled then gauge field uninitialised
2019-05-02 18:20:49 +01:00
Michael Marshall
62692b68b9
I'd forgotten that Intel '17 doesn't like auto var{value}; syntax
2019-05-01 20:45:16 +01:00
Michael Marshall
311c35a15c
Looking for fixes for Intel '17 compiler errors. std::cout << complex number ?
2019-05-01 18:22:08 +01:00
Michael Marshall
a3fe57f430
NamedTensor writes to tag NamedTensor by default (not filename) - so still usable in case user renames file.
...
Also tweaked tensor index name checking (which is used to ensure tensor is correct type)
2019-05-01 18:11:37 +01:00
Michael Marshall
8dc0587621
Post Michael / Felix review. Ready for Peter / Antonin review
2019-05-01 13:04:51 +01:00
Michael Marshall
cfe5fa7a35
1) Don't write Laplacian eigenvectors to disk 2) Add a test that loads perambulators from disk
2019-05-01 09:50:23 +01:00
Michael Marshall
e72e26c899
Get rid of unnecessary multiFile options
2019-05-01 08:53:08 +01:00
Michael Marshall
334f29becb
Fairly close to ready for release. Felix and I to review, then submit for release
2019-04-30 23:53:57 +01:00
Michael Marshall
e56ead55ef
WIP
2019-04-30 14:41:48 +01:00
4f0631615f
A2A Lepton-Meson Field contraction
2019-04-30 12:04:59 +01:00
Michael Marshall
d74d443d1b
Pre-release cleanup in progress
2019-04-29 22:18:29 +01:00
Michael Marshall
4203105104
Part-way through release tidy-up
2019-04-29 18:40:38 +01:00
c2cd0e15d7
Merge remote-tracking branch 'upstream/develop' into feature/kl2QED
...
Conflicts:
Grid/qcd/action/fermion/DomainWallFermion.h
Grid/qcd/action/fermion/FermionOperator.h
2019-04-29 12:07:20 +01:00
Michael Marshall
c48ae4f3ad
1) Only the boss should write the perambulator - possibly was a source of intermittent corruption?
...
2) Implemented and test a perambulator conversion utility in Test_distil (commented out near the start of main)
2019-04-28 23:24:57 +01:00
Michael Marshall
fb74de0798
Making sure Hdf5 is an optional dependency (default to binary writer if not present)
2019-04-28 20:23:44 +01:00
Michael Marshall
adc1eaee68
Switched to Hdf5 format for perambulators. Ready for first test on Tesseract.
2019-04-28 17:53:42 +01:00
Michael Marshall
3ac5a69a57
Ready to test spatial smearing (again)
2019-04-26 08:54:30 +01:00
Michael Marshall
8419fbb335
Renamed PerambLight module. Check with Felix whether Test_24 and Test_tesseract still need to be maintained
2019-04-26 08:23:15 +01:00
Michael Marshall
23a9b93cda
More dependencies for Distil.hpp move and (C) 2019 only
2019-04-26 07:39:05 +01:00
Michael Marshall
ecdc3ddebf
Moved Distil.hpp and added GNU license to all files
2019-04-26 07:24:56 +01:00
Michael Marshall
a97b814f0c
Remove redundancy in LapEvec filename
2019-04-19 14:09:36 +01:00
Michael Marshall
7214681e11
Spatial smearing doesn't work yet. Fixed inconsistency in naming of perambulator in PerambLight.hpp
2019-04-19 13:54:25 +01:00
Michael Marshall
143b75956c
Stout smearing 3D fixes. Changed LapEvec to perform spatial smearing only
2019-04-19 11:54:02 +01:00
Felix Erben
4a4203c610
fixed stout smearing for now
2019-04-18 19:10:49 +01:00
Felix Erben
2b598294c9
added distil source module
2019-04-18 17:47:09 +01:00
00963a7499
twist and boundary conditions for free propagator
2019-04-05 10:08:27 +01:00
Felix Erben
5e6104e683
Merge branch 'feature/distil' of https://github.com/mmphys/Grid into feature/distil
2019-04-04 12:13:35 +01:00
Felix Erben
25e4ee3a49
3D Stout smearing added
2019-04-04 12:13:16 +01:00
Michael Marshall
b5eb97206b
Merge branch 'develop' into feature/distil
...
* develop:
MGauge::GaugeFix use standard convention for fields
fix bug: MGauge::GaugeFix should not modify its input
add gauge transformation matrix as output to module MGauge/GaugeFix
2019-04-03 16:24:49 +01:00
72f959c0b8
MGauge::GaugeFix use standard convention for fields
2019-03-29 16:51:21 +00:00
63001d3fa6
fix bug: MGauge::GaugeFix should not modify its input
2019-03-29 16:51:11 +00:00
b1d3d1f1a9
add gauge transformation matrix as output to module MGauge/GaugeFix
2019-03-29 16:51:00 +00:00
c2250fa124
MFermion::GaugeProp fix for 4d fields
2019-03-29 16:36:56 +00:00
84940fbdf0
Hadrons: Lepton Propagator for kl2
2019-03-28 10:15:09 +00:00
ferben
f757b80e1c
tried to fix mem leak
2019-03-27 12:00:36 +00:00
Michael Marshall
9fce1263be
Fixed bug in LapEvec if machine running spread-out in time
2019-03-26 13:24:39 +00:00
Michael Marshall
ae565b006a
Compiling in single-precision now works
2019-03-25 22:56:01 +00:00
Michael Marshall
8502660023
Begin fixes for single precision
2019-03-25 20:40:05 +00:00
