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

Merge topic 'fix-compile_fix_for_sycl'

Browse Source 
2ac236fe2 kokkos: disable volatile when kokkos >= 3.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2991
This commit is contained in:
Vicente Bolea 2023-02-18 23:35:34 +00:00 committed by Kitware Robot
commit cf3c9bc921
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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