Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ KOKKOS_CMAKEFLAGS := -DCMAKE_INSTALL_PREFIX=$(KOKKOS_INSTALL) \
-DKokkos_CXX_STANDARD=14 \
-DKokkos_ENABLE_SERIAL=On \
-DKokkos_ENABLE_LIBDL=On \
-DKokkos_ENABLE_PROFILING_LOAD_PRINT=On \
-DKokkos_ENABLE_IMPL_DESUL_ATOMICS=Off
-DKokkos_ENABLE_PROFILING_LOAD_PRINT=On
KOKKOS_IS_SHARED :=
ifndef KOKKOS_DEVICE_PARALLEL
KOKKOS_CMAKEFLAGS += -DCMAKE_CXX_COMPILER=g++
Expand Down
5 changes: 4 additions & 1 deletion src/kokkos/KokkosCore/AtomicPairCounter.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ namespace cms {
namespace kokkos {
class AtomicPairCounter {
public:
using c_type = unsigned long long int;
// unsigned long long caused performance issue with Desul atomics in Kokkos 3.5
//using c_type = unsigned long long int;
using c_type = unsigned long int;
static_assert(sizeof(unsigned long int) == sizeof(unsigned long long int));

KOKKOS_INLINE_FUNCTION AtomicPairCounter() { counter.ac = 0; }
KOKKOS_INLINE_FUNCTION AtomicPairCounter(c_type i) { counter.ac = i; }
Expand Down