diff --git a/src/seq_mv/CMakeLists.txt b/src/seq_mv/CMakeLists.txt
index be26419b8..472ee9035 100644
--- a/src/seq_mv/CMakeLists.txt
+++ b/src/seq_mv/CMakeLists.txt
@@ -10,22 +10,8 @@ set(HDRS
 
 set(SRCS
   csr_matop.c
-  csr_matop_device.c
   csr_matrix.c
-  csr_matrix_cuda_utils.c
   csr_matvec.c
-  csr_matvec_device.c
-  csr_matvec_oomp.c
-  csr_spadd_device.c
-  csr_spgemm_device.c
-  csr_spgemm_device_cusparse.c
-  csr_spgemm_device_rocsparse.c
-  csr_spgemm_device_onemklsparse.c
-  csr_spgemm_device_rowbound.c
-  csr_spgemm_device_rowest.c
-  csr_spgemm_device_util.c
-  csr_spmv_device.c
-  csr_sptrans_device.c
   genpart.c
   HYPRE_csr_matrix.c
   HYPRE_mapped_matrix.c
@@ -33,8 +19,44 @@ set(SRCS
   HYPRE_vector.c
   mapped_matrix.c
   multiblock_matrix.c
-  vector.c
   vector_batched.c
+  csr_matop_device.c
+  csr_matrix_cuda_utils.c
+  csr_matvec_device.c
+  csr_matvec_oomp.c
+  csr_spadd_device.c
+  csr_spgemm_device.c
+  csr_spgemm_device_cusparse.c
+  csr_spgemm_device_numblocks.c
+  csr_spgemm_device_numer.c
+  csr_spgemm_device_numer1.c
+  csr_spgemm_device_numer2.c
+  csr_spgemm_device_numer3.c
+  csr_spgemm_device_numer4.c
+  csr_spgemm_device_numer5.c
+  csr_spgemm_device_numer6.c
+  csr_spgemm_device_numer7.c
+  csr_spgemm_device_numer8.c
+  csr_spgemm_device_numer9.c
+  csr_spgemm_device_numer10.c
+  csr_spgemm_device_onemklsparse.c
+  csr_spgemm_device_rocsparse.c
+  csr_spgemm_device_rowest.c
+  csr_spgemm_device_symbl.c
+  csr_spgemm_device_symbl1.c
+  csr_spgemm_device_symbl2.c
+  csr_spgemm_device_symbl3.c
+  csr_spgemm_device_symbl4.c
+  csr_spgemm_device_symbl5.c
+  csr_spgemm_device_symbl6.c
+  csr_spgemm_device_symbl7.c
+  csr_spgemm_device_symbl8.c
+  csr_spgemm_device_symbl9.c
+  csr_spgemm_device_symbl10.c
+  csr_spgemm_device_util.c
+  csr_spmv_device.c
+  csr_sptrans_device.c
+  vector.c
 )
 
 target_sources(${PROJECT_NAME}
@@ -51,10 +73,32 @@ if (HYPRE_USING_CUDA OR HYPRE_USING_SYCL)
     csr_spadd_device.c
     csr_spgemm_device.c
     csr_spgemm_device_cusparse.c
-    csr_spgemm_device_rocsparse.c
+    csr_spgemm_device_numblocks.c
+    csr_spgemm_device_numer.c
+    csr_spgemm_device_numer1.c
+    csr_spgemm_device_numer2.c
+    csr_spgemm_device_numer3.c
+    csr_spgemm_device_numer4.c
+    csr_spgemm_device_numer5.c
+    csr_spgemm_device_numer6.c
+    csr_spgemm_device_numer7.c
+    csr_spgemm_device_numer8.c
+    csr_spgemm_device_numer9.c
+    csr_spgemm_device_numer10.c
     csr_spgemm_device_onemklsparse.c
-    csr_spgemm_device_rowbound.c
+    csr_spgemm_device_rocsparse.c
     csr_spgemm_device_rowest.c
+    csr_spgemm_device_symbl.c
+    csr_spgemm_device_symbl1.c
+    csr_spgemm_device_symbl2.c
+    csr_spgemm_device_symbl3.c
+    csr_spgemm_device_symbl4.c
+    csr_spgemm_device_symbl5.c
+    csr_spgemm_device_symbl6.c
+    csr_spgemm_device_symbl7.c
+    csr_spgemm_device_symbl8.c
+    csr_spgemm_device_symbl9.c
+    csr_spgemm_device_symbl10.c
     csr_spgemm_device_util.c
     csr_spmv_device.c
     csr_sptrans_device.c
diff --git a/src/seq_mv/Makefile b/src/seq_mv/Makefile
index c3aa5d7e7..f8862938c 100644
--- a/src/seq_mv/Makefile
+++ b/src/seq_mv/Makefile
@@ -56,8 +56,8 @@ CUFILES =\
  csr_spgemm_device_numer8.c\
  csr_spgemm_device_numer9.c\
  csr_spgemm_device_numer10.c\
- csr_spgemm_device_rocsparse.c \
  csr_spgemm_device_onemklsparse.c\
+ csr_spgemm_device_rocsparse.c \
  csr_spgemm_device_rowest.c\
  csr_spgemm_device_symbl.c\
  csr_spgemm_device_symbl1.c\