Skip to content

Unify the qnn version for a few remaining space #6260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Unify the qnn version for a few remaining space #6260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backends/qualcomm/aot/ir/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ load(
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
load("@fbsource//xplat/executorch/backends/qualcomm:targets.bzl", "generate_schema_header")
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")

QCIR_NAME = "qcir"
INPUT_QCIR = QCIR_NAME + ".fbs"
Expand Down Expand Up @@ -55,7 +56,7 @@ def define_common_targets():
platforms = [ANDROID],
visibility = ["@EXECUTORCH_CLIENTS"],
deps = [
"fbsource//third-party/qualcomm/qnn:api",
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
"//executorch/runtime/backend:interface",
"//executorch/runtime/core:core",
"//executorch/backends/qualcomm/aot/wrappers:wrappers",
Expand Down
7 changes: 4 additions & 3 deletions backends/qualcomm/aot/python/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ load(
"ANDROID",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")

PYTHON_MODULE_NAME = "PyQnnManagerAdaptor"

Expand Down Expand Up @@ -32,7 +33,7 @@ def define_common_targets():
"//executorch/backends/qualcomm:schema",
"//executorch/backends/qualcomm/aot/ir:qcir_utils",
"//executorch/backends/qualcomm/runtime:runtime",
"fbsource//third-party/qualcomm/qnn:api",
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
],
external_deps = [
"pybind11",
Expand Down Expand Up @@ -65,7 +66,7 @@ def define_common_targets():
"//executorch/backends/qualcomm:schema",
"//executorch/backends/qualcomm/aot/ir:qcir_utils",
"//executorch/backends/qualcomm/runtime:runtime",
"fbsource//third-party/qualcomm/qnn:api",
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
],
external_deps = [
"pybind11",
Expand All @@ -92,7 +93,7 @@ def define_common_targets():
"//executorch/backends/qualcomm:schema",
"//executorch/backends/qualcomm/aot/ir:qcir_utils",
"//executorch/backends/qualcomm/runtime:runtime",
"fbsource//third-party/qualcomm/qnn:api",
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
],
external_deps = [
"pybind11",
Expand Down
3 changes: 2 additions & 1 deletion backends/qualcomm/aot/wrappers/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ load(
"ANDROID",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")

def define_common_targets():
"""Defines targets that should be shared between fbcode and xplat.
Expand All @@ -22,7 +23,7 @@ def define_common_targets():
platforms = [ANDROID],
visibility = ["@EXECUTORCH_CLIENTS"],
deps = [
"fbsource//third-party/qualcomm/qnn:api",
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
"//executorch/runtime/backend:interface",
"//executorch/runtime/core:core",
],
Expand Down
2 changes: 1 addition & 1 deletion backends/qualcomm/runtime/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def define_common_targets():
platforms = [ANDROID],
visibility = ["@EXECUTORCH_CLIENTS"],
deps = [
"fbsource//third-party/qualcomm/qnn:api",
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
"//executorch/runtime/backend:interface",
],
exported_deps = [
Expand Down
6 changes: 2 additions & 4 deletions backends/qualcomm/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ load(
"ANDROID",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_verision")

# Construct the input and output file names. All input and output files rely on scalar_type file.
SCHEMA_NAME = "schema"
Expand Down Expand Up @@ -83,7 +84,7 @@ def define_common_targets():
define_static_target = True,
visibility = ["@EXECUTORCH_CLIENTS"],
deps = [
"fbsource//third-party/qualcomm/qnn:api",
"fbsource//third-party/qualcomm/qnn/qnn-{0}:api".format(get_qnn_library_verision()),
"//executorch/runtime/backend:interface",
"//executorch/runtime/core:core",
"//executorch/backends/qualcomm/runtime:runtime",
Expand All @@ -92,6 +93,3 @@ def define_common_targets():
":schema",
],
)

def get_qnn_library_verision():
return "2.26"
Loading