fix: Fix requested output deleting extra outputs (triton-inference-server#390)

kthui · web-flow · commit b771f4f2f3fa · 2024-12-11T14:05:59.000-08:00
* fix: Hold GIL when deleting numpy array

* chore: setting py obj to None may not destruct the object
diff --git a/src/pb_stub.cc b/src/pb_stub.cc
@@ -1032,9 +1032,9 @@ Stub::~Stub()
 
   {
     py::gil_scoped_acquire acquire;
-    async_event_loop_ = py::none();
-    background_futures_ = py::none();
-    model_instance_ = py::none();
+    py::object async_event_loop_local(std::move(async_event_loop_));
+    py::object background_futures_local(std::move(background_futures_));
+    py::object model_instance_local(std::move(model_instance_));
   }
   stub_instance_.reset();
   stub_message_queue_.reset();
diff --git a/src/pb_tensor.cc b/src/pb_tensor.cc
@@ -503,6 +503,14 @@ PbTensor::~PbTensor() noexcept(false)
 {
   pb_memory_.reset();
   DeleteDLPack();
+
+#ifdef TRITON_PB_STUB
+  {
+    py::gil_scoped_acquire acquire;
+    py::array numpy_array_local(std::move(numpy_array_));
+    py::array numpy_array_serialized_local(std::move(numpy_array_serialized_));
+  }
+#endif
 }
 
 const std::string&

Original file line number	Diff line number	Diff line change
`@@ -1032,9 +1032,9 @@ Stub::~Stub()`
`1032`	`1032`
`1033`	`1033`	`{`
`1034`	`1034`	`py::gil_scoped_acquire acquire;`
`1035`		`- async_event_loop_ = py::none();`
`1036`		`- background_futures_ = py::none();`
`1037`		`- model_instance_ = py::none();`
	`1035`	`+ py::object async_event_loop_local(std::move(async_event_loop_));`
	`1036`	`+ py::object background_futures_local(std::move(background_futures_));`
	`1037`	`+ py::object model_instance_local(std::move(model_instance_));`
`1038`	`1038`	`}`
`1039`	`1039`	`stub_instance_.reset();`
`1040`	`1040`	`stub_message_queue_.reset();`
Original file line number	Diff line number	Diff line change
`@@ -503,6 +503,14 @@ PbTensor::~PbTensor() noexcept(false)`
`503`	`503`	`{`
`504`	`504`	`pb_memory_.reset();`
`505`	`505`	`DeleteDLPack();`
	`506`	`+`
	`507`	`+#ifdef TRITON_PB_STUB`
	`508`	`+ {`
	`509`	`+ py::gil_scoped_acquire acquire;`
	`510`	`+ py::array numpy_array_local(std::move(numpy_array_));`
	`511`	`+ py::array numpy_array_serialized_local(std::move(numpy_array_serialized_));`
	`512`	`+ }`
	`513`	`+#endif`
`506`	`514`	`}`
`507`	`515`
`508`	`516`	`const std::string&`