mirror of
https://github.com/paboyle/Grid.git
synced 2025-04-05 11:45:56 +01:00
Merge branch 'master' into hadrons
This commit is contained in:
commit
f2c59c8730
@ -39,8 +39,13 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
|
||||
#ifdef HAVE_MM_MALLOC_H
|
||||
#include <mm_malloc.h>
|
||||
#endif
|
||||
|
||||
#ifdef GRID_COMMS_SHMEM
|
||||
extern "C" {
|
||||
#include <mpp/shmem.h>
|
||||
extern void * shmem_align(size_t, size_t);
|
||||
extern void shmem_free(void *);
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace Grid {
|
||||
|
@ -45,9 +45,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
|
||||
#define __X86_64
|
||||
|
||||
|
||||
namespace Grid {
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
|
11
lib/Log.cc
11
lib/Log.cc
@ -43,7 +43,9 @@ std::string Logger::PURPLE("\033[35m");
|
||||
std::string Logger::CYAN("\033[36m");
|
||||
std::string Logger::WHITE("\033[37m");
|
||||
std::string Logger::NORMAL("\033[0;39m");
|
||||
std::string EMPTY("");
|
||||
|
||||
#if 0
|
||||
GridLogger GridLogError (1,"Error",Logger::RED);
|
||||
GridLogger GridLogWarning (1,"Warning",Logger::YELLOW);
|
||||
GridLogger GridLogMessage (1,"Message",Logger::BLACK);
|
||||
@ -51,6 +53,15 @@ std::string Logger::NORMAL("\033[0;39m");
|
||||
GridLogger GridLogPerformance(1,"Performance",Logger::GREEN);
|
||||
GridLogger GridLogIterative (1,"Iterative",Logger::BLUE);
|
||||
GridLogger GridLogIntegrator (1,"Integrator",Logger::BLUE);
|
||||
#else
|
||||
GridLogger GridLogError (1,"Error",EMPTY);
|
||||
GridLogger GridLogWarning (1,"Warning",EMPTY);
|
||||
GridLogger GridLogMessage (1,"Message",EMPTY);
|
||||
GridLogger GridLogDebug (1,"Debug",EMPTY);
|
||||
GridLogger GridLogPerformance(1,"Performance",EMPTY);
|
||||
GridLogger GridLogIterative (1,"Iterative",EMPTY);
|
||||
GridLogger GridLogIntegrator (1,"Integrator",EMPTY);
|
||||
#endif
|
||||
|
||||
void GridLogConfigure(std::vector<std::string> &logstreams)
|
||||
{
|
||||
|
@ -71,7 +71,8 @@ public:
|
||||
StopWatch.Start();
|
||||
stream << BLACK<< log.topName << BLACK<< " : ";
|
||||
stream << log.COLOUR <<std::setw(10) << std::left << log.name << BLACK << " : ";
|
||||
stream << YELLOW<< now <<BLACK << " : " << log.COLOUR;
|
||||
// stream << YELLOW<< now <<BLACK << " : " ;
|
||||
stream << log.COLOUR;
|
||||
return stream;
|
||||
} else {
|
||||
return devnull;
|
||||
|
@ -101,8 +101,8 @@ public:
|
||||
MatrixTimer.Stop();
|
||||
|
||||
LinalgTimer.Start();
|
||||
RealD qqck = norm2(mmp);
|
||||
ComplexD dck = innerProduct(p,mmp);
|
||||
// RealD qqck = norm2(mmp);
|
||||
// ComplexD dck = innerProduct(p,mmp);
|
||||
|
||||
a = c/d;
|
||||
b_pred = a*(a*qq-d)/c;
|
||||
|
@ -305,8 +305,8 @@ void WilsonFermion5D<Impl>::DhopInternalCommsThenCompute(StencilImpl & st, Lebes
|
||||
int nwork = U._grid->oSites();
|
||||
|
||||
commtime -=usecond();
|
||||
auto handle = st.HaloExchangeOptBegin(in,compressor);
|
||||
st.HaloExchangeOptComplete(handle);
|
||||
auto handle = st.HaloExchangeBegin(in,compressor);
|
||||
st.HaloExchangeComplete(handle);
|
||||
commtime +=usecond();
|
||||
|
||||
jointime -=usecond();
|
||||
|
Loading…
x
Reference in New Issue
Block a user