From f4b2d4645b9d0f049d2278f26dd76b1ac4c0262e Mon Sep 17 00:00:00 2001 From: Geoffroy Lesur Date: Wed, 4 Dec 2024 15:02:21 +0100 Subject: [PATCH 1/2] bump up to kokkos4.5 --- src/kokkos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kokkos b/src/kokkos index 15dc143e..09e775bf 160000 --- a/src/kokkos +++ b/src/kokkos @@ -1 +1 @@ -Subproject commit 15dc143e5f39949eece972a798e175c4b463d4b8 +Subproject commit 09e775bfc585840bb9ab1156cbd8d7d1c9e0cc6d From 1453cca029725d1d6e8ac9105ee9a184b96f05a6 Mon Sep 17 00:00:00 2001 From: Geoffroy Lesur Date: Mon, 16 Dec 2024 08:45:38 +0100 Subject: [PATCH 2/2] remove force disable cuda malloc async following update to 4.5 https://kokkos.org/kokkos-core-wiki/known-issues.html#cuda --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8df0de73..8b503fad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,8 @@ include(SetRequiredBuildSettingsForGCC8) #Idefix requires Cuda Lambdas (experimental) if(Kokkos_ENABLE_CUDA) set(Kokkos_ENABLE_CUDA_LAMBDA ON CACHE BOOL "Idefix requires lambdas on Cuda" FORCE) - set(Kokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC OFF CACHE BOOL "Disable Async malloc to avoid bugs on PSM2" FORCE) + # CUDA_MALLOC_ASYNC disbaled by default in Kokkos 4.5, so not required here + #set(Kokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC OFF CACHE BOOL "Disable Async malloc to avoid bugs on PSM2" FORCE) endif() # Add kokkos CMAKE files (required early since these set compiler options)