Skip to content

Commit 871efb7

Browse files
cccclaifacebook-github-bot
authored andcommitted
Unify the qnn version for a few remaining space (pytorch#6260)
Summary: Pull Request resolved: pytorch#6260 As title, miss a few qnn version hardcoded place in pytorch#6193 Reviewed By: kirklandsign Differential Revision: D64440154 fbshipit-source-id: 2a0b9a83edc923a08386079e678c40fb91386c84
1 parent 49395c2 commit 871efb7

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

backends/qualcomm/aot/ir/targets.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load(
44
)
55
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
66
load("@fbsource//xplat/executorch/backends/qualcomm:targets.bzl", "generate_schema_header")
7+
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")
78

89
QCIR_NAME = "qcir"
910
INPUT_QCIR = QCIR_NAME + ".fbs"
@@ -55,7 +56,7 @@ def define_common_targets():
5556
platforms = [ANDROID],
5657
visibility = ["@EXECUTORCH_CLIENTS"],
5758
deps = [
58-
"fbsource//third-party/qualcomm/qnn:api",
59+
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
5960
"//executorch/runtime/backend:interface",
6061
"//executorch/runtime/core:core",
6162
"//executorch/backends/qualcomm/aot/wrappers:wrappers",

backends/qualcomm/aot/python/targets.bzl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ load(
33
"ANDROID",
44
)
55
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
6+
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")
67

78
PYTHON_MODULE_NAME = "PyQnnManagerAdaptor"
89

@@ -32,7 +33,7 @@ def define_common_targets():
3233
"//executorch/backends/qualcomm:schema",
3334
"//executorch/backends/qualcomm/aot/ir:qcir_utils",
3435
"//executorch/backends/qualcomm/runtime:runtime",
35-
"fbsource//third-party/qualcomm/qnn:api",
36+
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
3637
],
3738
external_deps = [
3839
"pybind11",
@@ -65,7 +66,7 @@ def define_common_targets():
6566
"//executorch/backends/qualcomm:schema",
6667
"//executorch/backends/qualcomm/aot/ir:qcir_utils",
6768
"//executorch/backends/qualcomm/runtime:runtime",
68-
"fbsource//third-party/qualcomm/qnn:api",
69+
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
6970
],
7071
external_deps = [
7172
"pybind11",
@@ -92,7 +93,7 @@ def define_common_targets():
9293
"//executorch/backends/qualcomm:schema",
9394
"//executorch/backends/qualcomm/aot/ir:qcir_utils",
9495
"//executorch/backends/qualcomm/runtime:runtime",
95-
"fbsource//third-party/qualcomm/qnn:api",
96+
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
9697
],
9798
external_deps = [
9899
"pybind11",

backends/qualcomm/aot/wrappers/targets.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ load(
33
"ANDROID",
44
)
55
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
6+
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")
67

78
def define_common_targets():
89
"""Defines targets that should be shared between fbcode and xplat.
@@ -22,7 +23,7 @@ def define_common_targets():
2223
platforms = [ANDROID],
2324
visibility = ["@EXECUTORCH_CLIENTS"],
2425
deps = [
25-
"fbsource//third-party/qualcomm/qnn:api",
26+
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
2627
"//executorch/runtime/backend:interface",
2728
"//executorch/runtime/core:core",
2829
],

backends/qualcomm/runtime/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def define_common_targets():
2424
platforms = [ANDROID],
2525
visibility = ["@EXECUTORCH_CLIENTS"],
2626
deps = [
27-
"fbsource//third-party/qualcomm/qnn:api",
27+
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
2828
"//executorch/runtime/backend:interface",
2929
],
3030
exported_deps = [

backends/qualcomm/targets.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ load(
33
"ANDROID",
44
)
55
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
6+
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")
67

78
# Construct the input and output file names. All input and output files rely on scalar_type file.
89
SCHEMA_NAME = "schema"
@@ -83,7 +84,7 @@ def define_common_targets():
8384
define_static_target = True,
8485
visibility = ["@EXECUTORCH_CLIENTS"],
8586
deps = [
86-
"fbsource//third-party/qualcomm/qnn:api",
87+
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
8788
"//executorch/runtime/backend:interface",
8889
"//executorch/runtime/core:core",
8990
"//executorch/backends/qualcomm/runtime:runtime",
@@ -92,6 +93,3 @@ def define_common_targets():
9293
":schema",
9394
],
9495
)
95-
96-
def get_qnn_library_verision():
97-
return "2.26"

0 commit comments

Comments
 (0)