Skip to content

Commit a3ad1f9

Browse files
[QNN EP] Remove workaround for syntax error macro (microsoft#25923)
### Description Until QAIRT 2.37.0, `QNN_IR_GRAPH_SERIALIZATION_OPTION_INIT` was unusable due to a missing semicolon. Now that it's been fixed, revert the workaround.
1 parent 53bb79b commit a3ad1f9

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ static const char* DlError() {
5656
#endif
5757
}
5858

59-
// Workaround for a missing comma in QNN_IR_GRAPH_CUSTOM_CONFIG_INIT.
60-
static QnnIrGraph_CustomConfig_t EmptyIrGraphConfig() {
61-
return {
62-
QNN_IR_GRAPH_CONFIG_OPTION_SERIALIZATION, {QNN_IR_GRAPH_SERIALIZATION_TYPE_FLAT_BUFFER, ""}};
63-
}
64-
6559
class QnnIrConfig : public QnnSerializerConfig {
6660
public:
6761
QnnIrConfig(std::string backend_path, std::string dlc_dir)
@@ -97,7 +91,7 @@ class QnnIrConfig : public QnnSerializerConfig {
9791

9892
private:
9993
static QnnConfigsBuilder<QnnGraph_Config_t, QnnIrGraph_CustomConfig_t> MakeConfigsBuilder() {
100-
return QnnConfigsBuilder<QnnGraph_Config_t, QnnIrGraph_CustomConfig_t>(QNN_GRAPH_CONFIG_INIT, EmptyIrGraphConfig());
94+
return QnnConfigsBuilder<QnnGraph_Config_t, QnnIrGraph_CustomConfig_t>(QNN_GRAPH_CONFIG_INIT, QNN_IR_GRAPH_CUSTOM_CONFIG_INIT);
10195
}
10296

10397
std::filesystem::path dlc_dir_;

0 commit comments

Comments
 (0)