Code Review

Author: winskuo-quic

backends/qualcomm/_passes/convert_conv1d_to_conv2d.py

@@ -105,7 +105,7 @@ def call(self, graph_module: torch.fx.GraphModule):
                         padding = [0] + node.args[4] if num_args > 4 else [0, 0]
                         if node.target == torch.ops.aten.conv1d.default:
                             dilation = [1] + node.args[5] if num_args > 5 else [1, 1]
-                            groups = node.args[6] if num_args > 5 else 1
+                            groups = node.args[6] if num_args > 6 else 1
                             conv_args = (
                                 qdq_node_after_unsqueeze,
                                 node.args[1],

backends/qualcomm/runtime/QnnBackendOptions.h

@@ -7,13 +7,10 @@
  */
 #pragma once
 
+#include <executorch/backends/qualcomm/runtime/QnnExecuTorch.h>
 #include <executorch/runtime/backend/interface.h>
 #include <executorch/runtime/backend/options.h>
 
-#define QNN_RUNTIME_LOG_LEVEL "qnn_runtime_log_level"
-#define QNN_RUNTIME_HTP_PERFORMANCE_MODE "qnn_runtime_htp_performance_mode"
-#define QNN_RUNTIME_PROFILE_LEVEL "qnn_runtime_profile_level"
-
 namespace executorch {
 namespace backends {
 namespace qnn {

backends/qualcomm/runtime/QnnExecuTorch.h

@@ -16,6 +16,11 @@
 #include <stdint.h>
 #endif
 
+#define QNN_BACKEND "QnnBackend"
+#define QNN_RUNTIME_LOG_LEVEL "qnn_runtime_log_level"
+#define QNN_RUNTIME_HTP_PERFORMANCE_MODE "qnn_runtime_htp_performance_mode"
+#define QNN_RUNTIME_PROFILE_LEVEL "qnn_runtime_profile_level"
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus

backends/qualcomm/runtime/QnnExecuTorchBackend.h

@@ -19,7 +19,6 @@ namespace executorch {
 namespace backends {
 namespace qnn {
 
-constexpr const char* QNN_BACKEND = "QnnBackend";
 class QnnExecuTorchBackend final
     : public ::executorch::runtime::BackendInterface {
  public:

examples/qualcomm/executor_runner/qnn_executor_runner.cpp

@@ -17,13 +17,10 @@
  * Currently we assume that the outputs are all fp32 tensors.
  */
 
-#include <executorch/backends/qualcomm/runtime/QnnBackendOptions.h>
 #include <executorch/backends/qualcomm/runtime/QnnExecuTorch.h>
-#include <executorch/backends/qualcomm/runtime/QnnExecuTorchBackend.h>
 #include <executorch/devtools/etdump/etdump_flatcc.h>
 #include <executorch/extension/data_loader/file_data_loader.h>
 #include <executorch/extension/runner_util/inputs.h>
-#include <executorch/runtime/backend/backend_option_context.h>
 #include <executorch/runtime/backend/interface.h>
 #include <executorch/runtime/backend/options.h>
 #include <executorch/runtime/core/memory_allocator.h>
@@ -114,7 +111,6 @@ DEFINE_int32(
 
 using executorch::aten::Tensor;
 using executorch::aten::TensorImpl;
-using executorch::backends::qnn::QNN_BACKEND;
 using executorch::etdump::ETDumpGen;
 using executorch::etdump::ETDumpResult;
 using executorch::extension::FileDataLoader;