[Apply latest review comment]

- change target logging to qnn_logging inside backends/qualcomm/CMakeList.txt
- apply lintrunner to the left files

Author: Hao-Wei Hsu

backends/qualcomm/CMakeLists.txt

@@ -23,7 +23,8 @@ get_filename_component(_common_include_directories
                        ABSOLUTE)
 
 if(NOT DEFINED QNN_SDK_ROOT)
-    message(FATAL_ERROR "Please define QNN_SDK_ROOT, e.g., cmake <..> -DQNN_SDK_ROOT=<...>")
+    message(FATAL_ERROR
+            "Please define QNN_SDK_ROOT, e.g. cmake <..> -DQNN_SDK_ROOT=<...>")
 endif()
 
 message(STATUS "Using qnn sdk root ${QNN_SDK_ROOT}")
@@ -82,7 +83,7 @@ add_library(qnn_graph STATIC)
 add_library(qnn_backend STATIC)
 add_library(qnn_factory STATIC)
 add_library(qnn_header INTERFACE)
-add_library(logging STATIC)
+add_library(qnn_logging STATIC)
 add_library(wrappers STATIC)
 add_library(utils STATIC)
 
@@ -101,7 +102,7 @@ target_link_libraries(qnn_implementation
     PRIVATE
     qnn_function_interface
     qnn_header
-    logging
+    qnn_logging
     ${CMAKE_DL_LIBS}
 )
 target_link_libraries(qnn_sys_function_interface
@@ -112,7 +113,7 @@ target_link_libraries(qnn_sys_implementation
     PRIVATE
     qnn_sys_function_interface
     qnn_header
-    logging
+    qnn_logging
     ${CMAKE_DL_LIBS}
 )
 target_link_libraries(qnn_logger
@@ -210,7 +211,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
       pybind11::module
       pybind11::lto
       wrappers
-      logging
+      qnn_logging
       qnn_executorch_header
   )
 
@@ -244,7 +245,11 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*ios\.toolchain\.cmake$")
     ${CMAKE_CURRENT_LIST_DIR}/executor_runner/qnn_executor_runner.cpp
   )
   add_executable(qnn_executor_runner ${_qnn_executor_runner__srcs})
-  target_link_libraries(qnn_executor_runner ${_executor_runner_libs} qnn_executorch_backend gflags)
+  target_link_libraries(qnn_executor_runner
+    ${_executor_runner_libs}
+    qnn_executorch_backend
+    gflags
+  )
   target_compile_options(qnn_executor_runner PUBLIC ${_common_compile_options})
 endif()
 

backends/qualcomm/runtime/CMakeLists.txt

@@ -33,7 +33,7 @@ target_sources(qnn_manager
 )
 
 # logging
-target_sources(logging
+target_sources(qnn_logging
     PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}/Logging.h
     PRIVATE

backends/qualcomm/runtime/backends/CMakeLists.txt

@@ -42,6 +42,10 @@ target_sources(qnn_logger
 )
 
 # qnn_device
+set(HOST_ARCHITECTURE
+    ${CMAKE_CURRENT_LIST_DIR}/htpbackend/${CMAKE_SYSTEM_PROCESSOR}
+)
+
 target_sources(qnn_device
     PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}/QnnDeviceCommon.h
@@ -50,8 +54,9 @@ target_sources(qnn_device
     ${CMAKE_CURRENT_LIST_DIR}/QnnDeviceCommon.cpp
     ${CMAKE_CURRENT_LIST_DIR}/htpbackend/HtpDevice.cpp
     ${CMAKE_CURRENT_LIST_DIR}/htpbackend/HtpDevicePlatformInfoConfig.h
-    # When offline prepare context cache in x86 host, we have to provide platform infomation to Qnn
-    ${CMAKE_CURRENT_LIST_DIR}/htpbackend/${CMAKE_SYSTEM_PROCESSOR}/HtpDevicePlatformInfoConfig.cpp
+    # When offline prepare context cache in x86 host
+    # we have to provide platform infomation to Qnn
+    ${HOST_ARCHITECTURE}/HtpDevicePlatformInfoConfig.cpp
 )
 
 # qnn_context
@@ -81,7 +86,7 @@ target_sources(qnn_graph
     ${CMAKE_CURRENT_LIST_DIR}/htpbackend/HtpGraph.cpp
     ${CMAKE_CURRENT_LIST_DIR}/htpbackend/HtpGraphCustomConfig.h
     # When preparation on x86 host, need to set graph config from Qnn Graph.
-    ${CMAKE_CURRENT_LIST_DIR}/htpbackend/${CMAKE_SYSTEM_PROCESSOR}/HtpGraphCustomConfig.cpp
+    ${HOST_ARCHITECTURE}/HtpGraphCustomConfig.cpp
 )
 
 # qnn_backend
@@ -138,12 +143,14 @@ set(qnn_header_basenames
 
 set(QNN_HEADER_DIR_DST
     ${CMAKE_CURRENT_BINARY_DIR}/QNN/include)
-    
 
 # add the custom commands to copy each headers
 foreach(_qnn_header ${qnn_header_basenames})
     # copy at generation time to make below target_sources(qnn_header) happy.
-    configure_file( ${QNN_SDK_ROOT}/include/QNN/${_qnn_header} ${QNN_HEADER_DIR_DST}/${_qnn_header} COPYONLY)
+    configure_file(${QNN_SDK_ROOT}/include/QNN/${_qnn_header}
+        ${QNN_HEADER_DIR_DST}/${_qnn_header}
+        COPYONLY
+    )
     list(APPEND qnn_header_files ${QNN_HEADER_DIR_DST}/${_qnn_header})
 endforeach()
 

backends/qualcomm/runtime/backends/htpbackend/aarch64/HtpDevicePlatformInfoConfig.cpp

@@ -14,6 +14,6 @@ HtpDevicePlatformInfoConfig::CreateDevicePlatformInfo(
     const HtpInfo& qcom_target_soc_info) {
   return {};
 }
-}  // namespace qnn
-}  // namespace executor
-}  // namespace torch
+} // namespace qnn
+} // namespace executor
+} // namespace torch

backends/qualcomm/runtime/backends/htpbackend/aarch64/HtpGraphCustomConfig.cpp

@@ -13,6 +13,6 @@ std::vector<QnnGraph_CustomConfig_t>
 HtpGraphCustomConfig::CreateGraphCustomConfig() {
   return {};
 }
-}  // namespace qnn
-}  // namespace executor
-}  // namespace torch
+} // namespace qnn
+} // namespace executor
+} // namespace torch

backends/qualcomm/runtime/backends/htpbackend/x86_64/HtpDevicePlatformInfoConfig.cpp

@@ -54,6 +54,6 @@ HtpDevicePlatformInfoConfig::CreateDevicePlatformInfo(
 
   return ret;
 }
-}  // namespace qnn
-}  // namespace executor
-}  // namespace torch
+} // namespace qnn
+} // namespace executor
+} // namespace torch

backends/qualcomm/runtime/backends/htpbackend/x86_64/HtpGraphCustomConfig.cpp

@@ -43,8 +43,8 @@ HtpGraphCustomConfig::CreateGraphCustomConfig() {
       break;
   }
 
-  QNN_EXECUTORCH_LOG(kLogLevelInfo,
-                     "[Qnn ExecuTorch] Running level=3 optimization.");
+  QNN_EXECUTORCH_LOG(
+      kLogLevelInfo, "[Qnn ExecuTorch] Running level=3 optimization.");
 
   p_custom_config = AllocGraphCustomConfig();
   p_custom_config->option = QNN_HTP_GRAPH_CONFIG_OPTION_OPTIMIZATION;
@@ -55,6 +55,6 @@ HtpGraphCustomConfig::CreateGraphCustomConfig() {
 
   return ret;
 }
-}  // namespace qnn
-}  // namespace executor
-}  // namespace torch
+} // namespace qnn
+} // namespace executor
+} // namespace torch

examples/models/deeplab_v3/__init__.py

@@ -4,12 +4,6 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-from .model import (
-    DeepLabV3ResNet50Model,
-    DeepLabV3ResNet101Model,
-)
+from .model import DeepLabV3ResNet101Model, DeepLabV3ResNet50Model
 
-__all__ = [
-    DeepLabV3ResNet50Model,
-    DeepLabV3ResNet101Model
-]
+__all__ = [DeepLabV3ResNet50Model, DeepLabV3ResNet101Model]

examples/models/deeplab_v3/model.py

@@ -9,8 +9,8 @@
 import torch
 from torchvision.models.segmentation import (
     deeplabv3,
-    deeplabv3_resnet50,
     deeplabv3_resnet101,
+    deeplabv3_resnet50,
 )
 
 from ..model_base import EagerModelBase