Fix compilation issues from the merge

pghysels · Oct 18, 2023 · 5e27de9 · 5e27de9
1 parent c6ecd4e
commit 5e27de9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 57 deletions.
diff --git a/src/BLR/BLRMatrix.hpp b/src/BLR/BLRMatrix.hpp
@@ -94,14 +94,6 @@ namespace strumpack {
     public:
       BLRMatrix() = default;
 
-      // BLRMatrix(DenseM_t& A,
-      //           const std::vector<std::size_t>& rowtiles,
-      //           const std::vector<std::size_t>& coltiles,
-      //           const Opts_t& opts);
-
-      // BLRMatrix(DenseM_t& A, const std::vector<std::size_t>& tiles,
-      //           const adm_t& admissible, const Opts_t& opts);
-
       BLRMatrix(std::size_t m, const std::vector<std::size_t>& rowtiles,
                 std::size_t n, const std::vector<std::size_t>& coltiles);
 

diff --git a/src/BLR/DenseTile.hpp b/src/BLR/DenseTile.hpp
@@ -76,11 +76,11 @@ namespace strumpack {
       void dense(DenseM_t& A) const override { A = *D_; }
       DenseM_t dense() const override { return *D_; }
 
-      std::size_t subnormals() const override { return D_.subnormals(); }
-      std::size_t zeros() const override { return D_.zeros(); }
+      std::size_t subnormals() const override { return D_->subnormals(); }
+      std::size_t zeros() const override { return D_->zeros(); }
 
 
-      real_t normF() const override { return D_.normF(); }
+      real_t normF() const override { return D_->normF(); }
 
       std::unique_ptr<BLRTile<scalar_t>> clone() const override;
 

diff --git a/src/BLR/LRTile.hpp b/src/BLR/LRTile.hpp
@@ -108,8 +108,8 @@ namespace strumpack {
       std::size_t nonzeros() const override { return (rows()+cols())*rank(); }
       std::size_t maximum_rank() const override { return U_->cols(); }
 
-      std::size_t subnormals() const override { return U_.subnormals() + V_.subnormals(); }
-      std::size_t zeros() const override { return U_.zeros() + V_.zeros(); }
+      std::size_t subnormals() const override { return U_->subnormals() + V_->subnormals(); }
+      std::size_t zeros() const override { return U_->zeros() + V_->zeros(); }
 
       void dense(DenseM_t& A) const override;
       DenseM_t dense() const override;

diff --git a/src/dense/DenseMatrix.hpp b/src/dense/DenseMatrix.hpp
@@ -1069,7 +1069,7 @@ namespace strumpack {
       this->ld_ = D.ld();
     }
 
-    DenseMatrixWrapper(const DenseMatrixWrapper<scalar_t>& D) = delete;
+    DenseMatrixWrapper(const DenseMatrixWrapper<scalar_t>& D) = default;
 
     /**
      * Constructing a DenseMatrixWrapper from a const DenseMatrix is

diff --git a/src/sparse/fronts/FrontalMatrixBLR.cpp b/src/sparse/fronts/FrontalMatrixBLR.cpp
@@ -423,13 +423,6 @@ namespace strumpack {
         } else
 #endif
           {
-            auto nF11 = F11.normF();
-            auto nF12 = F12.normF();
-            auto nF21 = F21.normF();
-            auto nF = std::sqrt(nF11*nF11 + nF12*nF12 + nF21*nF21);
-            auto lopts = blr_opts;
-            lopts.set_abs_tol(lopts.abs_tol() * nF);
-#if 1
             DenseM_t F11(dsep, dsep), F12(dsep, dupd), F21(dupd, dsep);
             F11.zero(); F12.zero(); F21.zero();
             A.extract_front
@@ -445,30 +438,17 @@ namespace strumpack {
             if (rchild_)
               rchild_->extend_add_to_dense
                 (F11, F12, F21, F22_, this, task_depth);
-            if (dsep)
+            if (dsep) {
+              auto nF11 = F11.normF();
+              auto nF12 = F12.normF();
+              auto nF21 = F21.normF();
+              auto nF = std::sqrt(nF11*nF11 + nF12*nF12 + nF21*nF21);
+              auto lopts = blr_opts;
+              lopts.set_abs_tol(lopts.abs_tol() * nF);
               BLRM_t::construct_and_partial_factor
-                (F11, F12, F21, F22_, F11blr_, piv_, F12blr_, F21blr_,
+                (F11, F12, F21, F22_, F11blr_, F12blr_, F21blr_,
                  sep_tiles_, upd_tiles_, admissibility_, lopts);
-#else
-            F11blr_ = BLRM_t
-              (F11, sep_tiles_, admissibility_, piv_, lopts);
-            F11.clear();
-            if (dupd) {
-              F12.laswp(piv_, true);
-              trsm(Side::L, UpLo::L, Trans::N, Diag::U,
-                   scalar_t(1.), F11blr_, F12, task_depth);
-              F12blr_ = BLRM_t
-                (F12, sep_tiles_, upd_tiles_, lopts);
-              F12.clear();
-              trsm(Side::R, UpLo::U, Trans::N, Diag::N,
-                   scalar_t(1.), F11blr_, F21, task_depth);
-              F21blr_ = BLRM_t
-                (F21, upd_tiles_, sep_tiles_, lopts);
-              F21.clear();
-              gemm(Trans::N, Trans::N, scalar_t(-1.), F21blr_, F12blr_,
-                   scalar_t(1.), F22_, task_depth);
             }
-#endif
           }
       }
     } else { // ACA or BACA

diff --git a/src/sparse/fronts/FrontalMatrixBLRMPI.cpp b/src/sparse/fronts/FrontalMatrixBLRMPI.cpp
@@ -320,7 +320,7 @@ namespace strumpack {
         else
 #endif
           piv_ = BLRMPI_t::partial_factor
-            (F11blr_, F12blr_, F21blr_, F22blr_, adm_, lopts));
+            (F11blr_, F12blr_, F21blr_, F22blr_, adm_, lopts);
       }
     }
     if (opts.print_compressed_front_stats()) {

diff --git a/src/sparse/fronts/FrontalMatrixMAGMA.cpp b/src/sparse/fronts/FrontalMatrixMAGMA.cpp
@@ -850,14 +850,6 @@ namespace strumpack {
       FrontalMatrix<scalar_t,integer_t>::multifrontal_solve(b);
   }
 
-#if defined(STRUMPACK_USE_MPI)
-  template<typename scalar_t,typename integer_t> void
-  FrontalMatrixMAGMA<scalar_t,integer_t>::multifrontal_solve
-  (DenseM_t& b, DistributedMatrix<scalar_t>* bdist) const {
-    multifrontal_solve(b);
-  }
-#endif
-
   template<typename scalar_t,typename integer_t> void
   FrontalMatrixMAGMA<scalar_t,integer_t>::fwd_solve_phase2
   (DenseM_t& b, DenseM_t& bupd, int etree_level, int task_depth) const {

diff --git a/src/sparse/fronts/FrontalMatrixMAGMA.hpp b/src/sparse/fronts/FrontalMatrixMAGMA.hpp
@@ -143,12 +143,6 @@ namespace strumpack {
     factors_on_device(const SpMat_t& A, const Opts_t& opts,
                       std::vector<LInfo_t>& ldata, std::size_t total_dmem);
 
-    void multifrontal_solve(DenseM_t& b) const override;
-#if defined(STRUMPACK_USE_MPI)
-    void multifrontal_solve(DenseM_t& bloc,
-                            DistributedMatrix<scalar_t>* bdist) const override;
-#endif
-
     void fwd_solve_phase2(DenseM_t& b, DenseM_t& bupd,
                           int etree_level, int task_depth) const override;
     void bwd_solve_phase1(DenseM_t& y, DenseM_t& yupd,