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

kokkos: disable volatile when kokkos >= 3.7

Browse Source 
(cherry picked from commit c32e67aa6d394c2267f95bb1306fe705b12bfc13)
This commit is contained in:
Vicente Adolfo Bolea Sanchez 2023-02-16 15:25:56 -05:00
parent da65e0bcef
commit 6bfb0cedc5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vtkm/cont/kokkos/internal/DeviceAdapterAlgorithmKokkos.h
View File

@ -32,6 +32,12 @@ VTKM_THIRDPARTY_POST_INCLUDE
#include <type_traits>
#ifdef KOKKOS_VERSION_MAJOR> 3 || (KOKKOS_VERSION_MAJOR == 3 && KOKKOS_VERSION_MINOR >= 7)
#define __MAYBE_VOLATILE
#else
#define __MAYBE_VOLATILE volatile
#endif
namespace vtkm
{
namespace internal
@ -256,7 +262,10 @@ private:
}
KOKKOS_INLINE_FUNCTION
void join(value_type& dst, const value_type& src) const { dst = this->Operator(dst, src); }
void join(__MAYBE_VOLATILE value_type& dst, const __MAYBE_VOLATILE value_type& src) const
{
dst = this->Operator(dst, src);
}
KOKKOS_INLINE_FUNCTION
void init(value_type& dst) const
@ -784,4 +793,6 @@ public:
}
} // namespace vtkm::cont
#undef __MAYBE_VOLATILE
#endif //vtk_m_cont_kokkos_internal_DeviceAdapterAlgorithmKokkos_h