From 35103df86b04c8fb8c95c4e2c2b393da05be27c3 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 23 Nov 2023 14:25:05 -0500 Subject: [PATCH] make compatible with Kokkos 3.7 --- src/KOKKOS/kokkos.cpp | 5 +++-- src/info.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp index 57530cc5e7..c963cd52d0 100644 --- a/src/KOKKOS/kokkos.cpp +++ b/src/KOKKOS/kokkos.cpp @@ -68,8 +68,9 @@ KokkosLMP::KokkosLMP(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp) int me = 0; MPI_Comm_rank(world,&me); - if (me == 0) error->message(FLERR,"KOKKOS mode with Kokkos version {}.{}.{} is enabled", - KOKKOS_VERSION_MAJOR, KOKKOS_VERSION_MINOR, KOKKOS_VERSION_PATCH); + if (me == 0) + error->message(FLERR,"KOKKOS mode with Kokkos version {}.{}.{} is enabled", + KOKKOS_VERSION / 10000, (KOKKOS_VERSION % 10000) / 100, KOKKOS_VERSION % 100); // process any command-line args that invoke Kokkos settings diff --git a/src/info.cpp b/src/info.cpp index f7b347e883..ec04a6c46c 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -1226,8 +1226,8 @@ std::string Info::get_accelerator_info(const std::string &package) if (has_accelerator_feature("KOKKOS","precision","mixed")) mesg += " mixed"; if (has_accelerator_feature("KOKKOS","precision","double")) mesg += " double"; #if LMP_KOKKOS - mesg += "\nKokkos library version: " + std::to_string(KOKKOS_VERSION_MAJOR) + "." - + std::to_string(KOKKOS_VERSION_MINOR) + "." + std::to_string(KOKKOS_VERSION_PATCH); + mesg += fmt::format("\nKokkos library version: {}.{}.{}", KOKKOS_VERSION / 10000, + (KOKKOS_VERSION % 10000) / 100, KOKKOS_VERSION % 100); #endif mesg += "\n"; }