Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix brigand for CUDA 10.2.

Browse Source 
There were issues with brigand::all's implementation with the new
cuda compiler.
This commit is contained in:
Allison Vacanti 2019-12-06 12:54:01 -05:00
parent 84eedc8855
commit 6d4e37e95c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/internal/brigand.hpp
View File

@ -34,6 +34,10 @@
#define BRIGAND_COMP_CUDA_9PLUS
#endif
#if __CUDACC_VER_MAJOR__ > 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ >= 2)
#define BRIGAND_COMP_CUDA_10_2PLUS
#endif
#define BRIGAND_COMP_CUDA
#endif
@ -910,7 +914,7 @@ namespace detail
#include <initializer_list>
namespace brigand
{
#if defined(BRIGAND_COMP_CUDA) || defined(BRIGAND_COMP_INTEL)
#if (defined(BRIGAND_COMP_CUDA) && !defined(BRIGAND_COMP_CUDA_10_2PLUS)) || defined(BRIGAND_COMP_INTEL)
namespace detail
{
template<class P, class T>