Fixed import target

Author: shewu-quic

.ci/scripts/build-qnn-sdk.sh

@@ -40,6 +40,8 @@ set_up_aot() {
       -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
       -DEXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP=ON \
       -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
+      -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
+      -DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON \
       -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
       -DPYTHON_EXECUTABLE=python3
   cmake --build $PWD --target "PyQnnManagerAdaptor" -j$(nproc)

backends/qualcomm/aot/python/targets.bzl

@@ -26,6 +26,8 @@ def define_common_targets():
             "-DEXECUTORCH_PYTHON_MODULE_NAME={}".format(PYTHON_MODULE_NAME),
         ],
         deps = [
+            "//executorch/kernels/quantized:aot_lib",
+            "//executorch/kernels/quantized:quantized_ops_lib",
             "//executorch/runtime/core:core",
             "//executorch/backends/qualcomm/aot/python:python_lib",
             "//executorch/backends/qualcomm/aot/wrappers:wrappers",

backends/qualcomm/quantizer/quantizer.py

@@ -10,13 +10,12 @@
 
 # To support quantize op lowering in AOT
 try:
-    import executorch.extension.pybindings.portable_lib  # noqa[F401]
     import executorch.kernels.quantized  # noqa[F401]
 except:
     import logging
 
     logging.info(
-        "Failed to load portable_lib and quantized_aot_lib. To run on LPAI backend, please build ExecuTorch with portable_lib"
+        "Failed to load quantized_aot_lib. To run on LPAI backend, please make sure that quantized_aot_lib is accessible."
     )
     del logging
 import torch

backends/qualcomm/quantizer/targets.bzl

@@ -15,7 +15,8 @@ def define_common_targets():
         visibility = ["PUBLIC"],
         deps = [
             "//executorch/backends/transforms:decompose_sdpa",
-            "//executorch/extension/pybindings:portable_lib",
+            "//executorch/kernels/quantized:aot_lib",
             "//executorch/kernels/quantized:quantized_ops_lib",
+
         ],
     )

backends/qualcomm/scripts/build.sh

@@ -364,6 +364,7 @@ if [ "$BUILD_X86_64" = true ]; then
         -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
         -DEXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP=ON \
         -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
+        -DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON \
         -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
         -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
         -DEXECUTORCH_ENABLE_LOGGING=ON \
@@ -375,6 +376,7 @@ if [ "$BUILD_X86_64" = true ]; then
 
     rm -f $PRJ_ROOT/backends/qualcomm/python/*
     cp -fv $BUILD_ROOT/backends/qualcomm/Py* "$PRJ_ROOT/backends/qualcomm/python"
+    cp -fv $BUILD_ROOT/kernels/quantized/libquantized_ops_aot_lib.so "$PRJ_ROOT/kernels/quantized"
     cp -fv "$PRJ_ROOT/schema/program.fbs" "$PRJ_ROOT/exir/_serialize/program.fbs"
     cp -fv "$PRJ_ROOT/schema/scalar_type.fbs" "$PRJ_ROOT/exir/_serialize/scalar_type.fbs"