Merge branch 'master' of github.com:pghysels/STRUMPACK

pghysels · Dec 14, 2023 · 90dcaaa · 90dcaaa
2 parents cc81fc7 + b2a81bc
commit 90dcaaa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -657,10 +657,10 @@ endif()
 if(MKL_FOUND)
   # target_link_libraries(strumpack PUBLIC MKL::MKL MKL::MKL_SYCL)
   target_include_directories(strumpack INTERFACE "${MKL_ROOT}/include")
-  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/intel64/libmkl_sycl.so")
-  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/intel64/libmkl_sequential.so")
-  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/intel64/libmkl_core.so")
-  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/intel64/libmkl_intel_lp64.so")
+  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/libmkl_sycl.so")
+  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/libmkl_sequential.so")
+  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/libmkl_core.so")
+  target_link_libraries(strumpack INTERFACE "${MKL_ROOT}/lib/libmkl_intel_lp64.so")
   target_link_libraries(strumpack INTERFACE "-lsycl -lpthread -lm -ldl")
 endif()
 

diff --git a/src/SparseSolverBase.cpp b/src/SparseSolverBase.cpp
@@ -578,11 +578,7 @@ namespace strumpack {
     flop_breakdown_reset();
     ReturnCode err_code;
     TaskTimer t1("Sparse-factorization", [&]() {
-      if (opts_.replace_tiny_pivots() && opts_.matching() == MatchingJob::NONE) {
-        auto shifted_mat = matrix_nonzero_diag();
-        err_code = tree()->multifrontal_factorization(*shifted_mat, opts_);
-      } else
-        err_code = tree()->multifrontal_factorization(*matrix(), opts_);
+      err_code = tree()->multifrontal_factorization(*matrix(), opts_);
     });
     perf_counters_stop("numerical factorization");
     if (opts_.verbose()) {

diff --git a/src/misc/Tools.hpp b/src/misc/Tools.hpp
@@ -211,17 +211,17 @@ namespace strumpack {
 
     void clear() {
       data_.clear();
+#if defined(STRUMPACK_USE_GPU)
       device_bytes_.clear();
       pinned_data_.clear();
+#endif
     }
 
   private:
     std::vector<std::vector<scalar_t,NoInit<scalar_t>>> data_;
 #if defined(STRUMPACK_USE_GPU)
-    // std::vector<gpu::DeviceMemory<scalar_t>> device_data_;
     std::vector<gpu::DeviceMemory<char>> device_bytes_;
     std::vector<gpu::HostMemory<scalar_t>> pinned_data_;
-    // TODO keep streams? magma queues?
 #endif
   };