From 6efbd27c91a76f1c92dcd763255a4088419490de Mon Sep 17 00:00:00 2001 From: Matteo Cusini <49037133+CusiniM@users.noreply.github.com> Date: Mon, 22 Apr 2024 07:57:00 -0700 Subject: [PATCH] update tpls tag and lvarray. (#3087) --- .devcontainer/devcontainer.json | 2 +- src/cmake/thirdparty/SetupGeosxThirdParty.cmake | 2 +- src/coreComponents/LvArray | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 30466d17298..dda45adc958 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "260-235" + "GEOS_TPL_TAG": "263-252" } }, "runArgs": [ diff --git a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake index a3a4edd3f0e..7706da01a5b 100644 --- a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake +++ b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake @@ -636,7 +636,7 @@ if(DEFINED HYPRE_DIR AND ENABLE_HYPRE) set( HYPRE_DEPENDS ${HYPRE_DEPENDS} superlu_dist ) endif() if( ${ENABLE_HYPRE_DEVICE} STREQUAL "CUDA" ) - set( EXTRA_LIBS ${CUDA_cusparse_LIBRARY} ${CUDA_cublas_LIBRARY} ${CUDA_curand_LIBRARY} ) + set( EXTRA_LIBS ${CUDA_cusparse_LIBRARY} ${CUDA_cublas_LIBRARY} ${CUDA_curand_LIBRARY} ${CUDA_cusolver_LIBRARY} ) elseif( ${ENABLE_HYPRE_DEVICE} STREQUAL "HIP" ) find_package( rocblas REQUIRED ) find_package( rocsolver REQUIRED ) diff --git a/src/coreComponents/LvArray b/src/coreComponents/LvArray index 1531241583e..fb5200d7436 160000 --- a/src/coreComponents/LvArray +++ b/src/coreComponents/LvArray @@ -1 +1 @@ -Subproject commit 1531241583eebe21cfcdc0facd16a80f1e03c939 +Subproject commit fb5200d743621126f2117eaef0dd855792fa0443