Lapack: adding testing option and CMake check for rocSOLVER

This looks pretty good now : )
kokkos · Nov 14, 2023 · 7ac47c9 · 7ac47c9
1 parent 22aeeed
commit 7ac47c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/cmake/kokkoskernels_features.cmake b/cmake/kokkoskernels_features.cmake
@@ -27,3 +27,15 @@ IF (KOKKOSKERNELS_ENABLE_TPL_BLAS OR KOKKOSKERNELS_ENABLE_TPL_MKL OR KOKKOSKERNE
   INCLUDE(CheckHostBlasReturnComplex.cmake)
   CHECK_HOST_BLAS_RETURN_COMPLEX(KOKKOSKERNELS_TPL_BLAS_RETURN_COMPLEX)
 ENDIF()
+
+# ==================================================================
+# Lapack requirements
+# ==================================================================
+
+IF (KOKKOSKERNELS_ENABLE_TPL_ROCSOLVER AND NOT KOKKOSKERNELS_ENABLE_TPL_ROCBLAS AND NOT KOKKOSKERNELS_ENABLE_TPL_ROCSPARSE)
+  MESSAGE(FATAL_ERROR "rocSOLVER requires rocBLAS and rocSPARSE, please reconfigure with KOKKOSKERNELS_ENABLE_TPL_ROCBLAS:BOOL=ON and KOKKOSKERNELS_ENABLE_TPL_ROCSPARSE:BOOL=ON.")
+ELSEIF (KOKKOSKERNELS_ENABLE_TPL_ROCSOLVER AND NOT KOKKOSKERNELS_ENABLE_TPL_ROCSPARSE)
+  MESSAGE(FATAL_ERROR "rocSOLVER requires rocSPARSE, please reconfigure with KOKKOSKERNELS_ENABLE_TPL_ROCSPARSE:BOOL=ON.")
+ELSEIF (KOKKOSKERNELS_ENABLE_TPL_ROCSOLVER AND NOT KOKKOSKERNELS_ENABLE_TPL_ROCBLAS)
+  MESSAGE(FATAL_ERROR "rocSOLVER requires rocBLAS, please reconfigure with KOKKOSKERNELS_ENABLE_TPL_ROCBLAS:BOOL=ON.")
+ENDIF()
diff --git a/scripts/cm_test_all_sandia b/scripts/cm_test_all_sandia
@@ -91,7 +91,7 @@ print_help() {
   echo "--with-tpls=TPLS: set KOKKOSKERNELS_ENABLE_TPLS"
   echo "    Provide a comma-separated list of TPLs"
   echo "    Valid items:"
-  echo "      blas, mkl, cublas, cusparse, magma, armpl, rocblas, rocsparse"
+  echo "      blas, mkl, cublas, cusparse, magma, armpl, rocblas, rocsparse, rocsolver"
   echo ""
 
   echo "ARGS: list of expressions matching compilers to test"
@@ -1087,7 +1087,7 @@ setup_env() {
       export KOKKOS_CUDA_OPTIONS="${KOKKOS_CUDA_OPTIONS},enable_lambda"
     fi
     if [[ "$compiler" == rocm* ]]; then
-      NEW_TPL_LIST="rocblas,rocsparse,"
+      NEW_TPL_LIST="rocblas,rocsparse,rocsolver,"
     fi
     # host tpls - use mkl with intel, else use host blas
     if [[ "$compiler" == intel* ]]; then