feat(symmetric): rename FrontalMatrixGPUSymmetric to FrontalMatrixGPU…

…SymmetricPositiveDefinite
TheCoreTeam · Jan 12, 2024 · 31d3a13 · 31d3a13
1 parent 4e3fcb4
commit 31d3a13
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 56 deletions.
diff --git a/examples/sparse/CMakeLists.txt b/examples/sparse/CMakeLists.txt
@@ -2,8 +2,8 @@ add_executable(testPoisson2d      EXCLUDE_FROM_ALL testPoisson2d.cpp)
 add_executable(testMMdouble       EXCLUDE_FROM_ALL testMMdouble.cpp)
 add_executable(testPoisson3d      EXCLUDE_FROM_ALL testPoisson3d.cpp)
 add_executable(testMixedPrecision EXCLUDE_FROM_ALL testMixedPrecision.cpp)
-add_executable(testMixedPrecisionSymmetric EXCLUDE_FROM_ALL testMixedPrecisionSymmetric.cpp)
-add_executable(testSymmetric EXCLUDE_FROM_ALL testSymmetric.cpp)
+add_executable(testMixedPrecisionSymmetricPositiveDefinite EXCLUDE_FROM_ALL testMixedPrecisionSymmetricPositiveDefinite.cpp)
+add_executable(testSymmetricPositiveDefinite EXCLUDE_FROM_ALL testSymmetricPositiveDefinite.cpp)
 add_executable(sexample           EXCLUDE_FROM_ALL sexample.c)
 add_executable(dexample           EXCLUDE_FROM_ALL dexample.c)
 add_executable(cexample           EXCLUDE_FROM_ALL cexample.c)
@@ -15,8 +15,8 @@ target_link_libraries(testPoisson2d strumpack)
 target_link_libraries(testMMdouble strumpack)
 target_link_libraries(testPoisson3d strumpack)
 target_link_libraries(testMixedPrecision strumpack)
-target_link_libraries(testMixedPrecisionSymmetric strumpack)
-target_link_libraries(testSymmetric strumpack)
+target_link_libraries(testMixedPrecisionSymmetricPositiveDefinite strumpack)
+target_link_libraries(testSymmetricPositiveDefinite strumpack)
 target_link_libraries(sexample strumpack)
 target_link_libraries(dexample strumpack)
 target_link_libraries(cexample strumpack)
@@ -28,8 +28,8 @@ add_dependencies(examples
   testMMdouble
   testPoisson3d
   testMixedPrecision
-  testMixedPrecisionSymmetric
-  testSymmetric
+  testMixedPrecisionSymmetricPositiveDefinite
+  testSymmetricPositiveDefinite
   sexample
   dexample
   cexample

diff --git a/...es/sparse/testMixedPrecisionSymmetric.cpp → ...xedPrecisionSymmetricPositiveDefinite.cpp b/...es/sparse/testMixedPrecisionSymmetric.cpp → ...xedPrecisionSymmetricPositiveDefinite.cpp
diff --git a/examples/sparse/testSymmetric.cpp → .../sparse/testSymmetricPositiveDefinite.cpp b/examples/sparse/testSymmetric.cpp → .../sparse/testSymmetricPositiveDefinite.cpp
@@ -116,16 +116,17 @@ void test(CSRMatrix<working_t,int>& A,
 
 int main(int argc, char* argv[]) {
 
-    std::cout << "long double size in bytes: "
-              << sizeof(long double) << " "
-              << std::endl;
-
-    std::string f="/home/tingxuan/CLionProjects/nd6k/matrix.mtx";
-    if (argc > 1) f = std::string(argv[1]);
-
     CSRMatrix<double,int> A_d;
-    A_d.read_matrix_market(f);
-//    auto A_f = cast_matrix<double,int,float>(A_d);
+    if(argc > 1){
+        A_d.read_matrix_market(argv[1]);
+    }else{
+        int n =3;
+        int ptr[4] = {0,2,3,5};
+        int Index[5] = {0,2,1,0,2};
+        double val[5] = {2.1,1,3.5,1,5.2};
+        A_d = CSRMatrix<double,int>(n, ptr, Index, val);
+    }
+
 
     int N = A_d.size();
     int m = 1; // nr of RHSs

diff --git a/src/sparse/fronts/CMakeLists.txt b/src/sparse/fronts/CMakeLists.txt
@@ -36,8 +36,8 @@ if(STRUMPACK_USE_CUDA OR STRUMPACK_USE_HIP OR STRUMPACK_USE_SYCL)
     PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPU.cpp
     ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPU.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPUSymmetric.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPUSymmetric.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPUSymmetricPositiveDefinite.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPUSymmetricPositiveDefinite.hpp
     ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPUKernels.hpp)
 
 endif()
@@ -51,7 +51,7 @@ endif()
 if(STRUMPACK_USE_CUDA)
   target_sources(strumpack PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixCUDA.cu
-    ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPUSymmetric.cu)
+    ${CMAKE_CURRENT_LIST_DIR}/FrontalMatrixGPUSymmetricPositiveDefinite.cu)
 endif()
 
 if(STRUMPACK_USE_SYCL)

diff --git a/src/sparse/fronts/FrontFactory.cpp b/src/sparse/fronts/FrontFactory.cpp
@@ -51,7 +51,7 @@
 #endif
 #if defined(STRUMPACK_USE_GPU)
 #include "FrontalMatrixGPU.hpp"
-#include "FrontalMatrixGPUSymmetric.hpp"
+#include "FrontalMatrixGPUSymmetricPositiveDefinite.hpp"
 #endif
 #if defined(STRUMPACK_USE_ZFP)
 #include "FrontalMatrixLossy.hpp"
@@ -146,7 +146,7 @@ namespace strumpack {
 #if defined(STRUMPACK_USE_GPU)
         if (is_symmetric(opts) && is_positive_definite(opts)){
             front.reset
-                    (new FrontalMatrixGPUSymmetric<scalar_t,integer_t>(s, sbegin, send, upd));
+                    (new FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>(s, sbegin, send, upd));
         } else {
             front.reset
                     (new FrontalMatrixGPU<scalar_t,integer_t>(s, sbegin, send, upd));

diff --git a/...arse/fronts/FrontalMatrixGPUSymmetric.cpp → ...talMatrixGPUSymmetricPositiveDefinite.cpp b/...arse/fronts/FrontalMatrixGPUSymmetric.cpp → ...talMatrixGPUSymmetricPositiveDefinite.cpp
@@ -31,7 +31,7 @@
  */
 #include <array>
 
-#include "FrontalMatrixGPUSymmetric.hpp"
+#include "FrontalMatrixGPUSymmetricPositiveDefinite.hpp"
 #include "FrontalMatrixGPUKernels.hpp"
 
 #if defined(STRUMPACK_USE_MPI)
@@ -43,7 +43,7 @@ namespace strumpack {
 
     template<typename scalar_t, typename integer_t> class LevelInfoUnified {
         using F_t = FrontalMatrix<scalar_t,integer_t>;
-        using FG_t = FrontalMatrixGPUSymmetric<scalar_t,integer_t>;
+        using FG_t = FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>;
         using DenseMW_t = DenseMatrixWrapper<scalar_t>;
         using SpMat_t = CompressedSparseMatrix<scalar_t,integer_t>;
 
@@ -310,13 +310,13 @@ namespace strumpack {
 
 
     template<typename scalar_t,typename integer_t>
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::FrontalMatrixGPUSymmetric
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::FrontalMatrixGPUSymmetricPositiveDefinite
             (integer_t sep, integer_t sep_begin, integer_t sep_end,
              std::vector<integer_t>& upd)
             : F_t(nullptr, nullptr, sep, sep_begin, sep_end, upd) {}
 
     template<typename scalar_t,typename integer_t>
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::~FrontalMatrixGPUSymmetric() {
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::~FrontalMatrixGPUSymmetricPositiveDefinite() {
 #if defined(STRUMPACK_COUNT_FLOPS)
         const std::size_t dupd = dim_upd();
     const std::size_t dsep = dim_sep();
@@ -325,14 +325,14 @@ namespace strumpack {
     }
 
     template<typename scalar_t,typename integer_t> void
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::release_work_memory() {
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::release_work_memory() {
         F22_.clear();
         host_Schur_.reset(nullptr);
     }
 
 #if defined(STRUMPACK_USE_MPI)
     template<typename scalar_t,typename integer_t> void
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::extend_add_copy_to_buffers
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::extend_add_copy_to_buffers
             (std::vector<std::vector<scalar_t>>& sbuf,
              const FrontalMatrixMPI<scalar_t,integer_t>* pa) const {
         ExtendAdd<scalar_t,integer_t>::extend_add_seq_copy_to_buffers
@@ -342,7 +342,7 @@ namespace strumpack {
 
 
     template<typename scalar_t,typename integer_t> void
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::extend_add_to_dense
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::extend_add_to_dense
             (DenseM_t& paF11, DenseM_t& paF21, DenseM_t& paF22,
              const F_t* p, int task_depth) {
         const std::size_t pdsep = paF11.rows();
@@ -390,7 +390,7 @@ namespace strumpack {
     }
 
     template<typename scalar_t, typename integer_t> void
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::front_assembly
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::front_assembly
             (const SpMat_t& A, LInfo_t& L, char* hea_mem, char* dea_mem) {
         using Trip_t = Triplet<scalar_t>;
         auto N = L.f.size();
@@ -436,13 +436,13 @@ namespace strumpack {
 
     // TODO(Jie): fix for un-symmetric
     template<typename scalar_t, typename integer_t> long long
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::dense_node_factor_nonzeros() const {
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::dense_node_factor_nonzeros() const {
         long long dsep = dim_sep(), dupd = dim_upd();
         return dsep * (dsep + dupd);
     }
 
     template<typename scalar_t, typename integer_t> void
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::factor_small_fronts
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::factor_small_fronts
             (LInfo_t& L, gpu::FrontData<scalar_t>* fdata, int* dinfo,
              const SPOptions<scalar_t>& opts) {
         if (!L.small_fronts) return;
@@ -468,7 +468,7 @@ namespace strumpack {
     }
 
     template<typename scalar_t,typename integer_t> ReturnCode
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::split_smaller
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::split_smaller
             (const SpMat_t& A, const SPOptions<scalar_t>& opts,
              int etree_level, int task_depth) {
         if (opts.verbose())
@@ -566,7 +566,7 @@ namespace strumpack {
     }
 
     template<typename scalar_t,typename integer_t>
-    ReturnCode FrontalMatrixGPUSymmetric<scalar_t, integer_t>::multifrontal_factorization_symmetric(
+    ReturnCode FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t, integer_t>::multifrontal_factorization_symmetric(
             const SpMat_t& A,
             const SPOptions<scalar_t>& opts,
             int etree_level, int task_depth) {
@@ -858,7 +858,7 @@ namespace strumpack {
     }
 
     template<typename scalar_t,typename integer_t> ReturnCode
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::multifrontal_factorization
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::multifrontal_factorization
             (const SpMat_t& A, const SPOptions<scalar_t>& opts,
              int etree_level, int task_depth) {
         if (!A.symm_sparse()) {
@@ -870,7 +870,7 @@ namespace strumpack {
     }
 
     template<typename scalar_t,typename integer_t> void
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::fwd_solve_phase2
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::fwd_solve_phase2
             (DenseM_t& b, DenseM_t& bupd, int etree_level, int task_depth) const {
         if (dim_sep()) {
             DenseMW_t bloc(dim_sep(), b.cols(), b, this->sep_begin_, 0);
@@ -888,7 +888,7 @@ namespace strumpack {
     }
 
     template<typename scalar_t,typename integer_t> void
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::bwd_solve_phase1
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::bwd_solve_phase1
             (DenseM_t& y, DenseM_t& yupd, int etree_level, int task_depth) const {
         if (dim_sep()) {
             DenseMW_t yloc(dim_sep(), y.cols(), y, this->sep_begin_, 0);
@@ -906,7 +906,7 @@ namespace strumpack {
     }
 
     template<typename scalar_t,typename integer_t> ReturnCode
-    FrontalMatrixGPUSymmetric<scalar_t,integer_t>::node_inertia
+    FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>::node_inertia
             (integer_t& neg, integer_t& zero, integer_t& pos) const {
         using real_t = typename RealType<scalar_t>::value_type;
         for (std::size_t i=0; i<F11_.rows(); i++) {
@@ -1076,19 +1076,19 @@ namespace strumpack {
     };
 
     // explicit template instantiations
-    template class FrontalMatrixGPUSymmetric<float,int>;
-    template class FrontalMatrixGPUSymmetric<double,int>;
-    template class FrontalMatrixGPUSymmetric<std::complex<float>,int>;
-    template class FrontalMatrixGPUSymmetric<std::complex<double>,int>;
-
-    template class FrontalMatrixGPUSymmetric<float,long int>;
-    template class FrontalMatrixGPUSymmetric<double,long int>;
-    template class FrontalMatrixGPUSymmetric<std::complex<float>,long int>;
-    template class FrontalMatrixGPUSymmetric<std::complex<double>,long int>;
-
-    template class FrontalMatrixGPUSymmetric<float,long long int>;
-    template class FrontalMatrixGPUSymmetric<double,long long int>;
-    template class FrontalMatrixGPUSymmetric<std::complex<float>,long long int>;
-    template class FrontalMatrixGPUSymmetric<std::complex<double>,long long int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<float,int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<double,int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<std::complex<float>,int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<std::complex<double>,int>;
+
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<float,long int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<double,long int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<std::complex<float>,long int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<std::complex<double>,long int>;
+
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<float,long long int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<double,long long int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<std::complex<float>,long long int>;
+    template class FrontalMatrixGPUSymmetricPositiveDefinite<std::complex<double>,long long int>;
 
 } // end namespace strumpack
diff --git a/...parse/fronts/FrontalMatrixGPUSymmetric.cu → ...ntalMatrixGPUSymmetricPositiveDefinite.cu b/...parse/fronts/FrontalMatrixGPUSymmetric.cu → ...ntalMatrixGPUSymmetricPositiveDefinite.cu
diff --git a/...arse/fronts/FrontalMatrixGPUSymmetric.hpp → ...talMatrixGPUSymmetricPositiveDefinite.hpp b/...arse/fronts/FrontalMatrixGPUSymmetric.hpp → ...talMatrixGPUSymmetricPositiveDefinite.hpp
@@ -26,19 +26,19 @@ namespace strumpack {
     }
 
 
-    template<typename scalar_t,typename integer_t> class FrontalMatrixGPUSymmetric
+    template<typename scalar_t,typename integer_t> class FrontalMatrixGPUSymmetricPositiveDefinite
             : public FrontalMatrix<scalar_t,integer_t> {
         using F_t = FrontalMatrix<scalar_t,integer_t>;
-        using FG_t = FrontalMatrixGPUSymmetric<scalar_t,integer_t>;
+        using FG_t = FrontalMatrixGPUSymmetricPositiveDefinite<scalar_t,integer_t>;
         using DenseM_t = DenseMatrix<scalar_t>;
         using DenseMW_t = DenseMatrixWrapper<scalar_t>;
         using SpMat_t = CompressedSparseMatrix<scalar_t,integer_t>;
         using LInfo_t = LevelInfoUnified<scalar_t,integer_t>;
 
     public:
-        FrontalMatrixGPUSymmetric(integer_t sep, integer_t sep_begin, integer_t sep_end,
+        FrontalMatrixGPUSymmetricPositiveDefinite(integer_t sep, integer_t sep_begin, integer_t sep_end,
                          std::vector<integer_t>& upd);
-        ~FrontalMatrixGPUSymmetric();
+        ~FrontalMatrixGPUSymmetricPositiveDefinite();
 
         long long dense_node_factor_nonzeros() const override;
 
@@ -78,8 +78,8 @@ namespace strumpack {
         std::vector<int> pivot_mem_;
         int* piv_ = nullptr;
 
-        FrontalMatrixGPUSymmetric(const FrontalMatrixGPUSymmetric&) = delete;
-        FrontalMatrixGPUSymmetric& operator=(FrontalMatrixGPUSymmetric const&) = delete;
+        FrontalMatrixGPUSymmetricPositiveDefinite(const FrontalMatrixGPUSymmetricPositiveDefinite&) = delete;
+        FrontalMatrixGPUSymmetricPositiveDefinite& operator=(FrontalMatrixGPUSymmetricPositiveDefinite const&) = delete;
 
         void front_assembly(const SpMat_t& A, LInfo_t& L,
                             char* hea_mem, char* dea_mem);