From 0d157b97f5601b985e814f5f55ecdf0826b772ce Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Sun, 24 Jun 2018 22:41:34 +0200 Subject: [PATCH] Disabled use of Kokkos deprecated code --- CMakeLists.txt | 3 +++ src/mesh/ConnectivityUtils.hpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2acb5ab54..dab2afb9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,9 @@ endif() # do not build ETI by default set(KOKKOS_ENABLE_EXPLICIT_INSTANTIATION OFF CACHE BOOL "") +# do not use Kokkos deprecated code +set(KOKKOS_ENABLE_DEPRECATED_CODE OFF CACHE BOOL "") + # Kokkso compiler flags add_subdirectory(${PASTIS_SOURCE_DIR}/packages/kokkos) include_directories(${Kokkos_INCLUDE_DIRS_RET}) diff --git a/src/mesh/ConnectivityUtils.hpp b/src/mesh/ConnectivityUtils.hpp index 641ea8356..8b74b23a4 100644 --- a/src/mesh/ConnectivityUtils.hpp +++ b/src/mesh/ConnectivityUtils.hpp @@ -21,7 +21,7 @@ public: Kokkos::parallel_reduce(number_of_cells, KOKKOS_LAMBDA(const int& j, size_t& nb_max) { const size_t n = cell_nb_nodes[j]; if (n > nb_max) nb_max = n; - }, Max<size_t>(max_nb_node_per_cell)); + }, Kokkos::Max<size_t>(max_nb_node_per_cell)); for (unsigned int j=0; j<number_of_cells; ++j) { for (unsigned int r=0; r<cell_nb_nodes[j]; ++r) { -- GitLab