portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Compile through nvcc ; warning elimination fixes

Browse Source
This commit is contained in:
paboyle 2018-01-24 13:09:53 +00:00
parent 4e30739093
commit 9d08aebea9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/util/Init.cc
View File

@ -57,8 +57,9 @@ static int
feenableexcept (unsigned int excepts) feenableexcept (unsigned int excepts)
{ {
static fenv_t fenv; static fenv_t fenv;
unsigned int new_excepts = excepts & FE_ALL_EXCEPT, unsigned int new_excepts = excepts & FE_ALL_EXCEPT;
old_excepts; // previous masks unsigned int old_excepts; // previous masks
int iold_excepts; // previous masks
if ( fegetenv (&fenv) ) return -1; if ( fegetenv (&fenv) ) return -1;
old_excepts = fenv.__control & FE_ALL_EXCEPT; old_excepts = fenv.__control & FE_ALL_EXCEPT;
@ -67,7 +68,8 @@ feenableexcept (unsigned int excepts)
fenv.__control &= ~new_excepts; fenv.__control &= ~new_excepts;
fenv.__mxcsr &= ~(new_excepts << 7); fenv.__mxcsr &= ~(new_excepts << 7);
return ( fesetenv (&fenv) ? -1 : old_excepts ); iold_excepts = (int) old_excepts;
return ( fesetenv (&fenv) ? -1 : iold_excepts );
} }
#endif #endif
@ -202,11 +204,13 @@ std::string GridCmdVectorIntToString(const std::vector<int> & vec){
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
// Reinit guard // Reinit guard
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
static int Grid_is_initialised = 0;
static MemoryStats dbgMemStats; static MemoryStats dbgMemStats;
static int Grid_is_initialised;
void Grid_init(int *argc,char ***argv) void Grid_init(int *argc,char ***argv)
{ {
assert(Grid_is_initialised == 0);
GridLogger::GlobalStopWatch.Start(); GridLogger::GlobalStopWatch.Start();
std::string arg; std::string arg;
@ -411,8 +415,6 @@ void Grid_init(int *argc,char ***argv)
std::cout<<GridLogMessage<<"\tvComplexF : "<<sizeof(vComplexF)*8 <<"bits ; " <<GridCmdVectorIntToString(GridDefaultSimd(4,vComplexF::Nsimd()))<<std::endl; std::cout<<GridLogMessage<<"\tvComplexF : "<<sizeof(vComplexF)*8 <<"bits ; " <<GridCmdVectorIntToString(GridDefaultSimd(4,vComplexF::Nsimd()))<<std::endl;
std::cout<<GridLogMessage<<"\tvComplexD : "<<sizeof(vComplexD)*8 <<"bits ; " <<GridCmdVectorIntToString(GridDefaultSimd(4,vComplexD::Nsimd()))<<std::endl; std::cout<<GridLogMessage<<"\tvComplexD : "<<sizeof(vComplexD)*8 <<"bits ; " <<GridCmdVectorIntToString(GridDefaultSimd(4,vComplexD::Nsimd()))<<std::endl;
} }
Grid_is_initialised = 1; Grid_is_initialised = 1;
} }
@ -426,6 +428,7 @@ void Grid_finalize(void)
#if defined (GRID_COMMS_SHMEM) #if defined (GRID_COMMS_SHMEM)
shmem_finalize(); shmem_finalize();
#endif #endif
Grid_is_initialised = 0;
} }
void GridLogLayout() { void GridLogLayout() {
@ -482,7 +485,7 @@ void Grid_sa_signal_handler(int sig,siginfo_t *si,void * ptr)
void Grid_debug_handler_init(void) void Grid_debug_handler_init(void)
{ {
struct sigaction sa,osa; struct sigaction sa;
sigemptyset (&sa.sa_mask); sigemptyset (&sa.sa_mask);
sa.sa_sigaction= Grid_sa_signal_handler; sa.sa_sigaction= Grid_sa_signal_handler;
sa.sa_flags = SA_SIGINFO; sa.sa_flags = SA_SIGINFO;