mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
Merge topic 'fix-compile_fix_for_sycl'
2ac236fe2 kokkos: disable volatile when kokkos >= 3.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2991
This commit is contained in:
commit
cf3c9bc921
@ -32,6 +32,13 @@ VTKM_THIRDPARTY_POST_INCLUDE
|
|||||||
|
|
||||||
#include <type_traits>
|
#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 vtkm
|
||||||
{
|
{
|
||||||
namespace internal
|
namespace internal
|
||||||
@ -256,7 +263,10 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
KOKKOS_INLINE_FUNCTION
|
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
|
KOKKOS_INLINE_FUNCTION
|
||||||
void init(value_type& dst) const
|
void init(value_type& dst) const
|
||||||
@ -791,4 +801,6 @@ public:
|
|||||||
}
|
}
|
||||||
} // namespace vtkm::cont
|
} // namespace vtkm::cont
|
||||||
|
|
||||||
|
#undef VTKM_VOLATILE
|
||||||
|
|
||||||
#endif //vtk_m_cont_kokkos_internal_DeviceAdapterAlgorithmKokkos_h
|
#endif //vtk_m_cont_kokkos_internal_DeviceAdapterAlgorithmKokkos_h
|
||||||
|
Loading…
Reference in New Issue
Block a user