Merge pull request #426 from sslattery/hypre_gpu

Use new HYPRE cmake and add accelerator support

.github/workflows/CI2.yml

@@ -258,7 +258,7 @@ jobs:
         uses: actions/[email protected]
         with:
           repository: hypre-space/hypre
-          ref: v2.20.0
+          ref: v2.22.0
           path: hypre
       - name: Build hypre
         if: ${{ matrix.hypre == 'HYPRE' }}

.jenkins

@@ -31,7 +31,7 @@ pipeline {
                               -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
                               -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
                               -D CMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic" \
-                              -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR;$HEFFTE_DIR" \
+                              -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR;$HEFFTE_DIR;$HYPRE_DIR" \
                               -D MPIEXEC_MAX_NUMPROCS=1 \
                               -D MPIEXEC_PREFLAGS="--allow-run-as-root;--mca;btl_smcuda_use_cuda_ipc;0" \
                               -D Cabana_REQUIRE_MPI=ON \

CMakeLists.txt

@@ -17,6 +17,12 @@ cmake_minimum_required(VERSION 3.9)
 project(Cabana LANGUAGES CXX)
 set(PROJECT_VERSION "1.0-dev")
 
+# FIXME: HYPRE workaround. Hypre is currently not exporting the find_package(
+# MPI ) to find the MPI::MPI_C targets and therefore we add this here for now
+# to ensure those targets are found for HYPRE:
+# https://github.com/hypre-space/hypre/pull/423
+enable_language( C )
+
 # If the user doesn't provide a build type default to release
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
   #release comes with -O3 by default
@@ -80,15 +86,10 @@ Cabana_add_dependency( PACKAGE MPI )
 Cabana_add_dependency( PACKAGE ArborX )
 
 # find Clang Format
-find_package( CLANG_FORMAT 10)
+find_package( CLANG_FORMAT 10 )
 
 # find hypre
-Cabana_add_dependency( PACKAGE HYPRE )
-if(HYPRE_FOUND)
-  install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindHYPRE.cmake
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Cabana )
-endif()
+Cabana_add_dependency( PACKAGE HYPRE VERSION 2.22.0 )
 
 # find heffte
 Cabana_add_dependency( PACKAGE Heffte VERSION 2.0.0 )

cajita/src/CMakeLists.txt

@@ -60,7 +60,7 @@ target_link_libraries(Cajita INTERFACE
   )
 
 if(Cabana_ENABLE_HYPRE)
-  target_link_libraries(Cajita INTERFACE HYPRE::hypre)
+  target_link_libraries(Cajita INTERFACE HYPRE::HYPRE)
 endif()
 
 if(Cabana_ENABLE_HEFFTE)