diff --git a/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc b/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc index eba0a8c2615aa..52060489e7c54 100644 --- a/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc +++ b/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc @@ -445,6 +445,7 @@ void QnnLogging(const char* format, QnnLog_Level_t level, uint64_t timestamp, va_list argument_parameter) { + ORT_UNUSED_PARAMETER(level); ORT_UNUSED_PARAMETER(timestamp); if (!::onnxruntime::logging::LoggingManager::HasDefaultLogger()) { @@ -454,8 +455,7 @@ void QnnLogging(const char* format, } const auto& logger = ::onnxruntime::logging::LoggingManager::DefaultLogger(); - // Map QNN log level to ORT severity - logging::Severity severity = QnnBackendManager::MapQNNLogLevelToOrtSeverity(level); + const auto severity = ::onnxruntime::logging::Severity::kVERBOSE; const auto data_type = ::onnxruntime::logging::DataType::SYSTEM; if (logger.OutputIsEnabled(severity, data_type)) { @@ -529,22 +529,6 @@ QnnLog_Level_t QnnBackendManager::MapOrtSeverityToQNNLogLevel(logging::Severity } } -/* static */ logging::Severity QnnBackendManager::MapQNNLogLevelToOrtSeverity(QnnLog_Level_t qnn_log_level) { - // Map QNN log level to ORT log severity - switch (qnn_log_level) { - case QNN_LOG_LEVEL_VERBOSE: - case QNN_LOG_LEVEL_DEBUG: - return logging::Severity::kVERBOSE; - case QNN_LOG_LEVEL_INFO: - return logging::Severity::kINFO; - case QNN_LOG_LEVEL_WARN: - return logging::Severity::kWARNING; - case QNN_LOG_LEVEL_ERROR: - default: - return logging::Severity::kERROR; - } -} - Status QnnBackendManager::ResetQnnLogLevel(std::optional ort_log_level) { std::lock_guard lock(logger_recursive_mutex_); if (!backend_setup_completed_ || logger_ == nullptr) { diff --git a/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h b/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h index dfa40a2c8aa0d..fe4ec0b7018a5 100644 --- a/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h +++ b/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h @@ -270,9 +270,6 @@ class QnnBackendManager : public std::enable_shared_from_this Qnn_ErrorHandle_t ReleaseDmaData(Qnn_ContextBinaryDmaDataMem_t data_mem, void* mapped_base_ptr); #endif - QnnLog_Level_t MapOrtSeverityToQNNLogLevel(logging::Severity ort_log_level); - static logging::Severity MapQNNLogLevelToOrtSeverity(QnnLog_Level_t qnn_log_level); - #ifdef QNN_FILE_MAPPED_WEIGHTS_AVAILABLE typedef struct FileMappingCallbackInfo { void* const mapped_file_ptr; @@ -379,6 +376,7 @@ class QnnBackendManager : public std::enable_shared_from_this const char* QnnProfileErrorToString(QnnProfile_Error_t error); std::string QnnErrorHandleToString(Qnn_ErrorHandle_t error); + QnnLog_Level_t MapOrtSeverityToQNNLogLevel(logging::Severity ort_log_level); // Adds a new QNN context. // Transfers ownership of `context_handle` (i.e., responsibility of freeing it) to this instance