Remove BlockCrsMatrix

The suggested replacement is BsrMatrix, which is more compatible with TPLs. * perf_test/sparse: remove sparse_spmv_blockcrs perf test. Use BSR in block PCG perf test. * scripts/analysis: remove BlockCrsMatrix processing code * perf_test/batched: remove BlockCrs tests * src/CMakeLists: remove ETI for BlockCrsMatrix SpMV and SpMM * src/batched: remove BlockCrs Tests * src/impl/generated_specializations: remove BlockCrsMatrix SpMV and SpMM * src/impl/TPLs: remove BlockCrsMatrix SpMV * src/sparse: remove BlockCrsMatrix class. Remove BlockCrsMatrix references in utils. Dramatically simplify creating BSR from properly-formatted CRS. Remove BlockCrsMatrix SpMV interface
kokkos · Sep 12, 2022 · 4f1bc18 · 4f1bc18
1 parent 42c96f2
commit 4f1bc18
Show file tree

Hide file tree

Showing 30 changed files with 175 additions and 7,752 deletions.
diff --git a/perf_test/batched/KokkosBatched_Test_BlockCrs_Cuda.cpp b/perf_test/batched/KokkosBatched_Test_BlockCrs_Cuda.cpp
diff --git a/perf_test/batched/KokkosBatched_Test_BlockCrs_Host.cpp b/perf_test/batched/KokkosBatched_Test_BlockCrs_Host.cpp
diff --git a/perf_test/batched/scripts/test-bcrs.sh b/perf_test/batched/scripts/test-bcrs.sh
diff --git a/perf_test/sparse/CMakeLists.txt b/perf_test/sparse/CMakeLists.txt
@@ -65,10 +65,6 @@ IF (KOKKOSKERNELS_ENABLE_TPL_CUSPARSE)
     )
 ENDIF ()
 
-KOKKOSKERNELS_ADD_EXECUTABLE(
-        sparse_spmv_blockcrs
-        SOURCES KokkosSparse_spmv_blockcrs.cpp
-)
 
 KOKKOSKERNELS_ADD_EXECUTABLE(
         sparse_spmv_bsr

diff --git a/perf_test/sparse/KokkosSparse_block_pcg.cpp b/perf_test/sparse/KokkosSparse_block_pcg.cpp
@@ -322,7 +322,7 @@ void run_experiment(
   // typedef typename lno_nnz_view_t::value_type lno_t;
   // typedef typename lno_view_t::value_type size_type;
   // typedef typename scalar_view_t::value_type scalar_t;
-  KokkosSparse::Impl::kk_create_blockcrs_formatted_point_crsmatrix(
+  KokkosSparse::Impl::kk_create_bsr_formated_point_crsmatrix(
       block_size, crsmat.numRows(), crsmat.numCols(), crsmat.graph.row_map,
       crsmat.graph.entries, crsmat.values, out_r, out_c, pf_rm, pf_e, pf_v);
 
@@ -349,7 +349,7 @@ void run_experiment(
   scalar_view_t bf_v;
   size_t but_r, but_c;
 
-  KokkosSparse::Impl::kk_create_blockcrs_from_blockcrs_formatted_point_crs(
+  KokkosSparse::Impl::kk_create_bsr_from_bsr_formatted_point_crs(
       block_size, out_r, out_c, pf_rm, pf_e, pf_v, but_r, but_c, bf_rm, bf_e,
       bf_v);