diff --git a/apps/texrecon/texrecon.cpp b/apps/texrecon/texrecon.cpp index 42568302..5b132cf5 100644 --- a/apps/texrecon/texrecon.cpp +++ b/apps/texrecon/texrecon.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -60,10 +60,12 @@ int main(int argc, char **argv) { } // Set the number of threads to use. - tbb::task_scheduler_init schedule(conf.num_threads > 0 ? conf.num_threads : tbb::task_scheduler_init::automatic); - if (conf.num_threads > 0) { + if (num_threads > 0) { omp_set_dynamic(0); omp_set_num_threads(conf.num_threads); + } else { + omp_set_dynamic(1); + omp_set_num_threads(oneapi::tbb::info::default_concurrency()); } std::cout << "Load and prepare mesh: " << std::endl; diff --git a/elibs/CMakeLists.txt b/elibs/CMakeLists.txt index 4c17eb8d..0e4c833e 100644 --- a/elibs/CMakeLists.txt +++ b/elibs/CMakeLists.txt @@ -1,7 +1,7 @@ externalproject_add(ext_mapmap PREFIX ext_mapmap GIT_REPOSITORY https://github.com/dthuerck/mapmap_cpu.git - GIT_TAG 55d14fd + GIT_TAG fa526e0 UPDATE_COMMAND "" SOURCE_DIR ${CMAKE_SOURCE_DIR}/elibs/mapmap CONFIGURE_COMMAND "" diff --git a/elibs/tbb/FindTBB.cmake b/elibs/tbb/FindTBB.cmake index a1131aad..cc72075a 100644 --- a/elibs/tbb/FindTBB.cmake +++ b/elibs/tbb/FindTBB.cmake @@ -184,7 +184,7 @@ if(NOT TBB_FOUND) ################################## if(TBB_INCLUDE_DIRS) - file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file) + file(READ "${TBB_INCLUDE_DIRS}/tbb/version.h" _tbb_version_file) string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" TBB_VERSION_MAJOR "${_tbb_version_file}") string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"