Skip to content
Snippets Groups Projects
Commit 573ab366 authored by Dr. Felix Tobias Schindler's avatar Dr. Felix Tobias Schindler
Browse files

[parallel.threadmanager] sort includes

parent fe0aab3f
No related branches found
No related tags found
No related merge requests found
...@@ -8,21 +8,31 @@ ...@@ -8,21 +8,31 @@
// Tobias Leibner (2014 - 2015) // Tobias Leibner (2014 - 2015)
#include "config.h" #include "config.h"
#include "threadmanager.hh"
#if HAVE_TBB
#include <thread>
#endif
#include <boost/numeric/conversion/cast.hpp> #include <boost/numeric/conversion/cast.hpp>
#include <dune/xt/common/configuration.hh> #if HAVE_EIGEN
#include <Eigen/Core>
#endif
#if HAVE_TBB
#include <tbb/task_scheduler_init.h>
#endif
#include <dune/common/exceptions.hh> #include <dune/common/exceptions.hh>
#include <dune/xt/common/configuration.hh>
#include <dune/xt/common/fem.hh> #include <dune/xt/common/fem.hh>
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/misc/threads/threadmanager.hh> #include <dune/fem/misc/threads/threadmanager.hh>
#endif #endif
#if HAVE_EIGEN #include "threadmanager.hh"
#include <Eigen/Core>
#endif
// some assertions only make sense if dune-fem's threading manager is non-trivial // some assertions only make sense if dune-fem's threading manager is non-trivial
#if defined(USE_PTHREADS) || defined(_OPENMP) #if defined(USE_PTHREADS) || defined(_OPENMP)
...@@ -33,9 +43,6 @@ ...@@ -33,9 +43,6 @@
#if HAVE_TBB #if HAVE_TBB
#include <thread>
#include <tbb/task_scheduler_init.h>
size_t Dune::XT::Common::ThreadManager::max_threads() size_t Dune::XT::Common::ThreadManager::max_threads()
{ {
const auto threads = DXTC_CONFIG_GET("threading.max_count", 1); const auto threads = DXTC_CONFIG_GET("threading.max_count", 1);
...@@ -131,4 +138,4 @@ Dune::XT::Common::ThreadManager::ThreadManager() ...@@ -131,4 +138,4 @@ Dune::XT::Common::ThreadManager::ThreadManager()
{ {
} }
#endif // HAVE_DUNE_FEM #endif // HAVE_TBB
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment