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 'fix-compile_fix_for_sycl-release' into release-2.0

Browse Source 
36912c16d kokkos: disable volatile when kokkos >= 3.7

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

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

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