From 60b48c9d661f547b6f24f4e6caf42b25c2ddb70d Mon Sep 17 00:00:00 2001 From: Dan Ibanez <daibane@sandia.gov> Date: Wed, 25 Jan 2017 15:36:24 -0700 Subject: [PATCH] add missing KOKKOS_INLINE_FUNCTION attributes this structure gets put inside a DualView, so these members need to be able to execute on the GPU --- src/KOKKOS/pair_buck_coul_cut_kokkos.h | 2 ++ src/KOKKOS/pair_buck_coul_long_kokkos.h | 2 ++ src/KOKKOS/pair_buck_kokkos.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/KOKKOS/pair_buck_coul_cut_kokkos.h b/src/KOKKOS/pair_buck_coul_cut_kokkos.h index 8bccabf8de..0b6aba5e92 100644 --- a/src/KOKKOS/pair_buck_coul_cut_kokkos.h +++ b/src/KOKKOS/pair_buck_coul_cut_kokkos.h @@ -44,7 +44,9 @@ class PairBuckCoulCutKokkos : public PairBuckCoulCut { double init_one(int, int); struct params_buck_coul{ + KOKKOS_INLINE_FUNCTION params_buck_coul(){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;}; + KOKKOS_INLINE_FUNCTION params_buck_coul(int i){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;}; F_FLOAT cut_ljsq,cut_coulsq,a,c,rhoinv,buck1,buck2,offset; }; diff --git a/src/KOKKOS/pair_buck_coul_long_kokkos.h b/src/KOKKOS/pair_buck_coul_long_kokkos.h index c4af7e19f3..fe63a2c124 100644 --- a/src/KOKKOS/pair_buck_coul_long_kokkos.h +++ b/src/KOKKOS/pair_buck_coul_long_kokkos.h @@ -45,7 +45,9 @@ class PairBuckCoulLongKokkos : public PairBuckCoulLong { double init_one(int, int); struct params_buck_coul{ + KOKKOS_INLINE_FUNCTION params_buck_coul(){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;}; + KOKKOS_INLINE_FUNCTION params_buck_coul(int i){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;}; F_FLOAT cut_ljsq,cut_coulsq,a,c,rhoinv,buck1,buck2,offset; }; diff --git a/src/KOKKOS/pair_buck_kokkos.h b/src/KOKKOS/pair_buck_kokkos.h index 6b6e6f793e..0b0bbf94cf 100644 --- a/src/KOKKOS/pair_buck_kokkos.h +++ b/src/KOKKOS/pair_buck_kokkos.h @@ -43,7 +43,9 @@ class PairBuckKokkos : public PairBuck { double init_one(int, int); struct params_buck{ + KOKKOS_INLINE_FUNCTION params_buck(){cutsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;}; + KOKKOS_INLINE_FUNCTION params_buck(int i){cutsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;}; F_FLOAT cutsq,a,c,rhoinv,buck1,buck2,offset; }; -- GitLab