Add CloseDefaultThreadPool

Author: snnn

onnxruntime/test/onnx/main.cc

@@ -346,18 +346,19 @@ int real_main(int argc, char* argv[]) {
       result = -1;
     }
   }
-
   return result;
 }
 #ifdef _WIN32
 int wmain(int argc, wchar_t* argv[]) {
 #else
 int main(int argc, char* argv[]) {
 #endif
+  int ret = -1;
   try {
-    return real_main(argc, argv);
+    ret = real_main(argc, argv);
   } catch (std::exception& ex) {
     fprintf(stderr, "%s\n", ex.what());
-    return -1;
   }
+  CloseDefaultThreadPool();
+  return ret;
 }

onnxruntime/test/onnx/sync_api.h

@@ -23,6 +23,7 @@ using ORT_CALLBACK_FUNCTION = PTP_WORK_CALLBACK;
 inline PThreadPool GetDefaultThreadPool(const ::onnxruntime::Env&) {
   return nullptr;
 }
+inline void CloseDefaultThreadPool() {}
 #else
 #define ORT_CALLBACK
 namespace Eigen {
@@ -38,10 +39,11 @@ using ORT_CALLBACK_INSTANCE = OnnxRuntimeCallbackInstance*;
 using ORT_CALLBACK_FUNCTION = void ORT_CALLBACK (*)(ORT_CALLBACK_INSTANCE pci, void* context, ORT_WORK work);
 //Do nothing
 inline void OnnxRuntimeCloseThreadpoolWork(ORT_WORK) {}
-#endif
-
+void CloseDefaultThreadPool();
 //The returned value will be used with CreateAndSubmitThreadpoolWork function
 PThreadPool GetDefaultThreadPool(const ::onnxruntime::Env& env);
+#endif
+
 //On Windows, the last parameter can be null, in that case it will use the default thread pool.
 //On Linux, there is no per process default thread pool. You have to pass a non-null pointer.
 //Caller must delete the data pointer if this function returns a non-ok status. Otherwise, the ownership is transferred

onnxruntime/test/onnx/sync_api_linux.cc

@@ -63,6 +63,10 @@ PThreadPool GetDefaultThreadPool(const onnxruntime::Env& env) {
   return default_pool.get();
 }
 
+void CloseDefaultThreadPool() {
+  default_pool.reset();
+}
+
 Status OnnxRuntimeSetEventWhenCallbackReturns(ORT_CALLBACK_INSTANCE pci, ORT_EVENT finish_event) {
   if (finish_event == nullptr)
     return Status(onnxruntime::common::ONNXRUNTIME, onnxruntime::common::INVALID_ARGUMENT, "");