Skip to content

Commit 32f829b

Browse files
committed
Remove backend_setup_completed_
1 parent 394765d commit 32f829b

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ QnnLog_Level_t QnnBackendManager::MapOrtSeverityToQNNLogLevel(logging::Severity
307307

308308
Status QnnBackendManager::ResetQnnLogLevel(std::optional<logging::Severity> ort_log_level) {
309309
std::lock_guard<std::recursive_mutex> lock(logger_recursive_mutex_);
310-
if (!backend_setup_completed_ || logger_ == nullptr) {
310+
if (logger_ == nullptr) {
311311
return Status::OK();
312312
}
313313
ORT_RETURN_IF(nullptr == log_handle_, "Unable to update QNN Log Level. Invalid QNN log handle.");
@@ -797,10 +797,6 @@ Status QnnBackendManager::SetupBackend(const logging::Logger& logger,
797797
bool load_from_cached_context,
798798
bool need_load_system_lib) {
799799
std::lock_guard<std::recursive_mutex> lock(logger_recursive_mutex_);
800-
if (backend_setup_completed_) {
801-
LOGS(logger, VERBOSE) << "Backend setup already!";
802-
return Status::OK();
803-
}
804800

805801
Status status = Status::OK();
806802
if (qnn_saver_path_.empty()) {
@@ -861,10 +857,8 @@ Status QnnBackendManager::SetupBackend(const logging::Logger& logger,
861857

862858
if (status.IsOK()) {
863859
LOGS(logger, VERBOSE) << "QNN SetupBackend succeed";
864-
backend_setup_completed_ = true;
865860
} else {
866861
LOGS_DEFAULT(WARNING) << "Failed to setup so cleaning up";
867-
backend_setup_completed_ = true; // Otherwise release will do nothing
868862
ReleaseResources();
869863
}
870864

@@ -1092,10 +1086,6 @@ Status QnnBackendManager::TerminateQnnLog() {
10921086
}
10931087

10941088
void QnnBackendManager::ReleaseResources() {
1095-
if (!backend_setup_completed_) {
1096-
return;
1097-
}
1098-
10991089
auto result = ReleaseContext();
11001090
if (Status::OK() != result) {
11011091
LOGS_DEFAULT(ERROR) << "Failed to ReleaseContext.";
@@ -1127,10 +1117,6 @@ void QnnBackendManager::ReleaseResources() {
11271117
LOGS_DEFAULT(ERROR) << "Failed to unload backend library.";
11281118
}
11291119
}
1130-
1131-
backend_setup_completed_ = false;
1132-
1133-
return;
11341120
}
11351121

11361122
Status QnnBackendManager::ExtractBackendProfilingInfo() {

onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ class QnnBackendManager {
250250
bool backend_initialized_ = false;
251251
bool device_created_ = false;
252252
bool context_created_ = false;
253-
bool backend_setup_completed_ = false;
254253
// NPU backend requires quantized model
255254
QnnBackendType qnn_backend_type_ = QnnBackendType::CPU;
256255
Qnn_ProfileHandle_t profile_backend_handle_ = nullptr;

0 commit comments

Comments
 (0)