From 03f4168b6cc7b7187bee02fc385447696348b7f9 Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Fri, 5 Jul 2024 16:18:36 -0700 Subject: [PATCH 1/6] update tpls path on LC. --- 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 a123f4dd..bfe3bc1b 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-06-20/install-${CONFIG_NAME}-release CACHE PATH "") +set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-05/install-${CONFIG_NAME}-release CACHE PATH "") From 700f48956dbe62b76e79a014f48d217f7acc2aea Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Mon, 8 Jul 2024 10:13:26 -0700 Subject: [PATCH 2/6] new tpls path for LC --- 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 bfe3bc1b..d27b2810 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-05/install-${CONFIG_NAME}-release CACHE PATH "") +set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-08/install-${CONFIG_NAME}-release CACHE PATH "") From 4e152dce509596efbda2ca34371d6ed0e82d370c Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Tue, 9 Jul 2024 16:23:54 -0700 Subject: [PATCH 3/6] add template parameter to cuda_exec_explicit --- 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 c79ae30a3c40837ac5c0087c6b113a2cfe98d701 Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Wed, 10 Jul 2024 09:08:17 -0700 Subject: [PATCH 4/6] new tpls. --- 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 d27b2810..177ffa60 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-08/install-${CONFIG_NAME}-release CACHE PATH "") +set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-09/install-${CONFIG_NAME}-release CACHE PATH "") From ab5dce0e98d4981819b9a106d61718152b08a0bb Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Wed, 10 Jul 2024 21:34:19 -0700 Subject: [PATCH 5/6] revert raja update related changes. --- unitTests/testUtils.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unitTests/testUtils.hpp b/unitTests/testUtils.hpp index 208552e8..4b4566af 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, typename C, size_t BLOCK_SIZE, bool ASYNC > -struct RAJAHelper< RAJA::policy::cuda::cuda_exec_explicit< X, Y, C, BLOCK_SIZE, ASYNC > > +template< typename X, typename Y, size_t BLOCK_SIZE, bool ASYNC > +struct RAJAHelper< RAJA::policy::cuda::cuda_exec_explicit< X, Y, BLOCK_SIZE, ASYNC > > { using ReducePolicy = RAJA::cuda_reduce; using AtomicPolicy = RAJA::cuda_atomic; From 9f2062e3682edae0765780ae1f3befc0ace6df0a Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Wed, 10 Jul 2024 21:57:41 -0700 Subject: [PATCH 6/6] tpls path for LC. --- 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 177ffa60..398e71f5 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-09/install-${CONFIG_NAME}-release CACHE PATH "") +set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-11/install-${CONFIG_NAME}-release CACHE PATH "")