Add BsrMatrix spmv and a BlockCrsMatrix spmv.

cmake/kokkos_backends.cmake

@@ -10,9 +10,15 @@ MACRO(CHECK_KOKKOS_BACKEND BE)
 ENDMACRO(CHECK_KOKKOS_BACKEND)
 
 CHECK_KOKKOS_BACKEND(SERIAL)
-CHECK_KOKKOS_BACKEND(PTHREAD)
+CHECK_KOKKOS_BACKEND(THREADS)
 CHECK_KOKKOS_BACKEND(OPENMP)
 CHECK_KOKKOS_BACKEND(OPENMPTARGET)
 CHECK_KOKKOS_BACKEND(CUDA)
 CHECK_KOKKOS_BACKEND(HIP)
 CHECK_KOKKOS_BACKEND(SYCL)
+
+# for backward compatibility.  can be dropped when requiring Kokkos 3.6
+IF (Kokkos_ENABLE_PTHREAD)
+  SET(KOKKOS_ENABLE_THREADS ON)
+  SET(KOKKOSKERNELS_INST_EXECSPACE_THREADS_DEFAULT ON)
+ENDIF()

cmake/kokkoskernels_eti_devices.cmake

@@ -8,15 +8,15 @@ SET(EXEC_SPACES
   EXECSPACE_SYCL
   EXECSPACE_OPENMPTARGET
   EXECSPACE_OPENMP
-  EXECSPACE_PTHREAD
+  EXECSPACE_THREADS
   EXECSPACE_SERIAL
 )
 SET(EXECSPACE_CUDA_CPP_TYPE         Kokkos::Cuda)
 SET(EXECSPACE_HIP_CPP_TYPE          Kokkos::Experimental::HIP)
 SET(EXECSPACE_SYCL_CPP_TYPE         Kokkos::Experimental::SYCL)
 SET(EXECSPACE_OPENMPTARGET_CPP_TYPE Kokkos::Experimental::OpenMPTarget)
 SET(EXECSPACE_OPENMP_CPP_TYPE       Kokkos::OpenMP)
-SET(EXECSPACE_PTHREAD_CPP_TYPE      Kokkos::Threads)
+SET(EXECSPACE_THREADS_CPP_TYPE      Kokkos::Threads)
 SET(EXECSPACE_SERIAL_CPP_TYPE       Kokkos::Serial)
 
 SET(MEM_SPACES
@@ -174,17 +174,17 @@ ENDIF()
 
 KOKKOSKERNELS_ADD_OPTION(
   INST_EXECSPACE_THREADS
-  ${KOKKOSKERNELS_INST_EXECSPACE_PTHREAD_DEFAULT}
+  ${KOKKOSKERNELS_INST_EXECSPACE_THREADS_DEFAULT}
   BOOL
-  "Whether to build kernels for the execution space Kokkos::Threads.  If explicit template instantiation (ETI) is enabled in Trilinos, disabling this when Kokkos_ENABLE_PTHREAD is enabled may increase build times. Default: ON if Kokkos is Threads-enabled, OFF otherwise."
+  "Whether to build kernels for the execution space Kokkos::Threads.  If explicit template instantiation (ETI) is enabled in Trilinos, disabling this when Kokkos_ENABLE_THREADS is enabled may increase build times. Default: ON if Kokkos is Threads-enabled, OFF otherwise."
 )
 #There continues to be name ambiguity with threads vs pthreads
-SET(KOKKOSKERNELS_INST_EXECSPACE_PTHREAD ${KOKKOSKERNELS_INST_EXECSPACE_THREADS})
+SET(KOKKOSKERNELS_INST_EXECSPACE_THREADS ${KOKKOSKERNELS_INST_EXECSPACE_THREADS})
 
-IF(KOKKOSKERNELS_INST_EXECSPACE_PTHREAD AND KOKKOSKERNELS_INST_MEMSPACE_HOSTSPACE)
+IF(KOKKOSKERNELS_INST_EXECSPACE_THREADS AND KOKKOSKERNELS_INST_MEMSPACE_HOSTSPACE)
   LIST(APPEND DEVICE_LIST "<Threads,HostSpace>")
-  IF(NOT KOKKOS_ENABLE_PTHREAD)
-    MESSAGE(FATAL_ERROR "Set ETI on for PTHREAD, but Kokkos was not configured with the PTHREAD backend")
+  IF(NOT KOKKOS_ENABLE_THREADS)
+    MESSAGE(FATAL_ERROR "Set ETI on for THREADS, but Kokkos was not configured with the THREADS backend")
   ENDIF()
 ENDIF()
 
@@ -201,7 +201,7 @@ SET(EXECSPACE_SYCL_VALID_MEM_SPACES               SYCLSPACE SYCLSHAREDSPACE)
 SET(EXECSPACE_OPENMPTARGET_VALID_MEM_SPACES       OPENMPTARGETSPACE)
 SET(EXECSPACE_SERIAL_VALID_MEM_SPACES             HBWSPACE HOSTSPACE)
 SET(EXECSPACE_OPENMP_VALID_MEM_SPACES             HBWSPACE HOSTSPACE)
-SET(EXECSPACE_PTHREAD_VALID_MEM_SPACES            HBWSPACE HOSTSPACE)
+SET(EXECSPACE_THREADS_VALID_MEM_SPACES            HBWSPACE HOSTSPACE)
 SET(DEVICES)
 FOREACH(EXEC ${EXEC_SPACES})
   IF (KOKKOSKERNELS_INST_${EXEC})

perf_test/sparse/CMakeLists.txt

@@ -2,98 +2,108 @@ KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_pcg
-  SOURCES KokkosSparse_pcg.cpp
-  )
+        sparse_pcg
+        SOURCES KokkosSparse_pcg.cpp
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_block_pcg
-  SOURCES KokkosSparse_block_pcg.cpp
-  )
+        sparse_block_pcg
+        SOURCES KokkosSparse_block_pcg.cpp
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_spgemm
-  SOURCES KokkosSparse_spgemm.cpp
-  )
+        sparse_spgemm
+        SOURCES KokkosSparse_spgemm.cpp
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_spgemm_jacobi
-  SOURCES KokkosSparse_spgemm_jacobi.cpp
-  )
-  
+        sparse_spgemm_jacobi
+        SOURCES KokkosSparse_spgemm_jacobi.cpp
+)
+
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/spmv)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_spadd
-  SOURCES KokkosSparse_spadd.cpp
-  )
+        sparse_spadd
+        SOURCES KokkosSparse_spadd.cpp
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_spmv_struct
-  SOURCES KokkosSparse_spmv_struct.cpp
-  )
+        sparse_spmv_struct
+        SOURCES KokkosSparse_spmv_struct.cpp
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_spmv_struct_tuning
-  SOURCES KokkosSparse_spmv_struct_tuning.cpp
-  )
+        sparse_spmv_struct_tuning
+        SOURCES KokkosSparse_spmv_struct_tuning.cpp
+)
 
 
 set(utilities_list)
 
-IF(KokkosKernels_ENABLE_TESTS_AND_PERFSUITE)
-LIST(APPEND utilities_list ../PerfTestUtilities.cpp)
-ENDIF()
+IF (KokkosKernels_ENABLE_TESTS_AND_PERFSUITE)
+    LIST(APPEND utilities_list ../PerfTestUtilities.cpp)
+ENDIF ()
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_spmv
-  SOURCES KokkosSparse_spmv.cpp KokkosSparse_spmv_test.cpp spmv/OpenMPSmartStatic_SPMV.cpp
-  ${utilities_list}
-  )
+        sparse_spmv
+        SOURCES KokkosSparse_spmv.cpp KokkosSparse_spmv_test.cpp spmv/OpenMPSmartStatic_SPMV.cpp
+        ${utilities_list}
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_kk_spmv
-  SOURCES KokkosSparse_kk_spmv.cpp
-  )
-
-IF(KOKKOSKERNELS_ENABLE_TPL_CUSPARSE)
-  KOKKOSKERNELS_ADD_EXECUTABLE(
-    sparse_spmv_merge
-    SOURCES KokkosSparse_spmv_merge.cpp
+        sparse_kk_spmv
+        SOURCES KokkosSparse_kk_spmv.cpp
+)
+
+IF (KOKKOSKERNELS_ENABLE_TPL_CUSPARSE)
+    KOKKOSKERNELS_ADD_EXECUTABLE(
+            sparse_spmv_merge
+            SOURCES KokkosSparse_spmv_merge.cpp
     )
-ENDIF()
+ENDIF ()
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_sptrsv
-  SOURCES KokkosSparse_sptrsv.cpp
-  )
+        sparse_spmv_blockcrs
+        SOURCES KokkosSparse_spmv_blockcrs.cpp
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_sptrsv_cholmod
-  SOURCES KokkosSparse_sptrsv_cholmod.cpp 
-  )
+        sparse_spmv_bsr
+        SOURCES KokkosSparse_spmv_bsr.cpp
+)
 
-IF(NOT ${KOKKOS_HAS_TRILINOS})
-# Disable this perf test with Trilinos builds to workaround
-# -Werror issues error: declaration of xyz with C language linkage
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_sptrsv_superlu
-  SOURCES KokkosSparse_sptrsv_superlu.cpp 
-  )
-ENDIF()
+        sparse_sptrsv
+        SOURCES KokkosSparse_sptrsv.cpp
+)
+
+KOKKOSKERNELS_ADD_EXECUTABLE(
+        sparse_sptrsv_cholmod
+        SOURCES KokkosSparse_sptrsv_cholmod.cpp
+)
+
+IF (NOT ${KOKKOS_HAS_TRILINOS})
+    # Disable this perf test with Trilinos builds to workaround
+    # -Werror issues error: declaration of xyz with C language linkage
+    KOKKOSKERNELS_ADD_EXECUTABLE(
+            sparse_sptrsv_superlu
+            SOURCES KokkosSparse_sptrsv_superlu.cpp
+    )
+ENDIF ()
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_sptrsv_supernode
-  SOURCES KokkosSparse_sptrsv_supernode.cpp 
-  )
+        sparse_sptrsv_supernode
+        SOURCES KokkosSparse_sptrsv_supernode.cpp
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_gs
-  SOURCES KokkosSparse_gs.cpp
-  TESTONLYLIBS kokkoskernelsperf_gtest
-  )
+        sparse_gs
+        SOURCES KokkosSparse_gs.cpp
+        TESTONLYLIBS kokkoskernelsperf_gtest
+)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
-  sparse_spiluk
-  SOURCES KokkosSparse_spiluk.cpp 
-  )
+        sparse_spiluk
+        SOURCES KokkosSparse_spiluk.cpp
+)