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

Merge topic 'update-cuda9-workaround'

Browse Source 
730fa439 Update cuda 9 workaround for cuda 9 final release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !966
This commit is contained in:
Sujin Philip 2017-10-10 18:00:56 +00:00 committed by Kitware Robot
commit a482ace3c6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vtkm/internal/brigand.hpp
View File

@ -27,8 +27,8 @@
#endif
#endif
#if defined(__CUDACC__)
#if (__CUDACC_VER_MAJOR__ == 9 && __CUDACC_VER_MINOR__ == 0 && __CUDACC_VER_BUILD__ <= 102)
#define BRIGAND_COMP_CUDA_9_RC
#if __CUDACC_VER_MAJOR__ == 9
#define BRIGAND_COMP_CUDA_9
#endif
#define BRIGAND_COMP_CUDA
#endif
@ -250,7 +250,7 @@ namespace brigand
template<class T> T extract_type(type_<T>*);
template<std::size_t N, typename Seq> struct at_impl;
#if defined(BRIGAND_COMP_CUDA_9_RC)
#if defined(BRIGAND_COMP_CUDA_9)
//Only needed for CUDA 9 RC1 as it has some compiler bugs
template <std::size_t N, template <typename...> class L, class... Ts>
struct at_impl<N, L<Ts...>>
@ -493,7 +493,7 @@ namespace lazy
using type = ::brigand::size_t<0>;
};
#if defined(BRIGAND_COMP_CUDA_9_RC)
#if defined(BRIGAND_COMP_CUDA_9)
//This was added for CUDA 9 RC1 and most likely will need CUDA
//version guards
template<class P, class T>
@ -1571,7 +1571,7 @@ namespace detail
namespace brigand
{
#if (defined(BRIGAND_COMP_GCC) || defined(BRIGAND_COMP_CLANG)) && !defined(BRIGAND_COMP_CUDA_9_RC)
#if (defined(BRIGAND_COMP_GCC) || defined(BRIGAND_COMP_CLANG)) && !defined(BRIGAND_COMP_CUDA_9)
namespace lazy
{
template <typename L, typename Pred>