update mainline

Author: winskuo-quic

examples/qualcomm/oss_scripts/hf_image_sample_exporter.py

@@ -10,10 +10,10 @@
 
 import numpy as np
 from executorch.backends.qualcomm.export_utils import (
+    Device,
     make_quantizer,
     QnnConfig,
     setup_common_args_and_variables,
-    SimpleADB,
 )
 from executorch.backends.qualcomm.quantizer.quantizer import QuantDtype
 from executorch.examples.qualcomm.utils import (
@@ -84,19 +84,19 @@ def main(args):
         et_program_manager.write_to_file(f)
     logging.info(f"wrote {pte_path} ({os.path.getsize(pte_path)} bytes)")
 
-    adb = SimpleADB(
+    device = Device(
         qnn_config=qnn_config,
         pte_path=pte_path,
         workspace=f"/data/local/tmp/{getpass.getuser()}/executorch/{pte_filename}",
     )
-    adb.push(inputs=inputs)
-    adb.execute()
+    device.push(inputs=inputs)
+    device.execute()
 
     # collect output data
     output_data_folder = f"{args.artifact}/outputs"
     make_output_dir(output_data_folder)
 
-    adb.pull(host_output_path=args.artifact)
+    device.pull(host_output_path=args.artifact)
 
     # top-k analysis
     predictions = []

examples/qualcomm/oss_scripts/hf_llm_exporter.py

@@ -14,11 +14,11 @@
 
 import torch
 from executorch.backends.qualcomm.export_utils import (
+    Device,
     get_backend_type,
     make_quantizer,
     QnnConfig,
     setup_common_args_and_variables,
-    SimpleADB,
 )
 from executorch.backends.qualcomm.hf_transformers.api import get_quant_recipe
 from executorch.examples.qualcomm.utils import make_output_dir
@@ -102,17 +102,17 @@ def post_process():
                 "> outputs/result.txt",
             ]
         )
-        adb = SimpleADB(
+        device = Device(
             qnn_config=qnn_config,
             pte_path=pte_path,
             workspace=workspace,
             runner=runner_bin,
         )
         # No pregen inputs, input_list is not required
-        adb.push(inputs=[], files=[tokenizer_json_path])
-        adb.execute(custom_runner_cmd=runner_cmd)
+        device.push(inputs=[], files=[tokenizer_json_path])
+        device.execute(custom_runner_cmd=runner_cmd)
 
-        adb.pull(host_output_path=args.artifact, callback=post_process)
+        device.pull(host_output_path=args.artifact, callback=post_process)
 
     if args.ip and args.port != -1:
         with Client((args.ip, args.port)) as conn: