Adding check for CLI mode, to hide some messages

Author: akenmorris

Applications/shapeworks/Commands.cpp

@@ -421,6 +421,7 @@ bool DeepSSMCommand::execute(const optparse::Values& options, SharedCommandData&
   project->load(project_file);
 
   PythonWorker python_worker;
+  python_worker.set_cli_mode(true);
 
   auto wait_for_job = [&](auto job) {
     // This lambda will block until the job is complete

Libs/Application/Job/PythonWorker.cpp

@@ -37,11 +37,17 @@ class PythonLogger {
 
   bool check_abort() { return aborted_; }
 
+  bool is_cli_mode() { return is_cli_mode_; }
+
+  void set_cli_mode(bool cli) { is_cli_mode_ = cli; }
+
  private:
   std::function<void(std::string)> callback_;
   std::function<void(double, std::string)> progress_callback_;
 
   std::atomic<bool> aborted_{false};
+
+  std::atomic<bool> is_cli_mode_{false};
 };
 
 //---------------------------------------------------------------------------
@@ -50,7 +56,8 @@ PYBIND11_EMBEDDED_MODULE(logger, m) {
       .def(py::init<>())
       .def("log", &PythonLogger::cpp_log)
       .def("check_abort", &PythonLogger::check_abort)
-      .def("progress", &PythonLogger::cpp_progress);
+      .def("progress", &PythonLogger::cpp_progress)
+      .def("is_cli_mode", &PythonLogger::is_cli_mode);
 };
 
 //---------------------------------------------------------------------------
@@ -79,6 +86,9 @@ void PythonWorker::set_vtk_output_window(vtkSmartPointer<ShapeWorksVtkOutputWind
   studio_vtk_output_window_ = output_window;
 }
 
+//---------------------------------------------------------------------------
+void PythonWorker::set_cli_mode(bool cli_mode) { python_logger_->set_cli_mode(cli_mode); }
+
 //---------------------------------------------------------------------------
 void PythonWorker::start_job(QSharedPointer<Job> job) {
   if (init()) {

Libs/Application/Job/PythonWorker.h

@@ -24,6 +24,7 @@ class PythonWorker : public QObject {
   ~PythonWorker();
 
   void set_vtk_output_window(vtkSmartPointer<ShapeWorksVtkOutputWindow> output_window);
+  void set_cli_mode(bool cli_mode);
 
   void run_job(QSharedPointer<Job> job);
   void set_current_job(QSharedPointer<Job> job);

Python/DeepSSMUtilsPackage/DeepSSMUtils/run_utils.py

@@ -538,6 +538,7 @@ def process_test_predictions(project, config_file):
                                               template_particles, template_mesh, pred_dir)
 
     print("Distances: ", distances)
+    print("Mean distance: ", np.mean(distances))
 
     # write to csv file in deepssm_dir
     csv_file = f"{deepssm_dir}/test_distances.csv"

Python/DeepSSMUtilsPackage/DeepSSMUtils/trainer.py

@@ -167,7 +167,8 @@ def supervised_train(config_file):
         if sw_check_abort():
             sw_message("Aborted")
             return
-        sw_message(f"Epoch {e}/{num_epochs}")
+        if not sw_is_cli_mode():
+            sw_message(f"Epoch {e}/{num_epochs}")
         sw_progress(e / (num_epochs + 1))
 
         torch.cuda.empty_cache()

Python/shapeworks/shapeworks/utils.py

@@ -198,6 +198,13 @@ def sw_check_abort():
     else:
         return False
 
+def sw_is_cli_mode():
+    """Check if the current mode is CLI mode"""
+    global sw_logger
+    if sw_logger is not None:
+        return sw_logger.is_cli_mode()
+    else:
+        return False
 
 def sw_progress(progress, message=""):
     """If sw_logger is set, use it, otherwise do nothing"""