From c6968818365d2c6750b15b1f2c24b522dd68a531 Mon Sep 17 00:00:00 2001 From: stamoor <stamoor@f3b2605a-c512-4ea7-a41b-209d697bcdaa> Date: Tue, 3 May 2016 16:23:57 +0000 Subject: [PATCH] Enabling new kokkos view git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14934 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/KOKKOS/kokkos_type.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/KOKKOS/kokkos_type.h b/src/KOKKOS/kokkos_type.h index 6d8e822634..97f63d31bd 100644 --- a/src/KOKKOS/kokkos_type.h +++ b/src/KOKKOS/kokkos_type.h @@ -745,8 +745,8 @@ template<class ViewType> void memset_kokkos (ViewType &view) { static MemsetZeroFunctor<typename ViewType::execution_space> f; f.ptr = view.ptr_on_device(); - #ifdef KOKKOS_USING_EXPERIMENTAL_VIEW - Kokkos::parallel_for(view.memory_span()/4, f); + #ifndef KOKKOS_USING_DEPRECATED_VIEW + Kokkos::parallel_for(view.span()*sizeof(typename ViewType::value_type)/4, f); #else Kokkos::parallel_for(view.capacity()*sizeof(typename ViewType::value_type)/4, f); #endif -- GitLab