1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-15 06:17:05 +01:00

update merge

This commit is contained in:
Azusa Yamaguchi
2015-11-26 09:51:41 +00:00
parent d43034d3ac
commit 967be91692
5 changed files with 8062 additions and 5 deletions

View File

@ -47,6 +47,9 @@
/* Define to 1 if you have the <endian.h> header file. */
#undef HAVE_ENDIAN_H
/* Define to 1 if you have the <execinfo.h> header file. */
#undef HAVE_EXECINFO_H
/* Support FMA3 (Fused Multiply-Add) instructions */
#undef HAVE_FMA

View File

@ -6,7 +6,7 @@
#include <chrono>
#include <string.h>
#include <sys/ioctl.h>
#include <syscall.h>
#include <sys/syscall.h>
#include <linux/perf_event.h>
namespace Grid {

View File

@ -33,7 +33,8 @@ namespace Grid {
std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> > &buf,
int sF,int sU,const FermionField &in, FermionField &out,uint64_t *);
#else
void DiracOptAsmDhopSite(CartesianStencil &st,DoubledGaugeField &U,
//void DiracOptAsmDhopSite(CartesianStencil &st,DoubledGaugeField &U,
void DiracOptAsmDhopSite(StencilImpl &st,DoubledGaugeField &U,
std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> > &buf,
int sF,int sU,const FermionField &in, FermionField &out,uint64_t *p){
DiracOptDhopSite(st,U,buf,sF,sU,in,out); // will template override for Wilson Nc=3