using TBB, better GC

Author: fschlimb

CMakeLists.txt

@@ -20,7 +20,7 @@ find_package(pybind11 CONFIG)
 find_package(MPI REQUIRED)
 #find_package(OpenMP)
 
-set(MKL_LIBRARIES -L$ENV{MKLROOT}/lib -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -ltbb -lpthread -lrt -ldl -lm)
+set(MKL_LIBRARIES -L$ENV{MKLROOT}/lib -lmkl_intel_lp64 -lmkl_tbb_thread -lmkl_core -ltbb -lpthread -lrt -ldl -lm)
 #set(CMAKE_INSTALL_RPATH $ENV{MKLROOT}/lib)
 # Use -fPIC even if statically compiled
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -42,7 +42,7 @@ set(MyCppSources ${MyCppSources} ${P2C_HPP})
 
 pybind11_add_module(_ddptensor MODULE ${MyCppSources})
 
-target_compile_definitions(_ddptensor PRIVATE XTENSOR_USE_XSIMD=1 XTENSOR_USE_OPENMP=1 DDPT_2TYPES=1 USE_MKL=1)
+target_compile_definitions(_ddptensor PRIVATE XTENSOR_USE_XSIMD=1 XTENSOR_USE_TBB=1 DDPT_2TYPES=1 USE_MKL=1)
 target_include_directories(_ddptensor PRIVATE
   ${PROJECT_SOURCE_DIR}/src/include
   ${PROJECT_SOURCE_DIR}/third_party/xtl/include
@@ -52,5 +52,5 @@ target_include_directories(_ddptensor PRIVATE
   ${PROJECT_SOURCE_DIR}/third_party/bitsery/include
   ${MPI_INCLUDE_PATH} $ENV{MKLROOT}/include
   ${pybind11_INCLUDE_DIRS})
-target_compile_options(_ddptensor PRIVATE -fopenmp)
+#target_compile_options(_ddptensor PRIVATE -fopenmp)
 target_link_libraries(_ddptensor PRIVATE ${MPI_C_LIBRARIES} ${MKL_LIBRARIES})

setup.py

@@ -29,7 +29,7 @@ def build_cmake(self, ext):
         extdir.parent.mkdir(parents=True, exist_ok=True)
 
         # example of cmake args
-        config = 'Debug'# if self.debug else 'Release' #'RelWithDebInfo'
+        config = 'Debug' if self.debug else 'Release'  # 'RelWithDebInfo' #'Release'
         cmake_args = [
             '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + str(extdir.parent.absolute()),
             '-DCMAKE_BUILD_TYPE=' + config

src/include/ddptensor/x.hpp

@@ -123,7 +123,7 @@ namespace x
 
         ~DPTensorX()
         {
-            // if(_id != Mediator::LOCAL_ONLY && theMediator) theMediator->unregister_array(_id);
+            if(_id != Mediator::LOCAL_ONLY && theMediator) theMediator->unregister_array(_id);
         }
 
         bool is_sliced() const