1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-09-20 17:25:37 +01:00
Commit Graph

1071 Commits

Author SHA1 Message Date
neo
48ae886c32 Cleaning up files for HMC 2015-07-07 14:59:37 +09:00
neo
97afe4125f Cleaning up files for HMC 2015-07-07 14:59:37 +09:00
neo
1e9317e5cf Simplifying HMC syntax for the final user 2015-07-06 18:32:20 +09:00
neo
19a1ffedcc Simplifying HMC syntax for the final user 2015-07-06 18:32:20 +09:00
neo
0f21c38ff8 Simplifying HMC syntax for the final user 2015-07-06 18:32:20 +09:00
neo
510f55ba30 Rearranging files in hmc 2015-07-06 16:46:43 +09:00
neo
32e6887d5f Rearranging files in hmc 2015-07-06 16:46:43 +09:00
neo
fa42b652e5 Rearranging files in hmc 2015-07-06 16:46:43 +09:00
neo
f95db88d19 Added minimum norm integrator
Little rearrangement of HMC and integrator classes
2015-07-06 16:17:32 +09:00
neo
1991852025 Added minimum norm integrator
Little rearrangement of HMC and integrator classes
2015-07-06 16:17:32 +09:00
neo
68fe0769a1 Added minimum norm integrator
Little rearrangement of HMC and integrator classes
2015-07-06 16:17:32 +09:00
neo
12e1682a87 HMC for Wilson Gauge action works
Fixed bug in momenta generation
2015-07-06 12:58:49 +09:00
neo
2718038977 HMC for Wilson Gauge action works
Fixed bug in momenta generation
2015-07-06 12:58:49 +09:00
neo
808f5820fa HMC for Wilson Gauge action works
Fixed bug in momenta generation
2015-07-06 12:58:49 +09:00
neo
6261770f59 Debugged vector version of ProjectOnGroup 2015-07-06 02:24:58 +09:00
neo
62d8952c0a Debugged vector version of ProjectOnGroup 2015-07-06 02:24:58 +09:00
neo
0ffcdf6204 Debugged vector version of ProjectOnGroup 2015-07-06 02:24:58 +09:00
neo
7a4ed7a867 HMC ready but untested 2015-07-04 17:47:50 +09:00
neo
b1f94fa292 HMC ready but untested 2015-07-04 17:47:50 +09:00
neo
e6087e1820 HMC ready but untested 2015-07-04 17:47:50 +09:00
neo
250965c6ca More progress in the HMC construction 2015-07-04 02:43:14 +09:00
neo
30c9dc473d More progress in the HMC construction 2015-07-04 02:43:14 +09:00
neo
59be55c0ab More progress in the HMC construction 2015-07-04 02:43:14 +09:00
neo
55f05a778f Skeleton of HMC/Integrators 2015-07-03 16:51:41 +09:00
neo
9655d43017 Skeleton of HMC/Integrators 2015-07-03 16:51:41 +09:00
neo
ab3ad78ece Skeleton of HMC/Integrators 2015-07-03 16:51:41 +09:00
Peter Boyle
2c9ceaef94 No compile fix 2015-07-02 02:03:09 +01:00
Peter Boyle
a666e66e36 No compile fix 2015-07-02 02:03:09 +01:00
Peter Boyle
4deffd1ccb No compile fix 2015-07-02 02:03:09 +01:00
Peter Boyle
55e313bd08 Cleaning up the recursion for traceIndex<n> after the changes the enable G++ to
compile it again.
2015-07-01 23:43:57 +01:00
Peter Boyle
84ec7c40cd Cleaning up the recursion for traceIndex<n> after the changes the enable G++ to
compile it again.
2015-07-01 23:43:57 +01:00
Peter Boyle
a5c3edaca9 Cleaning up the recursion for traceIndex<n> after the changes the enable G++ to
compile it again.
2015-07-01 23:43:57 +01:00
Peter Boyle
ef0ec1d0b2 Merge branch 'master' of https://github.com/paboyle/Grid 2015-07-01 22:51:04 +01:00
Peter Boyle
69a3d3203c Merge branch 'master' of https://github.com/paboyle/Grid 2015-07-01 22:51:04 +01:00
Peter Boyle
31a0c8d783 Merge branch 'master' of https://github.com/paboyle/Grid 2015-07-01 22:51:04 +01:00
paboyle
cb9da7b371 Temporarily disable gmp dependency simply because Cray XC30's I'm benchmarking
have a downlevel gmp version that chokes on ::max_align_t where gmp had a
bug as far as I recall.
2015-07-01 22:47:33 +01:00
paboyle
c0ea404a7c Temporarily disable gmp dependency simply because Cray XC30's I'm benchmarking
have a downlevel gmp version that chokes on ::max_align_t where gmp had a
bug as far as I recall.
2015-07-01 22:47:33 +01:00
paboyle
e3456bf559 Temporarily disable gmp dependency simply because Cray XC30's I'm benchmarking
have a downlevel gmp version that chokes on ::max_align_t where gmp had a
bug as far as I recall.
2015-07-01 22:47:33 +01:00
Peter Boyle
98b84d230a Change the SIMD command correctly with precision = double vs. single and
connect the "Real" default precisoin to a configure flag.
Have RealF, RealD and Real types, where Real is compile target dependent single/double,
RealF is single and RealD is double etc..
2015-07-01 22:45:15 +01:00
Peter Boyle
dc66161f47 Change the SIMD command correctly with precision = double vs. single and
connect the "Real" default precisoin to a configure flag.
Have RealF, RealD and Real types, where Real is compile target dependent single/double,
RealF is single and RealD is double etc..
2015-07-01 22:45:15 +01:00
Peter Boyle
638d2cda11 Change the SIMD command correctly with precision = double vs. single and
connect the "Real" default precisoin to a configure flag.
Have RealF, RealD and Real types, where Real is compile target dependent single/double,
RealF is single and RealD is double etc..
2015-07-01 22:45:15 +01:00
Peter Boyle
e164ed6f12 Big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:17:27 +01:00
Peter Boyle
f41c7dffef Big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:17:27 +01:00
Peter Boyle
03ca506a3d Big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:17:27 +01:00
Peter Boyle
95ecf81d42 big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:03:11 +01:00
Peter Boyle
74e397b29c big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:03:11 +01:00
Peter Boyle
98c817df1b big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:03:11 +01:00
Peter Boyle
f36dbfffe5 VPGCR updates 2015-06-30 15:02:27 +01:00
Peter Boyle
7cfe432ee2 VPGCR updates 2015-06-30 15:02:27 +01:00
Peter Boyle
8eaf657f95 VPGCR updates 2015-06-30 15:02:27 +01:00
Peter Boyle
a4369e1db6 big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:00:19 +01:00
Peter Boyle
7de5ccb879 big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:00:19 +01:00
Peter Boyle
c20fdd45a5 big commit fixing nocompiles in defective C++11 compilers (gcc, icpc). stared getting to
near the bleeding edge I guess
2015-06-30 15:00:19 +01:00
Peter Boyle
5f8f0bc792 Some small steps towards a multigrid 2015-06-22 12:49:44 +01:00
Peter Boyle
dec68e5c0e Some small steps towards a multigrid 2015-06-22 12:49:44 +01:00
Peter Boyle
a17684ebe2 Some small steps towards a multigrid 2015-06-22 12:49:44 +01:00
Azusa Yamaguchi
95538bb8c6 Abstract preconditioner 2015-06-21 11:03:55 +01:00
Azusa Yamaguchi
e415587e8f Abstract preconditioner 2015-06-21 11:03:55 +01:00
Azusa Yamaguchi
fd1a8abcd1 Abstract preconditioner 2015-06-21 11:03:55 +01:00
Azusa Yamaguchi
a265765319 Variable preconditioned GCR with restarting.
Orthogonalisation depth and restart frequency is controllable via constructor
2015-06-21 10:58:46 +01:00
Azusa Yamaguchi
945bb93e48 Variable preconditioned GCR with restarting.
Orthogonalisation depth and restart frequency is controllable via constructor
2015-06-21 10:58:46 +01:00
Azusa Yamaguchi
3b4118f33e Variable preconditioned GCR with restarting.
Orthogonalisation depth and restart frequency is controllable via constructor
2015-06-21 10:58:46 +01:00
Peter Boyle
eace9051e8 Merge
Merge branch 'master' of https://github.com/paboyle/Grid
2015-06-20 22:25:31 +01:00
Peter Boyle
bcf1d5160f Merge
Merge branch 'master' of https://github.com/paboyle/Grid
2015-06-20 22:25:31 +01:00
Peter Boyle
c7d77dfa0f Merge
Merge branch 'master' of https://github.com/paboyle/Grid
2015-06-20 22:25:31 +01:00
Peter Boyle
f1916a7515 Will start this as a two level algorithm 2015-06-20 22:24:21 +01:00
Peter Boyle
eb5ad2884c Will start this as a two level algorithm 2015-06-20 22:24:21 +01:00
Peter Boyle
960f29c0b1 Will start this as a two level algorithm 2015-06-20 22:24:21 +01:00
Peter Boyle
5ccbac7db1 HDCG but this is not complete and placeholder for later completion 2015-06-20 22:23:57 +01:00
Peter Boyle
bce59d9911 HDCG but this is not complete and placeholder for later completion 2015-06-20 22:23:57 +01:00
Peter Boyle
fb07ee5781 HDCG but this is not complete and placeholder for later completion 2015-06-20 22:23:57 +01:00
Peter Boyle
aba5c8595a Patches for beginnings of an overlap multigrid 2015-06-20 22:22:56 +01:00
Peter Boyle
6ad96f7383 Patches for beginnings of an overlap multigrid 2015-06-20 22:22:56 +01:00
Peter Boyle
b4a6dbfa65 Patches for beginnings of an overlap multigrid 2015-06-20 22:22:56 +01:00
Azusa Yamaguchi
cb92390825 Merge branch 'master' of https://github.com/paboyle/Grid 2015-06-20 14:22:29 +01:00
Azusa Yamaguchi
6cebd006d4 Merge branch 'master' of https://github.com/paboyle/Grid 2015-06-20 14:22:29 +01:00
Azusa Yamaguchi
dc7c77e1d5 Merge branch 'master' of https://github.com/paboyle/Grid 2015-06-20 14:22:29 +01:00
neo
faf8544233 Lattice matrix exponential ok 2015-06-17 20:41:07 +09:00
neo
09757cbf0c Lattice matrix exponential ok 2015-06-17 20:41:07 +09:00
neo
4eb71d2cd2 Lattice matrix exponential ok 2015-06-17 20:41:07 +09:00
Azusa Yamaguchi
b78ecd6fb2 merge 2015-06-16 20:47:31 +01:00
Azusa Yamaguchi
92e870b256 merge 2015-06-16 20:47:31 +01:00
Azusa Yamaguchi
fd72b64ca3 merge 2015-06-16 20:47:31 +01:00
Azusa Yamaguchi
700614123d add bug-fixed Test_nersc)_io. 2015-06-16 20:23:27 +01:00
Azusa Yamaguchi
06047b83c7 add bug-fixed Test_nersc)_io. 2015-06-16 20:23:27 +01:00
Azusa Yamaguchi
2faf7d95db add bug-fixed Test_nersc)_io. 2015-06-16 20:23:27 +01:00
neo
26ff0f3b50 Merge remote-tracking branch 'upstream/master' 2015-06-17 02:02:51 +09:00
neo
9c846bb0c7 Merge remote-tracking branch 'upstream/master' 2015-06-17 02:02:51 +09:00
neo
e31dfa79d1 Merge remote-tracking branch 'upstream/master' 2015-06-17 02:02:51 +09:00
neo
a7555b41df Corrected bug in integer multiplications for SSE4 and AVX2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests/Make.inc
2015-06-16 23:34:45 +09:00
neo
c9018d74ac Corrected bug in integer multiplications for SSE4 and AVX2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests/Make.inc
2015-06-16 23:34:45 +09:00
neo
6e5db0b1da Corrected bug in integer multiplications for SSE4 and AVX2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests/Make.inc
2015-06-16 23:34:45 +09:00
Azusa Yamaguchi
77058d9b9f Critical bug fix of sin/cos typo 2015-06-16 14:17:45 +01:00
Azusa Yamaguchi
9c16bccbf4 Critical bug fix of sin/cos typo 2015-06-16 14:17:45 +01:00
Azusa Yamaguchi
20fe866651 Critical bug fix of sin/cos typo 2015-06-16 14:17:45 +01:00
Azusa Yamaguchi
74845cb3dc Quenched works for wilson gauge 2015-06-16 14:17:11 +01:00
Azusa Yamaguchi
79a9f8b9c9 Quenched works for wilson gauge 2015-06-16 14:17:11 +01:00
Azusa Yamaguchi
18d0437f8d Quenched works for wilson gauge 2015-06-16 14:17:11 +01:00
Azusa Yamaguchi
c945041067 uninitialised bug fix 2015-06-16 14:07:05 +01:00
Azusa Yamaguchi
173b31ce05 uninitialised bug fix 2015-06-16 14:07:05 +01:00
Azusa Yamaguchi
4e7300b68d uninitialised bug fix 2015-06-16 14:07:05 +01:00
Azusa Yamaguchi
a7774e100f Typo fix 2015-06-16 14:06:31 +01:00
Azusa Yamaguchi
633ee06faf Typo fix 2015-06-16 14:06:31 +01:00
Azusa Yamaguchi
73494a4768 Typo fix 2015-06-16 14:06:31 +01:00
Azusa Yamaguchi
b11f4a1473 Extra check that failed in quenched test 2015-06-16 14:04:56 +01:00
Azusa Yamaguchi
cd7eac062a Extra check that failed in quenched test 2015-06-16 14:04:56 +01:00
Azusa Yamaguchi
d7a8921de2 Extra check that failed in quenched test 2015-06-16 14:04:56 +01:00
Azusa Yamaguchi
212c13bb2c pointer cast 2015-06-16 14:04:33 +01:00
Azusa Yamaguchi
625bb1d7ee pointer cast 2015-06-16 14:04:33 +01:00
Azusa Yamaguchi
d5edd09beb pointer cast 2015-06-16 14:04:33 +01:00
Azusa Yamaguchi
54964dd4bb First cut at SUN support for quenched updates 2015-06-14 01:28:54 +01:00
Azusa Yamaguchi
ae0873bc77 First cut at SUN support for quenched updates 2015-06-14 01:28:54 +01:00
Azusa Yamaguchi
55d7483608 First cut at SUN support for quenched updates 2015-06-14 01:28:54 +01:00
Azusa Yamaguchi
aa558ab03d Logical elemenet by element on tensors 2015-06-14 01:08:29 +01:00
Azusa Yamaguchi
353c9598c1 Logical elemenet by element on tensors 2015-06-14 01:08:29 +01:00
Azusa Yamaguchi
2b971c14c0 Logical elemenet by element on tensors 2015-06-14 01:08:29 +01:00
Azusa Yamaguchi
459ce22bb3 WHere should always have precisely matching types in ET system 2015-06-14 01:07:58 +01:00
Azusa Yamaguchi
a5bb9472b6 WHere should always have precisely matching types in ET system 2015-06-14 01:07:58 +01:00
Azusa Yamaguchi
250cb00c42 WHere should always have precisely matching types in ET system 2015-06-14 01:07:58 +01:00
Azusa Yamaguchi
694dac7ff5 Where and many other functions (sin cos abs log exp) into ET system 2015-06-14 01:07:25 +01:00
Azusa Yamaguchi
84a207f2e6 Where and many other functions (sin cos abs log exp) into ET system 2015-06-14 01:07:25 +01:00
Azusa Yamaguchi
f5bcca6cdf Where and many other functions (sin cos abs log exp) into ET system 2015-06-14 01:07:25 +01:00
Azusa Yamaguchi
c54299107a Cosmetic 2015-06-14 01:06:56 +01:00
Azusa Yamaguchi
667abe888a Cosmetic 2015-06-14 01:06:56 +01:00
Azusa Yamaguchi
be3f4ce201 Cosmetic 2015-06-14 01:06:56 +01:00
Azusa Yamaguchi
fe1d8a9dd1 real comps and expression comps 2015-06-14 01:05:57 +01:00
Azusa Yamaguchi
bc238177b7 real comps and expression comps 2015-06-14 01:05:57 +01:00
Azusa Yamaguchi
264d0d1735 real comps and expression comps 2015-06-14 01:05:57 +01:00
Azusa Yamaguchi
c93c0edcd9 Allow real comparisons and expressions in comparisons 2015-06-14 01:05:39 +01:00
Azusa Yamaguchi
2303a2231b Allow real comparisons and expressions in comparisons 2015-06-14 01:05:39 +01:00
Azusa Yamaguchi
6ca940b5a6 Allow real comparisons and expressions in comparisons 2015-06-14 01:05:39 +01:00
Azusa Yamaguchi
9bdef0888e Allow sparse occupation of vectors in some cases 2015-06-14 01:05:06 +01:00
Azusa Yamaguchi
9bdb8ffb3f Allow sparse occupation of vectors in some cases 2015-06-14 01:05:06 +01:00
Azusa Yamaguchi
b66bbed548 Allow sparse occupation of vectors in some cases 2015-06-14 01:05:06 +01:00
Azusa Yamaguchi
f8f4b8a249 Moving more into the ET system 2015-06-14 01:04:32 +01:00
Azusa Yamaguchi
38e8a61035 Moving more into the ET system 2015-06-14 01:04:32 +01:00
Azusa Yamaguchi
463b9ca374 Moving more into the ET system 2015-06-14 01:04:32 +01:00
Azusa Yamaguchi
8bafe067eb trying to find a way to remove functions from the ET system using explicit
expression closure statements. Not sure if this works yet
2015-06-14 01:03:28 +01:00
Azusa Yamaguchi
02885ee583 trying to find a way to remove functions from the ET system using explicit
expression closure statements. Not sure if this works yet
2015-06-14 01:03:28 +01:00
Azusa Yamaguchi
611f7ec38c trying to find a way to remove functions from the ET system using explicit
expression closure statements. Not sure if this works yet
2015-06-14 01:03:28 +01:00
Azusa Yamaguchi
53ba8d4926 Transpose always returns self image 2015-06-14 01:02:31 +01:00
Azusa Yamaguchi
6a697be060 Transpose always returns self image 2015-06-14 01:02:31 +01:00
Azusa Yamaguchi
f490f320ae Transpose always returns self image 2015-06-14 01:02:31 +01:00
Azusa Yamaguchi
ddd93a0576 Extra lattice unaries 2015-06-14 01:01:55 +01:00
Azusa Yamaguchi
4d81d402b9 Extra lattice unaries 2015-06-14 01:01:55 +01:00
Azusa Yamaguchi
58f50b7520 Extra lattice unaries 2015-06-14 01:01:55 +01:00
Azusa Yamaguchi
ae2dcfc173 Moving where in to the expression template system; deprecate 2015-06-14 01:01:21 +01:00
Azusa Yamaguchi
0f7cf40867 Moving where in to the expression template system; deprecate 2015-06-14 01:01:21 +01:00
Azusa Yamaguchi
e5c980f169 Moving where in to the expression template system; deprecate 2015-06-14 01:01:21 +01:00
Azusa Yamaguchi
e529dd9696 Peek poke colour/spin/complex and trace transpose support 2015-06-14 01:00:11 +01:00
Azusa Yamaguchi
87cc0d4ca3 Peek poke colour/spin/complex and trace transpose support 2015-06-14 01:00:11 +01:00
Azusa Yamaguchi
6b8bdf0c6b Peek poke colour/spin/complex and trace transpose support 2015-06-14 01:00:11 +01:00
Azusa Yamaguchi
610450bc0e const safety 2015-06-14 00:59:50 +01:00
Azusa Yamaguchi
66e5718610 const safety 2015-06-14 00:59:50 +01:00
Azusa Yamaguchi
68b82ddd99 const safety 2015-06-14 00:59:50 +01:00
Azusa Yamaguchi
2ba72a91de Binop assist and real/complex improvements 2015-06-14 00:59:07 +01:00
Azusa Yamaguchi
19e8d2809a Binop assist and real/complex improvements 2015-06-14 00:59:07 +01:00
Azusa Yamaguchi
22c8185caa Binop assist and real/complex improvements 2015-06-14 00:59:07 +01:00
Azusa Yamaguchi
4cf04c8583 More functions broken out into element by element 2015-06-14 00:58:14 +01:00
Azusa Yamaguchi
8245585dee More functions broken out into element by element 2015-06-14 00:58:14 +01:00
Azusa Yamaguchi
42f7e5b7f8 More functions broken out into element by element 2015-06-14 00:58:14 +01:00
Azusa Yamaguchi
56d120cb24 typo fix -- remove extra template arg 2015-06-14 00:57:23 +01:00
Azusa Yamaguchi
9006f7a34a typo fix -- remove extra template arg 2015-06-14 00:57:23 +01:00
Azusa Yamaguchi
84485afe6c typo fix -- remove extra template arg 2015-06-14 00:57:23 +01:00
Azusa Yamaguchi
1dc8dfd3ae Logical ops element by element 2015-06-14 00:56:40 +01:00
Azusa Yamaguchi
d5810eaef1 Logical ops element by element 2015-06-14 00:56:40 +01:00
Azusa Yamaguchi
3dea03e72b Logical ops element by element 2015-06-14 00:56:40 +01:00
Azusa Yamaguchi
f2dafbc4f7 Real complex improved 2015-06-14 00:56:08 +01:00
Azusa Yamaguchi
b521155218 Real complex improved 2015-06-14 00:56:08 +01:00
Azusa Yamaguchi
dbfb1a69c6 Real complex improved 2015-06-14 00:56:08 +01:00
Azusa Yamaguchi
9c810200e0 Handle case of simd_layout not filling whole vector.
Useful if real complex live on same grid
2015-06-14 00:55:21 +01:00
Azusa Yamaguchi
51ebc4f402 Handle case of simd_layout not filling whole vector.
Useful if real complex live on same grid
2015-06-14 00:55:21 +01:00
Azusa Yamaguchi
ef97692622 Handle case of simd_layout not filling whole vector.
Useful if real complex live on same grid
2015-06-14 00:55:21 +01:00
Azusa Yamaguchi
6d6e9a5811 Real/Complex improvements 2015-06-14 00:54:18 +01:00
Azusa Yamaguchi
17de4bce20 Real/Complex improvements 2015-06-14 00:54:18 +01:00
Azusa Yamaguchi
a81998f704 Real/Complex improvements 2015-06-14 00:54:18 +01:00
Azusa Yamaguchi
2949e5feca Real handling improvement 2015-06-14 00:53:52 +01:00
Azusa Yamaguchi
d74aa0e1e6 Real handling improvement 2015-06-14 00:53:52 +01:00
Azusa Yamaguchi
8fa0c90062 Real handling improvement 2015-06-14 00:53:52 +01:00
Azusa Yamaguchi
96a55c17f1 Unary funcs update 2015-06-14 00:53:18 +01:00
Azusa Yamaguchi
d66cab3f01 Unary funcs update 2015-06-14 00:53:18 +01:00
Azusa Yamaguchi
c90cf08bae Unary funcs update 2015-06-14 00:53:18 +01:00
Azusa Yamaguchi
19ff065844 fix no compile 2015-06-14 00:48:41 +01:00
Azusa Yamaguchi
46eafa520d fix no compile 2015-06-14 00:48:41 +01:00
Azusa Yamaguchi
dcfc189f11 fix no compile 2015-06-14 00:48:41 +01:00
Peter Boyle
0ad72b38ab file list 2015-06-10 12:25:15 +01:00
Peter Boyle
50c4f416b6 file list 2015-06-10 12:25:15 +01:00
Peter Boyle
622261b1ea file list 2015-06-10 12:25:15 +01:00
Azusa Yamaguchi
e3b4dd32c0 commit file list 2015-06-10 11:26:46 +01:00
Azusa Yamaguchi
89f961faef commit file list 2015-06-10 11:26:46 +01:00
Azusa Yamaguchi
22752f6ff0 commit file list 2015-06-10 11:26:46 +01:00
neo
f3dd829459 Adding several iMatrix utilities 2015-06-10 14:16:33 +09:00
neo
965a92ce40 Adding several iMatrix utilities 2015-06-10 14:16:33 +09:00
neo
bb4a916767 Adding several iMatrix utilities 2015-06-10 14:16:33 +09:00
Peter Boyle
e79a57b423 Merge branch 'master' of https://github.com/paboyle/Grid
Not sure what changed in master
2015-06-09 22:51:10 +01:00
Peter Boyle
1118c42fcc Merge branch 'master' of https://github.com/paboyle/Grid
Not sure what changed in master
2015-06-09 22:51:10 +01:00
Peter Boyle
02144fb50b Merge branch 'master' of https://github.com/paboyle/Grid
Not sure what changed in master
2015-06-09 22:51:10 +01:00
Peter Boyle
2022a7205c Remove extra layers of checks now it works 2015-06-09 22:43:41 +01:00
Peter Boyle
60a96e3d0d Remove extra layers of checks now it works 2015-06-09 22:43:41 +01:00
Peter Boyle
0784bbc4bf Remove extra layers of checks now it works 2015-06-09 22:43:41 +01:00
Peter Boyle
4963f7356a 5d OpDir direction interface refers to the 5d dims, not 4d to present a
sensible and consistent external interface.
2015-06-09 22:41:59 +01:00
Peter Boyle
6abbd35d81 5d OpDir direction interface refers to the 5d dims, not 4d to present a
sensible and consistent external interface.
2015-06-09 22:41:59 +01:00
Peter Boyle
b92060f511 5d OpDir direction interface refers to the 5d dims, not 4d to present a
sensible and consistent external interface.
2015-06-09 22:41:59 +01:00
Peter Boyle
708d4f7533 g5 and g5R5 hermitian are now differentiated 2015-06-09 22:40:58 +01:00
Peter Boyle
c7152c520a g5 and g5R5 hermitian are now differentiated 2015-06-09 22:40:58 +01:00
Peter Boyle
c133974d67 g5 and g5R5 hermitian are now differentiated 2015-06-09 22:40:58 +01:00
Peter Boyle
1f2498918d Got this sorted with the promote working in a test 2015-06-09 22:39:13 +01:00
Peter Boyle
4a10540365 Got this sorted with the promote working in a test 2015-06-09 22:39:13 +01:00
Peter Boyle
7766cc96c1 Got this sorted with the promote working in a test 2015-06-09 22:39:13 +01:00
Peter Boyle
25bfff370a Starting to use 2015-06-09 22:38:13 +01:00
Peter Boyle
e19391ef7a Starting to use 2015-06-09 22:38:13 +01:00
Peter Boyle
6fb36c8a51 Starting to use 2015-06-09 22:38:13 +01:00
Peter Boyle
6403e3021f Debugged finally. A silly mistake in permute cost me a day of debug. 2015-06-09 22:37:21 +01:00
Peter Boyle
a5b75a095c Debugged finally. A silly mistake in permute cost me a day of debug. 2015-06-09 22:37:21 +01:00
Peter Boyle
2e6986892a Debugged finally. A silly mistake in permute cost me a day of debug. 2015-06-09 22:37:21 +01:00
neo
f8eb862073 Merge remote-tracking branch 'upstream/master' 2015-06-09 19:01:07 +09:00
neo
61b85a0670 Merge remote-tracking branch 'upstream/master' 2015-06-09 19:01:07 +09:00
neo
ecf3bae150 Merge remote-tracking branch 'upstream/master' 2015-06-09 19:01:07 +09:00
neo
99ace0a89c Adding support for iMatrix exponentiation 2015-06-09 18:59:45 +09:00
neo
d60cfe31a7 Adding support for iMatrix exponentiation 2015-06-09 18:59:45 +09:00
neo
e80012896a Adding support for iMatrix exponentiation 2015-06-09 18:59:45 +09:00
Peter Boyle
64e2f36d40 Merge pull request #14 from mspraggs/master
Removed std::string calls from NerscIO map indexing
2015-06-09 10:31:52 +01:00
Peter Boyle
e87554296c Merge pull request #14 from mspraggs/master
Removed std::string calls from NerscIO map indexing
2015-06-09 10:31:52 +01:00
Peter Boyle
645120a400 Merge pull request #14 from mspraggs/master
Removed std::string calls from NerscIO map indexing
2015-06-09 10:31:52 +01:00
Peter Boyle
e8b43944e7 Merge branch 'master' of https://github.com/paboyle/Grid
Conflicts:
	lib/Make.inc
2015-06-09 10:27:10 +01:00
Peter Boyle
d8ddec86f7 Merge branch 'master' of https://github.com/paboyle/Grid
Conflicts:
	lib/Make.inc
2015-06-09 10:27:10 +01:00
Peter Boyle
a73a1c1bc1 Merge branch 'master' of https://github.com/paboyle/Grid
Conflicts:
	lib/Make.inc
2015-06-09 10:27:10 +01:00
Peter Boyle
1048304f30 Some unary ops and coarse grid support 2015-06-09 10:26:19 +01:00
Peter Boyle
506dfd1517 Some unary ops and coarse grid support 2015-06-09 10:26:19 +01:00
Peter Boyle
1e5b015ee3 Some unary ops and coarse grid support 2015-06-09 10:26:19 +01:00
Peter Boyle
f19518d564 Unary ops and coarse grid support 2015-06-09 10:25:29 +01:00
Peter Boyle
9269126fba Unary ops and coarse grid support 2015-06-09 10:25:29 +01:00
Peter Boyle
21e41638e5 Unary ops and coarse grid support 2015-06-09 10:25:29 +01:00
neo
744ac33e8b Experimental support for ARM 2015-06-09 15:46:21 +09:00
neo
6b8fe04054 Experimental support for ARM 2015-06-09 15:46:21 +09:00
neo
48bf4878c1 Experimental support for ARM 2015-06-09 15:46:21 +09:00
Peter Boyle
98b10f587e Merge branch 'master' of https://github.com/paboyle/Grid
Conflicts:
	lib/Make.inc
	tests/Make.inc
	tests/Test_remez.cc
2015-06-08 12:08:09 +01:00
Peter Boyle
2f4a4489ce Merge branch 'master' of https://github.com/paboyle/Grid
Conflicts:
	lib/Make.inc
	tests/Make.inc
	tests/Test_remez.cc
2015-06-08 12:08:09 +01:00
Peter Boyle
3111f50f2f Merge branch 'master' of https://github.com/paboyle/Grid
Conflicts:
	lib/Make.inc
	tests/Make.inc
	tests/Test_remez.cc
2015-06-08 12:08:09 +01:00
Peter Boyle
b0873e7ed2 Conjugate residual algorithm; some more unary functions 2015-06-08 12:04:59 +01:00
Peter Boyle
9e7035f5dc Conjugate residual algorithm; some more unary functions 2015-06-08 12:04:59 +01:00
Peter Boyle
d6f1ddf99c Conjugate residual algorithm; some more unary functions 2015-06-08 12:04:59 +01:00
Peter Boyle
42c22d4cae Prep for multigrid 2015-06-08 12:02:53 +01:00
Peter Boyle
5bdf89e3f0 Prep for multigrid 2015-06-08 12:02:53 +01:00
Peter Boyle
5a3bc5250e Prep for multigrid 2015-06-08 12:02:53 +01:00
Peter Boyle
aad51ffe3a Prep for mgrid 2015-06-08 12:02:26 +01:00
Peter Boyle
ea583e2e53 Prep for mgrid 2015-06-08 12:02:26 +01:00
Peter Boyle
680abafe5d Prep for mgrid 2015-06-08 12:02:26 +01:00
Azusa Yamaguchi
a8b9109cc8 multishift conjugate gradient added and a strong test: take a diagonal
but non-identity matrix
l1 0  0  0 ....
0  l2 0  0 ....
0  0  l3 0 ...
.  .   .
.  .   .
.  .   .

And apply the multishift CG to it. Sum the poles and residues.
Insist that this be the same as the exactly taken square root
where l1,l2,l3 >= 0.
2015-06-08 11:52:44 +01:00
Azusa Yamaguchi
54aec05989 multishift conjugate gradient added and a strong test: take a diagonal
but non-identity matrix
l1 0  0  0 ....
0  l2 0  0 ....
0  0  l3 0 ...
.  .   .
.  .   .
.  .   .

And apply the multishift CG to it. Sum the poles and residues.
Insist that this be the same as the exactly taken square root
where l1,l2,l3 >= 0.
2015-06-08 11:52:44 +01:00
Azusa Yamaguchi
8688ff8b3a multishift conjugate gradient added and a strong test: take a diagonal
but non-identity matrix
l1 0  0  0 ....
0  l2 0  0 ....
0  0  l3 0 ...
.  .   .
.  .   .
.  .   .

And apply the multishift CG to it. Sum the poles and residues.
Insist that this be the same as the exactly taken square root
where l1,l2,l3 >= 0.
2015-06-08 11:52:44 +01:00
Matt Spraggs
e2e076d307 Removed std::string calls from NerscIO map indexing 2015-06-07 17:06:25 +01:00
Matt Spraggs
7537a2751d Removed std::string calls from NerscIO map indexing 2015-06-07 17:06:25 +01:00
Matt Spraggs
cff84f09ba Removed std::string calls from NerscIO map indexing 2015-06-07 17:06:25 +01:00
Peter Boyle
a263e78f8d Conjugate residual added 2015-06-05 18:16:25 +01:00
Peter Boyle
50e8b2160e Conjugate residual added 2015-06-05 18:16:25 +01:00
Peter Boyle
1a05882d7c Conjugate residual added 2015-06-05 18:16:25 +01:00
Azusa Yamaguchi
5f33cc3a95 Compile fix 2015-06-05 10:29:42 +01:00
Azusa Yamaguchi
ad18df92d0 Compile fix 2015-06-05 10:29:42 +01:00
Azusa Yamaguchi
351c2905f5 Compile fix 2015-06-05 10:29:42 +01:00
Azusa Yamaguchi
bb36139fc2 Fix 2015-06-05 10:21:28 +01:00
Azusa Yamaguchi
d86c248d05 Fix 2015-06-05 10:21:28 +01:00
Azusa Yamaguchi
33803a3dee Fix 2015-06-05 10:21:28 +01:00
Azusa Yamaguchi
cc5f518b21 Endif terminated 2015-06-05 10:19:42 +01:00
Azusa Yamaguchi
1d7f9567ee Endif terminated 2015-06-05 10:19:42 +01:00
Azusa Yamaguchi
ee3031c914 Endif terminated 2015-06-05 10:19:42 +01:00
Peter Boyle
337b6e83af Rework the linop support to get different forms of red black schur solver
Moo on diag, or MooInv Moe MeeInv Meo
2015-06-05 10:17:10 +01:00
Peter Boyle
f3e60a9feb Rework the linop support to get different forms of red black schur solver
Moo on diag, or MooInv Moe MeeInv Meo
2015-06-05 10:17:10 +01:00
Peter Boyle
7f6304fac3 Rework the linop support to get different forms of red black schur solver
Moo on diag, or MooInv Moe MeeInv Meo
2015-06-05 10:17:10 +01:00
Azusa Yamaguchi
8f9627520b merge to the head 2015-06-05 10:15:31 +01:00
Azusa Yamaguchi
a8b86e747b merge to the head 2015-06-05 10:15:31 +01:00
Azusa Yamaguchi
58a4f32298 merge to the head 2015-06-05 10:15:31 +01:00
Azusa Yamaguchi
db84b19443 Merge branch 'master' of https://github.com/paboyle/Grid 2015-06-05 10:04:46 +01:00
Azusa Yamaguchi
c05fe2706c Merge branch 'master' of https://github.com/paboyle/Grid 2015-06-05 10:04:46 +01:00
Azusa Yamaguchi
ac504bea6c Merge branch 'master' of https://github.com/paboyle/Grid 2015-06-05 10:04:46 +01:00
Azusa Yamaguchi
7d984b9547 Adding some wilson loop support 2015-06-05 10:02:36 +01:00
Azusa Yamaguchi
58cdcbb5e4 Adding some wilson loop support 2015-06-05 10:02:36 +01:00
Azusa Yamaguchi
94ea84d83f Adding some wilson loop support 2015-06-05 10:02:36 +01:00
Peter Boyle
f22170ad49 comment improvement 2015-06-05 05:31:27 +01:00
Peter Boyle
cadd4310f6 comment improvement 2015-06-05 05:31:27 +01:00
Peter Boyle
b1b412f63c comment improvement 2015-06-05 05:31:27 +01:00
Peter Boyle
7678fbd30d PartialFraction Hw with Zolo and Tanh approx converged under CG and passed EO breakdown
and hermiticity tests.
2015-06-04 13:28:37 +01:00
Peter Boyle
b9e9777912 PartialFraction Hw with Zolo and Tanh approx converged under CG and passed EO breakdown
and hermiticity tests.
2015-06-04 13:28:37 +01:00
Peter Boyle
63a61fcc2a PartialFraction Hw with Zolo and Tanh approx converged under CG and passed EO breakdown
and hermiticity tests.
2015-06-04 13:28:37 +01:00
neo
7e47b0c6eb Corrected small compilation bug in traceIndex for iVectors 2015-06-04 19:01:43 +09:00
neo
769b27b7f2 Corrected small compilation bug in traceIndex for iVectors 2015-06-04 19:01:43 +09:00
neo
b306730a57 Corrected small compilation bug in traceIndex for iVectors 2015-06-04 19:01:43 +09:00
neo
41e88c232b Merge remote-tracking branch 'upstream/master' 2015-06-04 18:30:29 +09:00
neo
4dcc5dab93 Merge remote-tracking branch 'upstream/master' 2015-06-04 18:30:29 +09:00
neo
b3f871717f Merge remote-tracking branch 'upstream/master' 2015-06-04 18:30:29 +09:00
neo
949b6a7afa Added support for Ta to Lattice types 2015-06-04 18:29:55 +09:00
neo
7fc54fc904 Added support for Ta to Lattice types 2015-06-04 18:29:55 +09:00
neo
4b114fce3d Added support for Ta to Lattice types 2015-06-04 18:29:55 +09:00
neo
bb73569fd6 Addedd Ta functionality to the tensor types
Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure
2015-06-04 18:11:32 +09:00
neo
b9edadc53e Addedd Ta functionality to the tensor types
Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure
2015-06-04 18:11:32 +09:00
neo
3055d2cf2c Addedd Ta functionality to the tensor types
Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure
2015-06-04 18:11:32 +09:00
Peter Boyle
54c082dc35 Allow traceIndex on a different index to distribute replicated across a vector index 2015-06-04 09:41:16 +01:00
Peter Boyle
201d6d097d Allow traceIndex on a different index to distribute replicated across a vector index 2015-06-04 09:41:16 +01:00
Peter Boyle
4a03054ef4 Allow traceIndex on a different index to distribute replicated across a vector index 2015-06-04 09:41:16 +01:00
neo
c6f2ee91f6 Small modification to the configure files 2015-06-04 14:17:58 +09:00
neo
ff9340d4d5 Small modification to the configure files 2015-06-04 14:17:58 +09:00
neo
5a5ee83d28 Small modification to the configure files 2015-06-04 14:17:58 +09:00
Peter Boyle
9c1ab656d4 CG Tests work for wilson kernel cont frac zolo and tanh 2015-06-04 06:02:00 +01:00
Peter Boyle
37aa74dfd2 CG Tests work for wilson kernel cont frac zolo and tanh 2015-06-04 06:02:00 +01:00
Peter Boyle
dd1f5dd966 CG Tests work for wilson kernel cont frac zolo and tanh 2015-06-04 06:02:00 +01:00
Peter Boyle
1ad689e4d5 Implementing the Hw kernel continued fraction 5d overlap cases 2015-06-04 00:23:16 +01:00
Peter Boyle
c327019574 Implementing the Hw kernel continued fraction 5d overlap cases 2015-06-04 00:23:16 +01:00
Peter Boyle
a088a65656 Implementing the Hw kernel continued fraction 5d overlap cases 2015-06-04 00:23:16 +01:00
Peter Boyle
802e94e9ca First pass at continued fraction; solver and even odd decomposition tests pass.
Have to make ContFrac class virtual and derive end non-abstract actions for the particular
cases.
2015-06-04 00:00:45 +01:00
Peter Boyle
50bd293527 First pass at continued fraction; solver and even odd decomposition tests pass.
Have to make ContFrac class virtual and derive end non-abstract actions for the particular
cases.
2015-06-04 00:00:45 +01:00
Peter Boyle
03f4fde468 First pass at continued fraction; solver and even odd decomposition tests pass.
Have to make ContFrac class virtual and derive end non-abstract actions for the particular
cases.
2015-06-04 00:00:45 +01:00
Peter Boyle
e68d087010 Assist for generating file lists contained in Make.inc files for convenience when things are added 2015-06-03 13:07:00 +01:00
Peter Boyle
eaa3e6aaf6 Assist for generating file lists contained in Make.inc files for convenience when things are added 2015-06-03 13:07:00 +01:00
Peter Boyle
f07a17ba2c Assist for generating file lists contained in Make.inc files for convenience when things are added 2015-06-03 13:07:00 +01:00
Peter Boyle
3254bb2c8e Make.inc needed in repo 2015-06-03 12:49:36 +01:00
Peter Boyle
4ef11d96e9 Make.inc needed in repo 2015-06-03 12:49:36 +01:00
Peter Boyle
3cfea5a09f Make.inc needed in repo 2015-06-03 12:49:36 +01:00
Peter Boyle
f9b070d64d Reorganise of file naming 2015-06-03 12:47:05 +01:00
Peter Boyle
4bcc319e11 Reorganise of file naming 2015-06-03 12:47:05 +01:00
Peter Boyle
1d0df449e8 Reorganise of file naming 2015-06-03 12:47:05 +01:00
Peter Boyle
6cb38dc5dc Overlap Wilson Cayley tanh & zolo 2015-06-03 11:26:54 +01:00
Peter Boyle
8fe3d4f971 Overlap Wilson Cayley tanh & zolo 2015-06-03 11:26:54 +01:00
Peter Boyle
a3b599ae30 Overlap Wilson Cayley tanh & zolo 2015-06-03 11:26:54 +01:00
Peter Boyle
c659c76053 Scaled Shamir and Scaled Shamir Zolotarev aliases for special cases of Mobius. 2015-06-03 09:51:06 +01:00
Peter Boyle
343d039b37 Scaled Shamir and Scaled Shamir Zolotarev aliases for special cases of Mobius. 2015-06-03 09:51:06 +01:00
Peter Boyle
260011670e Scaled Shamir and Scaled Shamir Zolotarev aliases for special cases of Mobius. 2015-06-03 09:51:06 +01:00
Peter Boyle
68e26140ee Mobius Caley form, Mobius Zolotarev operators. Pass Even Odd vs unprec test and hermiticity checks
in tests/Grid_any_evenodd.cc; will work on inversion tests shortly.
2015-06-03 09:36:26 +01:00
Peter Boyle
5916386242 Mobius Caley form, Mobius Zolotarev operators. Pass Even Odd vs unprec test and hermiticity checks
in tests/Grid_any_evenodd.cc; will work on inversion tests shortly.
2015-06-03 09:36:26 +01:00
Peter Boyle
1fcacef239 Mobius Caley form, Mobius Zolotarev operators. Pass Even Odd vs unprec test and hermiticity checks
in tests/Grid_any_evenodd.cc; will work on inversion tests shortly.
2015-06-03 09:36:26 +01:00
Peter Boyle
0bc004de7c Domain wall fermions now invert ; have the basis set up for
Tanh/Zolo * (Cayley/PartFrac/ContFrac) * (Mobius/Shamir/Wilson)
Approx        Representation               Kernel.

All are done with space-time taking part in checkerboarding, Ls uncheckerboarded

Have only so far tested the Domain Wall limit of mobius, and at that only checked
that it
i)  Inverts
ii) 5dim DW == Ls copies of 4dim D2
iii) MeeInv Mee == 1
iv) Meo+Mee+Moe+Moo == M unprec.
v) MpcDagMpc is hermitan
vi) Mdag is the adjoint of M between stochastic vectors.

That said, the RB schur solve, RB MpcDagMpc solve, Unprec solve
all converge and the true residual becomes small; so pretty good tests.
2015-06-02 16:57:12 +01:00
Peter Boyle
2583570e17 Domain wall fermions now invert ; have the basis set up for
Tanh/Zolo * (Cayley/PartFrac/ContFrac) * (Mobius/Shamir/Wilson)
Approx        Representation               Kernel.

All are done with space-time taking part in checkerboarding, Ls uncheckerboarded

Have only so far tested the Domain Wall limit of mobius, and at that only checked
that it
i)  Inverts
ii) 5dim DW == Ls copies of 4dim D2
iii) MeeInv Mee == 1
iv) Meo+Mee+Moe+Moo == M unprec.
v) MpcDagMpc is hermitan
vi) Mdag is the adjoint of M between stochastic vectors.

That said, the RB schur solve, RB MpcDagMpc solve, Unprec solve
all converge and the true residual becomes small; so pretty good tests.
2015-06-02 16:57:12 +01:00
Peter Boyle
3845f267cb Domain wall fermions now invert ; have the basis set up for
Tanh/Zolo * (Cayley/PartFrac/ContFrac) * (Mobius/Shamir/Wilson)
Approx        Representation               Kernel.

All are done with space-time taking part in checkerboarding, Ls uncheckerboarded

Have only so far tested the Domain Wall limit of mobius, and at that only checked
that it
i)  Inverts
ii) 5dim DW == Ls copies of 4dim D2
iii) MeeInv Mee == 1
iv) Meo+Mee+Moe+Moo == M unprec.
v) MpcDagMpc is hermitan
vi) Mdag is the adjoint of M between stochastic vectors.

That said, the RB schur solve, RB MpcDagMpc solve, Unprec solve
all converge and the true residual becomes small; so pretty good tests.
2015-06-02 16:57:12 +01:00
Azusa Yamaguchi
8f87950dc1 FIx miistake 2015-06-01 12:26:20 +01:00
Azusa Yamaguchi
8bd9fb4427 FIx miistake 2015-06-01 12:26:20 +01:00
Azusa Yamaguchi
c851d0e705 FIx miistake 2015-06-01 12:26:20 +01:00
Azusa Yamaguchi
00bf7f4d42 Const safety 2015-06-01 12:25:59 +01:00
Azusa Yamaguchi
4c617c3643 Const safety 2015-06-01 12:25:59 +01:00
Azusa Yamaguchi
b00a40dd65 Const safety 2015-06-01 12:25:59 +01:00
Azusa Yamaguchi
eb28a64c3c No compile fix on mpi target 2015-05-31 22:50:03 +01:00
Azusa Yamaguchi
9ea64767b0 No compile fix on mpi target 2015-05-31 22:50:03 +01:00
Azusa Yamaguchi
12c2562b96 No compile fix on mpi target 2015-05-31 22:50:03 +01:00
azusayamaguchi
328aa9ae49 Bug in Makefile.am fixed 2015-05-31 18:50:08 +01:00
azusayamaguchi
ce8c7a77b6 Bug in Makefile.am fixed 2015-05-31 18:50:08 +01:00
azusayamaguchi
f2c70804ca Bug in Makefile.am fixed 2015-05-31 18:50:08 +01:00
Peter Boyle
66d997e031 Large scale change to support 5d fermion formulations.
Have 5d replicated wilson with 4d gauge working and matrix regressing
to Ls copies of wilson.
2015-05-31 15:09:02 +01:00
Peter Boyle
a75b6f6e78 Large scale change to support 5d fermion formulations.
Have 5d replicated wilson with 4d gauge working and matrix regressing
to Ls copies of wilson.
2015-05-31 15:09:02 +01:00
Peter Boyle
5644ab1e19 Large scale change to support 5d fermion formulations.
Have 5d replicated wilson with 4d gauge working and matrix regressing
to Ls copies of wilson.
2015-05-31 15:09:02 +01:00
neo
661c7e3e37 Merge remote-tracking branch 'upstream/master' 2015-05-29 11:41:39 +09:00
neo
575e6001f3 Merge remote-tracking branch 'upstream/master' 2015-05-29 11:41:39 +09:00
neo
727bc32150 Merge remote-tracking branch 'upstream/master' 2015-05-29 11:41:39 +09:00