From 72cda4c993d4775aceffc26cb2b9d75f1dfd8321 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Sat, 13 Jul 2024 13:58:20 -0700 Subject: [PATCH 1/3] update LC tpl path --- host-configs/LLNL/llnl-tpls-base.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host-configs/LLNL/llnl-tpls-base.cmake b/host-configs/LLNL/llnl-tpls-base.cmake index 398e71f5..3d85ceec 100644 --- a/host-configs/LLNL/llnl-tpls-base.cmake +++ b/host-configs/LLNL/llnl-tpls-base.cmake @@ -1,2 +1,2 @@ set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "") -set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-11/install-${CONFIG_NAME}-release CACHE PATH "") +set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-13/install-${CONFIG_NAME}-release CACHE PATH "") From 85016baae59d4b2535793f1510def2a6e6e83770 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Sat, 13 Jul 2024 18:29:57 -0700 Subject: [PATCH 2/3] change in raja interface --- unitTests/testUtils.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unitTests/testUtils.hpp b/unitTests/testUtils.hpp index 4b4566af..208552e8 100644 --- a/unitTests/testUtils.hpp +++ b/unitTests/testUtils.hpp @@ -66,8 +66,8 @@ template< unsigned long THREADS_PER_BLOCK > using parallelDevicePolicy = RAJA::cuda_exec< THREADS_PER_BLOCK >; -template< typename X, typename Y, size_t BLOCK_SIZE, bool ASYNC > -struct RAJAHelper< RAJA::policy::cuda::cuda_exec_explicit< X, Y, BLOCK_SIZE, ASYNC > > +template< typename X, typename Y, typename C, size_t BLOCK_SIZE, bool ASYNC > +struct RAJAHelper< RAJA::policy::cuda::cuda_exec_explicit< X, Y, C, BLOCK_SIZE, ASYNC > > { using ReducePolicy = RAJA::cuda_reduce; using AtomicPolicy = RAJA::cuda_atomic; From 4e552ad4662fd4a213203211b57944e8cd613467 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Tue, 16 Jul 2024 22:53:05 -0700 Subject: [PATCH 3/3] update LC path --- host-configs/LLNL/llnl-tpls-base.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host-configs/LLNL/llnl-tpls-base.cmake b/host-configs/LLNL/llnl-tpls-base.cmake index 3d85ceec..77378764 100644 --- a/host-configs/LLNL/llnl-tpls-base.cmake +++ b/host-configs/LLNL/llnl-tpls-base.cmake @@ -1,2 +1,2 @@ set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "") -set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-13/install-${CONFIG_NAME}-release CACHE PATH "") +set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-16/install-${CONFIG_NAME}-release CACHE PATH "")