From 261eb725d6ee10b58c43cf23a2d4db2be9336da4 Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Tue, 3 Sep 2024 15:56:57 -0600 Subject: [PATCH] Fix non-Kokkos build --- src/accelerator_kokkos.h | 24 ++++++++++++++++-------- src/input.cpp | 1 - 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/accelerator_kokkos.h b/src/accelerator_kokkos.h index 4ca25dbe2d..85ae056c9a 100644 --- a/src/accelerator_kokkos.h +++ b/src/accelerator_kokkos.h @@ -19,14 +19,15 @@ #ifdef LMP_KOKKOS -#include "atom_kokkos.h" // IWYU pragma: export -#include "comm_brick_kokkos.h" // IWYU pragma: export -#include "comm_tiled_kokkos.h" // IWYU pragma: export -#include "domain_kokkos.h" // IWYU pragma: export -#include "kokkos.h" // IWYU pragma: export -#include "memory_kokkos.h" // IWYU pragma: export -#include "modify_kokkos.h" // IWYU pragma: export -#include "neighbor_kokkos.h" // IWYU pragma: export +#include "atom_kokkos.h" // IWYU pragma: export +#include "comm_brick_kokkos.h" // IWYU pragma: export +#include "comm_brick_direct_kokkos.h" // IWYU pragma: export +#include "comm_tiled_kokkos.h" // IWYU pragma: export +#include "domain_kokkos.h" // IWYU pragma: export +#include "kokkos.h" // IWYU pragma: export +#include "memory_kokkos.h" // IWYU pragma: export +#include "modify_kokkos.h" // IWYU pragma: export +#include "neighbor_kokkos.h" // IWYU pragma: export #define LAMMPS_INLINE KOKKOS_INLINE_FUNCTION @@ -37,6 +38,7 @@ #include "atom.h" #include "comm_brick.h" +#include "comm_brick_direct.h" #include "comm_tiled.h" #include "domain.h" #include "memory.h" @@ -74,6 +76,12 @@ class CommBrickKokkos : public CommBrick { CommBrickKokkos(class LAMMPS *lmp) : CommBrick(lmp) {} }; +class CommBrickDirectKokkos : public CommBrickDirect { + public: + CommBrickDirectKokkos(class LAMMPS *lmp) : CommBrickDirect(lmp) {} + CommBrickDirectKokkos(class LAMMPS *lmp, Comm *oldcomm) : CommBrickDirect(lmp, oldcomm) {} +}; + class CommTiledKokkos : public CommTiled { public: CommTiledKokkos(class LAMMPS *lmp) : CommTiled(lmp) {} diff --git a/src/input.cpp b/src/input.cpp index 03e852aea7..10f4c6df7f 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -22,7 +22,6 @@ #include "comm.h" #include "comm_brick.h" #include "comm_brick_direct.h" -#include "comm_brick_direct_kokkos.h" #include "comm_tiled.h" #include "command.h" #include "compute.h"