Resolve #2162, Fix thread control, reorganize studio prefs, apply studio thread control to groom/optimize

Author: akenmorris

Libs/Common/ShapeworksUtils.cpp

@@ -18,6 +18,7 @@ namespace shapeworks {
 
 unsigned ShapeWorksUtils::rng_seed_ = std::chrono::system_clock::now().time_since_epoch().count();
 std::mt19937 ShapeWorksUtils::mt_;
+std::unique_ptr<tbb::global_control> ShapeWorksUtils::tbb_global_control_;
 
 //-----------------------------------------------------------------------------
 /// looks at the pathname to see if it's a file or a directory or neither
@@ -86,7 +87,9 @@ void ShapeWorksUtils::setup_threads() {
   }
   SW_DEBUG("TBB using {} threads", num_threads);
   Eigen::setNbThreads(num_threads);
-  tbb::global_control c(tbb::global_control::max_allowed_parallelism, num_threads);
+
+  tbb_global_control_ =
+      std::make_unique<tbb::global_control>(tbb::global_control::max_allowed_parallelism, num_threads);
 }
 
 //-----------------------------------------------------------------------------

Libs/Common/ShapeworksUtils.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <oneapi/tbb/global_control.h>
 #include <vtkMatrix4x4.h>
 #include <vtkPolyData.h>
 #include <vtkSmartPointer.h>
@@ -54,6 +55,7 @@ class ShapeWorksUtils {
  private:
   static unsigned rng_seed_;
   static std::mt19937 mt_;
+  static std::unique_ptr<tbb::global_control> tbb_global_control_;
 };
 
 }  // namespace shapeworks

Libs/Groom/Groom.cpp

@@ -47,6 +47,7 @@ bool Groom::run() {
 
   tbb::parallel_for(tbb::blocked_range<size_t>{0, subjects.size()}, [&](const tbb::blocked_range<size_t>& r) {
     for (size_t i = r.begin(); i < r.end(); ++i) {
+      std::cerr << "Thread " << std::this_thread::get_id() << " processing subject " << i << std::endl;
       for (int domain = 0; domain < project_->get_number_of_domains_per_subject(); domain++) {
         if (abort_) {
           success = false;

Studio/Data/Preferences.cpp

@@ -13,6 +13,7 @@
 //-----------------------------------------------------------------------------
 Preferences::Preferences() : settings_("Scientific Computing and Imaging Institute", "ShapeWorksStudio") {
   settings_.setFallbacksEnabled(false);
+  update_threads();
 }
 
 //-----------------------------------------------------------------------------
@@ -47,7 +48,10 @@ void Preferences::set_cache_enabled(bool value) { settings_.setValue("Studio/cac
 bool Preferences::get_parallel_enabled() { return settings_.value("Studio/parallel_enabled", true).toBool(); }
 
 //-----------------------------------------------------------------------------
-void Preferences::set_parallel_enabled(bool value) { settings_.setValue("Studio/parallel_enabled", value); }
+void Preferences::set_parallel_enabled(bool value) {
+  settings_.setValue("Studio/parallel_enabled", value);
+  update_threads();
+}
 
 //-----------------------------------------------------------------------------
 int Preferences::get_memory_cache_percent() { return settings_.value("Studio/memory_cache_percent", 25).toInt(); }
@@ -61,7 +65,10 @@ int Preferences::get_num_threads() {
 }
 
 //-----------------------------------------------------------------------------
-void Preferences::set_num_threads(int num_threads) { settings_.setValue("Studio/num_threads", num_threads); }
+void Preferences::set_num_threads(int num_threads) {
+  settings_.setValue("Studio/num_threads", num_threads);
+  update_threads();
+}
 
 //-----------------------------------------------------------------------------
 float Preferences::get_glyph_size() { return settings_.value("Project/glyph_size", 5.0).toFloat(); }
@@ -325,32 +332,48 @@ void Preferences::update_recent_files() {
   recent_paths_ = no_dupe_paths;
 }
 
+//-----------------------------------------------------------------------------
+void Preferences::update_threads() {
+  int num_threads = get_parallel_enabled() ? get_num_threads() : 1;
+  setenv("TBB_NUM_THREADS", std::to_string(num_threads).c_str(), 1);
+}
+
 //-----------------------------------------------------------------------------
 bool Preferences::get_auto_update_check() { return settings_.value("General/auto_update_check", true).toBool(); }
 
 //-----------------------------------------------------------------------------
 void Preferences::set_auto_update_check(bool enabled) { settings_.setValue("General/auto_update_check", enabled); }
 
+//-----------------------------------------------------------------------------
 QDateTime Preferences::get_update_snooze_until() {
   return settings_.value("General/update_snooze_until", QDateTime()).toDateTime();
 }
 
+//-----------------------------------------------------------------------------
 void Preferences::set_update_snooze_until(QDateTime date) { settings_.setValue("General/update_snooze_until", date); }
 
+//-----------------------------------------------------------------------------
 QString Preferences::get_device_id() {
   QString id = settings_.value("General/device_id", QUuid::createUuid().toString()).toString();
   settings_.setValue("General/device_id", id);
   return id;
 }
 
+//-----------------------------------------------------------------------------
 bool Preferences::get_telemetry_enabled() { return settings_.value("General/telemetry_enabled", true).toBool(); }
+//-----------------------------------------------------------------------------
 void Preferences::set_telemetry_enabled(bool enabled) { settings_.setValue("General/telemetry_enabled", enabled); }
+//-----------------------------------------------------------------------------
 bool Preferences::get_telemetry_asked() { return settings_.value("General/telemetry_asked", false).toBool(); }
+//-----------------------------------------------------------------------------
 void Preferences::set_telemetry_asked(bool asked) { settings_.setValue("General/telemetry_asked", asked); }
 
+//-----------------------------------------------------------------------------
 QStringList Preferences::get_pending_telemetry_events() {
   return settings_.value("Telemetry/pending_events").toStringList();
 }
+
+//-----------------------------------------------------------------------------
 void Preferences::set_pending_telemetry_events(QStringList events) {
   settings_.setValue("Telemetry/pending_events", events);
 }

Studio/Data/Preferences.h

@@ -139,6 +139,7 @@ class Preferences : public QObject {
 
  private:
   void update_recent_files();
+  void update_threads();
   QStringList recent_files_;
   QStringList recent_paths_;
 

Studio/Data/PreferencesWindow.cpp

@@ -35,7 +35,7 @@ PreferencesWindow::PreferencesWindow(QWidget* parent, Preferences& prefs) : pref
   }
 
   ui_->particle_colors->clear();
-  QMetaEnum e = QMetaEnum::fromType<shapeworks::ParticleColors::ParticleColorsType>();
+  QMetaEnum e = QMetaEnum::fromType<ParticleColors::ParticleColorsType>();
   for (int i = 0; i < e.keyCount(); i++) {
     ui_->particle_colors->addItem(e.key(i));
   }