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

Tolerate cpuinfo init failure (#10199)

Browse source 
Tolerate pytorch cpuinfo library init failure.
This commit is contained in:
Chen Fu 2022-01-11 16:31:56 -08:00 committed by GitHub
parent 4048ed326c
commit fb4dea39e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
onnxruntime/core/common/cpuid_info.cc
View file

@ -18,8 +18,21 @@
#endif
#endif
#if defined(CPUIDINFO_ARCH_ARM) && defined(CPUINFO_SUPPORTED)
#include <sys/auxv.h>
#include <asm/hwcap.h>
// N.B. Support building with older versions of asm/hwcap.h that do not define
// this capability bit.
#ifndef HWCAP_ASIMDDP
#define HWCAP_ASIMDDP (1 << 20)
#endif
#endif
#include <mutex>
#include "core/common/cpuid_info.h"
#include "core/common/logging/logging.h"
#include "core/common/logging/severity.h"
#if _WIN32
#define HAS_WINDOWS_DESKTOP WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
@ -57,10 +70,10 @@ CPUIDInfo CPUIDInfo::instance_;
CPUIDInfo::CPUIDInfo() {
#if (defined(CPUIDINFO_ARCH_X86) || defined(CPUIDINFO_ARCH_ARM)) && defined(CPUINFO_SUPPORTED)
if (!cpuinfo_initialize()) {
// Unfortunately we can not capture cpuinfo log!!
ORT_THROW("Failed to initialize CPU info.");
}
pytorch_cpuinfo_init_ = cpuinfo_initialize();
if (!pytorch_cpuinfo_init_) {
LOGS_DEFAULT(WARNING) << "Failed to init pytorch cpuinfo library, may cause CPU EP performance degradation due to undetected CPU features.";
}
#endif
#if defined(CPUIDINFO_ARCH_X86)
@ -99,8 +112,13 @@ CPUIDInfo::CPUIDInfo() {
#ifdef CPUINFO_SUPPORTED
// only works on ARM linux or android, does not work on Windows
is_hybrid_ = cpuinfo_get_uarchs_count() > 1;
has_arm_neon_dot_ = cpuinfo_has_arm_neon_dot();
if (pytorch_cpuinfo_init_) {
is_hybrid_ = cpuinfo_get_uarchs_count() > 1;
has_arm_neon_dot_ = cpuinfo_has_arm_neon_dot();
} else {
has_arm_neon_dot_ = ((getauxval(AT_HWCAP) & HWCAP_ASIMDDP) != 0);
}
#elif defined(_WIN32)
// TODO implement hardware feature detection in windows.
is_hybrid_ = true;

3
onnxruntime/core/common/cpuid_info.h
View file

@ -37,6 +37,9 @@ class CPUIDInfo {
bool has_sse4_1_{false};
bool is_hybrid_{false};
#if (defined(CPUIDINFO_ARCH_X86) || defined(CPUIDINFO_ARCH_ARM)) && defined(CPUINFO_SUPPORTED)
bool pytorch_cpuinfo_init_{false};
#endif
bool has_arm_neon_dot_{false};
static CPUIDInfo instance_;