saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-06 00:03:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix native onnxruntime library not loading in Azure App Service (#16286)

Browse source 
### Description
<!-- Describe your changes. -->
SetThreadDescription isn't available in an Azure App Service sandbox.
#15219 removed a check that it was available, making it a hard
dependency. When it's not available the dll load fails with a 'procedure
not found' error.

Add back the check.

### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->

#15375 - although note this has nothing to do with the original issue.
This is just for
https://github.com/microsoft/onnxruntime/issues/15375#issuecomment-1579464889
This commit is contained in:
Scott McKay 2023-06-09 18:40:51 +10:00 committed by GitHub
parent a9d47f72a4
commit 443f553782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
onnxruntime/core/platform/windows/env.cc
View file

@ -137,12 +137,20 @@ class WindowsThread : public EnvThread {
static unsigned __stdcall ThreadMain(void* param) {
std::unique_ptr<Param> p(static_cast<Param*>(param));
const ORTCHAR_T* name_prefix =
(p->name_prefix == nullptr || wcslen(p->name_prefix) == 0) ? L"onnxruntime" : p->name_prefix;
std::wostringstream oss;
oss << name_prefix << "-" << p->index;
// Ignore the error
(void)SetThreadDescription(GetCurrentThread(), oss.str().c_str());
// Not all machines have kernel32.dll and/or SetThreadDescription (e.g. Azure App Service sandbox)
// so we need to ensure it's available before calling.
HMODULE kernelModule = GetModuleHandle(TEXT("kernel32.dll"));
if (kernelModule != nullptr) {
auto setThreadDescriptionFn = (SetThreadDescriptionFunc)GetProcAddress(kernelModule, "SetThreadDescription");
if (setThreadDescriptionFn != nullptr) {
const ORTCHAR_T* name_prefix = (p->name_prefix == nullptr || wcslen(p->name_prefix) == 0) ? L"onnxruntime"
: p->name_prefix;
std::wostringstream oss;
oss << name_prefix << "-" << p->index;
// Ignore any errors
(void)(setThreadDescriptionFn)(GetCurrentThread(), oss.str().c_str());
}
}
unsigned ret = 0;
ORT_TRY {