Destruct scheduler before instances on model destructor

triton-inference-server · Jun 28, 2023 · 10a0b7f · 10a0b7f
1 parent 5adf085
commit 10a0b7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/backend_model.cc b/src/backend_model.cc
@@ -634,6 +634,9 @@ TritonModel::~TritonModel()
   // Clear library handles.
   ClearHandles();
 
+  // Explicitly delete/finalize the scheduler before the model instances.
+  scheduler_.reset(nullptr);
+
   // Explicitly delete/finalize all model instances before finalizing
   // the model itself.
   instances_.clear();

diff --git a/src/sequence_batch_scheduler.cc b/src/sequence_batch_scheduler.cc
@@ -1429,18 +1429,16 @@ DirectSequenceBatch::BatcherThread(const int nice)
 #ifndef _WIN32
   if (setpriority(PRIO_PROCESS, syscall(SYS_gettid), nice) == 0) {
     LOG_VERBOSE(1) << "Starting Direct sequence-batch scheduler thread "
-                   << model_instance_->Name() << " [" << (size_t)model_instance_
-                   << "] at nice " << nice << "...";
+                   << model_instance_->Name() << " at nice " << nice << "...";
   } else {
     LOG_VERBOSE(1) << "Starting Direct sequence-batch scheduler thread "
-                   << model_instance_->Name() << " [" << (size_t)model_instance_
-                   << "] at default nice (requested nice " << nice
+                   << model_instance_->Name()
+                   << " at default nice (requested nice " << nice
                    << " failed)...";
   }
 #else
   LOG_VERBOSE(1) << "Starting Direct sequence-batch scheduler thread "
-                 << model_instance_->Name() << " [" << (size_t)model_instance_
-                 << "] at default nice...";
+                 << model_instance_->Name() << " at default nice...";
 #endif
 
   // For debugging and testing, delay start of thread until queues
@@ -1742,7 +1740,7 @@ DirectSequenceBatch::BatcherThread(const int nice)
   }  // end runner loop
 
   LOG_VERBOSE(1) << "Stopping Direct sequence-batch scheduler thread "
-                 << (size_t)model_instance_ << "...";
+                 << model_instance_->Name() << "...";
 }
 
 OldestSequenceBatch::OldestSequenceBatch(