Use tbb allocator

TLCFEM · Aug 11, 2023 · 0be8d0b · 0be8d0b
1 parent fe6d316
commit 0be8d0b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/Domain/MetaMat/SparseMatFGMRES.hpp b/Domain/MetaMat/SparseMatFGMRES.hpp
@@ -61,9 +61,7 @@ template<sp_d T> class SparseMatBaseFGMRES : public SparseMat<T> {
     SparseMatBaseFGMRES& operator=(const SparseMatBaseFGMRES&) = delete;
     SparseMatBaseFGMRES& operator=(SparseMatBaseFGMRES&&) noexcept = delete;
 
-    ~SparseMatBaseFGMRES() override {
-        mkl_free_buffers();
-    }
+    ~SparseMatBaseFGMRES() override = default;
 };
 
 template<sp_d T> int SparseMatBaseFGMRES<T>::direct_solve(Mat<T>& X, const Mat<T>& B) {

diff --git a/Option.cmake b/Option.cmake
@@ -97,7 +97,7 @@ if (USE_MKL)
         message(FATAL_ERROR "The mkl.h is not found under the path: ${MKLROOT}/include")
     endif ()
     add_compile_definitions(SUANPAN_MKL)
-    add_compile_definitions(ARMA_USE_MKL_ALLOC)
+    # add_compile_definitions(ARMA_USE_MKL_ALLOC)
     include_directories(${MKLROOT}/include)
     link_directories(${MKLROOT}/lib/intel64)
     if (USE_MPI)
@@ -202,11 +202,13 @@ endif ()
 if (BUILD_MULTITHREAD)
     message("USING TBB LIBRARY")
     add_compile_definitions(SUANPAN_MT)
+    add_compile_definitions(ARMA_USE_TBB_ALLOC)
     if (COMPILER_IDENTIFIER MATCHES "gcc-win")
         link_libraries(tbb12)
     else ()
         link_libraries(tbb)
     endif ()
+    link_libraries(tbbmalloc tbbmalloc_proxy)
 endif ()
 
 if (BUILD_SHARED)

diff --git a/suanPan.cpp b/suanPan.cpp
@@ -23,6 +23,10 @@
 #include <Windows.h>
 #endif
 
+#ifdef SUANPAN_MKL
+extern "C" void mkl_free_buffers(void);
+#endif
+
 // ReSharper disable once CppParameterMayBeConst
 int main(int argc, char** argv) {
 #ifdef SUANPAN_WIN
@@ -44,5 +48,9 @@ int main(int argc, char** argv) {
 
     lis_finalize();
 
+#ifdef SUANPAN_MKL
+    std::atexit(mkl_free_buffers);
+#endif
+
     return SUANPAN_SUCCESS;
 }