Revert "Revert "Revert "Add qnn backend to pip packages (#13794)"""

.github/workflows/pull.yml

@@ -13,33 +13,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test-qnn-wheel-packages-linux:
-    name: test-qnn-wheel-packages-linux
-    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
-    permissions:
-      id-token: write
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ "3.10", "3.11", "3.12" ]
-    with:
-      runner: linux.2xlarge
-      docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk
-      submodules: 'recursive'
-      ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-      timeout: 180
-      script: |
-        # The generic Linux job chooses to use base env, not the one setup by the image
-        CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
-        conda activate "${CONDA_ENV}"
-
-        # Create a clean env for each python version
-        conda create -y -n test_env_${{ matrix.python-version }} python=${{ matrix.python-version }}
-        conda activate test_env_${{ matrix.python-version }}
-
-        PYTHON_EXECUTABLE=python bash .ci/scripts/test_wheel_package_qnn.sh "${{ matrix.python-version }}"
-
   test-setup-linux-gcc:
     name: test-setup-linux-gcc
     uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main

.gitignore

@@ -16,8 +16,6 @@ cmake-android-out/
 cmake-ios-out/
 cmake-out*
 cmake-out-android/
-build-android/
-build-x86/
 dist/
 ethos-u-scratch/
 executorch.egg-info

backends/qualcomm/runtime/backends/QnnImplementation.cpp

@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 #include <executorch/backends/qualcomm/runtime/backends/QnnImplementation.h>
+
 #include "QnnInterface.h"
 namespace executorch {
 namespace backends {
@@ -51,11 +52,7 @@ Error QnnImplementation::StartBackend(
     const QnnSaver_Config_t** saver_config) {
   Qnn_ErrorHandle_t error = QNN_SUCCESS;
   void* lib_handle = nullptr;
-  // If the library is already loaded, return the handle.
-  lib_handle = dlopen(lib_path.c_str(), RTLD_NOW | RTLD_NOLOAD);
-  if (!lib_handle) {
-    lib_handle = dlopen(lib_path.c_str(), RTLD_NOW | RTLD_GLOBAL);
-  }
+  lib_handle = dlopen(lib_path.c_str(), RTLD_NOW | RTLD_GLOBAL);
   if (lib_handle == nullptr) {
     QNN_EXECUTORCH_LOG_ERROR(
         "Cannot Open QNN library %s, with error: %s",

backends/qualcomm/scripts/build.sh

@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 # Copyright (c) Qualcomm Innovation Center, Inc.
 # All rights reserved
 #