Skip to content

Commit 1ea9feb

Browse files
authored
Revert "Add qnn backend to pip packages (#13794)" (#14212)
This reverts commit 068d341. It broke Windows wheels per https://hud.pytorch.org/hud/pytorch/executorch/main/1?per_page=50&name_filter=windows
1 parent 9d2d188 commit 1ea9feb

File tree

8 files changed

+7
-699
lines changed

8 files changed

+7
-699
lines changed

.ci/scripts/test_wheel_package_qnn.sh

Lines changed: 0 additions & 201 deletions
This file was deleted.

.github/workflows/pull.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,6 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
jobs:
16-
test-qnn-wheel-packages-linux:
17-
name: test-qnn-wheel-packages-linux
18-
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
19-
permissions:
20-
id-token: write
21-
contents: read
22-
strategy:
23-
fail-fast: false
24-
matrix:
25-
python-version: [ "3.10", "3.11", "3.12" ]
26-
with:
27-
runner: linux.2xlarge
28-
docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk
29-
submodules: 'recursive'
30-
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
31-
timeout: 180
32-
script: |
33-
# The generic Linux job chooses to use base env, not the one setup by the image
34-
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
35-
conda activate "${CONDA_ENV}"
36-
37-
# Create a clean env for each python version
38-
conda create -y -n test_env_${{ matrix.python-version }} python=${{ matrix.python-version }}
39-
conda activate test_env_${{ matrix.python-version }}
40-
41-
PYTHON_EXECUTABLE=python bash .ci/scripts/test_wheel_package_qnn.sh "${{ matrix.python-version }}"
42-
4316
test-setup-linux-gcc:
4417
name: test-setup-linux-gcc
4518
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ cmake-android-out/
1616
cmake-ios-out/
1717
cmake-out*
1818
cmake-out-android/
19-
build-android/
20-
build-x86/
2119
dist/
2220
ethos-u-scratch/
2321
executorch.egg-info

backends/qualcomm/__init__.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

backends/qualcomm/runtime/backends/QnnImplementation.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88
#include <executorch/backends/qualcomm/runtime/backends/QnnImplementation.h>
9+
910
#include "QnnInterface.h"
1011
namespace executorch {
1112
namespace backends {
@@ -51,11 +52,7 @@ Error QnnImplementation::StartBackend(
5152
const QnnSaver_Config_t** saver_config) {
5253
Qnn_ErrorHandle_t error = QNN_SUCCESS;
5354
void* lib_handle = nullptr;
54-
// If the library is already loaded, return the handle.
55-
lib_handle = dlopen(lib_path.c_str(), RTLD_NOW | RTLD_NOLOAD);
56-
if (!lib_handle) {
57-
lib_handle = dlopen(lib_path.c_str(), RTLD_NOW | RTLD_GLOBAL);
58-
}
55+
lib_handle = dlopen(lib_path.c_str(), RTLD_NOW | RTLD_GLOBAL);
5956
if (lib_handle == nullptr) {
6057
QNN_EXECUTORCH_LOG_ERROR(
6158
"Cannot Open QNN library %s, with error: %s",

backends/qualcomm/scripts/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env bash
21
# Copyright (c) Qualcomm Innovation Center, Inc.
32
# All rights reserved
43
#

0 commit comments

Comments
 (0)