portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Improviements for NVCC. Eigen is not compat with CUDA 9 and must hack to disable device

Browse Source 
compilation
This commit is contained in:
paboyle 2018-01-24 13:25:07 +00:00
parent 7331ee2d80
commit 69327db9a9
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/GridCore.h
View File

@ -38,16 +38,17 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
#ifndef GRID_BASE_H #ifndef GRID_BASE_H
#define GRID_BASE_H #define GRID_BASE_H
#include <Grid/DisableWarnings.h>
#include <Grid/Namespace.h> #include <Grid/Namespace.h>
#include <Grid/GridStd.h> #include <Grid/GridStd.h>
#include <Grid/threads/Pragmas.h>
#include <Grid/perfmon/Timer.h> #include <Grid/perfmon/Timer.h>
#include <Grid/perfmon/PerfCount.h> #include <Grid/perfmon/PerfCount.h>
#include <Grid/log/Log.h> #include <Grid/log/Log.h>
#include <Grid/allocator/AlignedAllocator.h> #include <Grid/allocator/AlignedAllocator.h>
#include <Grid/simd/Simd.h> #include <Grid/simd/Simd.h>
#include <Grid/serialisation/Serialisation.h>
#include <Grid/threads/Threads.h> #include <Grid/threads/Threads.h>
#include <Grid/serialisation/Serialisation.h>
#include <Grid/util/Util.h> #include <Grid/util/Util.h>
#include <Grid/communicator/Communicator.h> #include <Grid/communicator/Communicator.h>
#include <Grid/cartesian/Cartesian.h> #include <Grid/cartesian/Cartesian.h>

18
lib/Grid_Eigen_Dense.h
View File

@ -1,9 +1,27 @@
#include <Grid/GridCore.h>
#pragma once #pragma once
#if defined __GNUC__ #if defined __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
#ifdef GRID_NVCC
#pragma push
#pragma diag_suppress code_is_unreachable
#undef __NVCC__
#undef __CUDACC__
#undef __CUDA_ARCH__
#endif
#include <Grid/Eigen/Dense> #include <Grid/Eigen/Dense>
#ifdef GRID_NVCC
#pragma pop
#define __NVCC__
#define __CUDACC__
#define __CUDA_ARCH__
#endif
#if defined __GNUC__ #if defined __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif