persist constants file#63

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
mcr229 wants to merge 3 commits into from
Closed

persist constants file #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cab140
Fix CPUINFO dependency for xnnpack/threadpool
mcr229 Aug 20, 2023
4c1899f
move qnnpack utils under xnnpack
mcr229 Aug 20, 2023
cc3e95d
persist constants file (#63)
mcr229 Aug 20, 2023
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
2 changes: 1 addition & 1 deletion backends/qnnpack/QNNPackBackend.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down
21 changes: 1 addition & 20 deletions backends/qnnpack/targets.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
],
)

for aten_mode in (True, False):
aten_suffix = "_aten" if aten_mode else ""
runtime.cxx_library(
name = "qnnpack_utils" + aten_suffix,
srcs = [
"utils/utils.cpp",
],
exported_headers = ["utils/utils.h"],
deps = [
"//executorch/runtime/core/exec_aten:lib" + aten_suffix,
"//executorch/runtime/backend:backend_registry",
],
visibility = [
"//executorch/backends/qnnpack/test/...",
"//executorch/backends/xnnpack/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "qnnpack_backend",
srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
"//executorch/runtime/core/exec_aten/util:tensor_util",
"//executorch/runtime/backend:backend_registry",
"//executorch/backends/xnnpack/threadpool:threadpool",
"//executorch/backends/xnnpack:dynamic_quant_utils",
"//executorch/util:memory_utils",
"//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
prefix = (
"xplat/" if is_xplat() else ""
),
),
":qnnpack_schema",
":qnnpack_utils",
],
platforms = [
ANDROID,
Expand Down
3 changes: 0 additions & 3 deletions backends/qnnpack/test/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
name = "test_qnnpack",
Expand Down
2 changes: 1 addition & 1 deletion backends/xnnpack/runtime/XNNExecutor.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down
2 changes: 1 addition & 1 deletion backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down
0 backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h
View file
Open in desktop
File renamed without changes.
18 changes: 17 additions & 1 deletion backends/xnnpack/targets.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
runtime.cxx_library(
name = "dynamic_quant_utils",
srcs = [
"runtime/utils/utils.cpp",
],
exported_headers = ["runtime/utils/utils.h"],
deps = [
"//executorch/runtime/core/exec_aten:lib",
"//executorch/runtime/backend:backend_registry",
],
visibility = [
"//executorch/backends/xnnpack/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.genrule(
name = "gen_xnnpack_schema",
srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
deps = [
third_party_dep("XNNPACK"),
":xnnpack_schema",
":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
"//executorch/runtime/backend:backend_registry",
"//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
"//executorch/backends/xnnpack/threadpool:threadpool",
"//executorch/util:memory_utils",
"//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down
3 changes: 3 additions & 0 deletions backends/xnnpack/test/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
name = "test_xnnpack",
Expand Down
2 changes: 1 addition & 1 deletion backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down
13 changes: 3 additions & 10 deletions backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
"@fbsource//tools/build_defs:default_platform_defs.bzl",
"ANDROID",
"APPLE",
"CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
runtime.cxx_test(
name = "qnnpack_utils_test",
srcs = ["test_utils.cpp"],
name = "dynamic_quant_utils_test",
srcs = ["runtime/test_runtime_utils.cpp"],
fbcode_deps = [
"//caffe2:ATen-cpu",
],
xplat_deps = [
"//caffe2:aten_cpu",
],
platforms = [ANDROID, APPLE, CXX],
deps = [
"//executorch/runtime/core/exec_aten/testing_util:tensor_util",
"//executorch/runtime/core/exec_aten/util:scalar_type_util",
"//executorch/extension/aten_util:aten_bridge",
"//executorch/backends/qnnpack:qnnpack_utils",
"//executorch/backends/xnnpack:dynamic_quant_utils",
],
)
2 changes: 1 addition & 1 deletion backends/xnnpack/threadpool/targets.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
exported_headers = _THREADPOOL_HEADERS,
exported_deps = [
third_party_dep("pthreadpool"),
third_party_dep("cpuinfo"),
],
external_deps = ["cpuinfo"],
exported_preprocessor_flags = [
"-DET_USE_THREADPOOL",
],
Expand Down
21 changes: 1 addition & 20 deletions backends/xnnpack/utils/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
name = "xnnpack_constants",
srcs = {
"xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
},
outs = {
"xnnpack_constants.py": ["xnnpack_constants.py"],
},
cmd = " && ".join([
"echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
"awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
"if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
]),
visibility = [
"//executorch/backends/xnnpack/utils:xnnpack_utils",
],
)

python_library(
name = "xnnpack_utils",
srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
srcs = glob(["*.py"]),
deps = [
"//caffe2:torch",
"//executorch/exir:lib",
Expand Down
30 changes: 30 additions & 0 deletions backends/xnnpack/utils/gen_xnnpack_constants.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
echo "# All rights reserved."
echo "#"
echo "# This source code is licensed under the BSD-style license found in the"
echo "# LICENSE file in the root directory of this source tree."
echo ""
echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi
29 changes: 29 additions & 0 deletions backends/xnnpack/utils/xnnpack_constants.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX
2 changes: 1 addition & 1 deletion shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
"FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
"XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
"clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
"cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
"cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
"pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
"pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
persist constants file#63

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

mcr229
wants to merge
3
commits into

from

 Closed


persist constants file
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0cab140

Fix CPUINFO dependency for xnnpack/threadpool


mcr229 Aug 20, 2023
4c1899f

move qnnpack utils under xnnpack


mcr229 Aug 20, 2023
cc3e95d

persist constants file (#63)


mcr229 Aug 20, 2023

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


2 changes: 1 addition & 1 deletion
backends/qnnpack/QNNPackBackend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down

21 changes: 1 addition & 20 deletions
backends/qnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
 ],
 )

 for aten_mode in (True, False):
 aten_suffix = "_aten" if aten_mode else ""
 runtime.cxx_library(
 name = "qnnpack_utils" + aten_suffix,
 srcs = [
 "utils/utils.cpp",
 ],
 exported_headers = ["utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/qnnpack/test/...",
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.cxx_library(
 name = "qnnpack_backend",
 srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
 "//executorch/runtime/core/exec_aten/util:tensor_util",
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 "//executorch/util:memory_utils",
 "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
 prefix = (
 "xplat/" if is_xplat() else ""
 ),
 ),
 ":qnnpack_schema",
 ":qnnpack_utils",
 ],
 platforms = [
 ANDROID,
Expand Down

3 changes: 0 additions & 3 deletions
backends/qnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_qnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/runtime/XNNExecutor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down

0
backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h

View file


Open in desktop


File renamed without changes.


18 changes: 17 additions & 1 deletion
backends/xnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_library(
 name = "dynamic_quant_utils",
 srcs = [
 "runtime/utils/utils.cpp",
 ],
 exported_headers = ["runtime/utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib",
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.genrule(
 name = "gen_xnnpack_schema",
 srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
 deps = [
 third_party_dep("XNNPACK"),
 ":xnnpack_schema",
 ":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/util:memory_utils",
 "//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down

3 changes: 3 additions & 0 deletions
backends/xnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_xnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down

13 changes: 3 additions & 10 deletions
backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
 "@fbsource//tools/build_defs:default_platform_defs.bzl",
 "ANDROID",
 "APPLE",
 "CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_test(
 name = "qnnpack_utils_test",
 srcs = ["test_utils.cpp"],
 name = "dynamic_quant_utils_test",
 srcs = ["runtime/test_runtime_utils.cpp"],
 fbcode_deps = [
 "//caffe2:ATen-cpu",
 ],
 xplat_deps = [
 "//caffe2:aten_cpu",
 ],
 platforms = [ANDROID, APPLE, CXX],
 deps = [
 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
 "//executorch/runtime/core/exec_aten/util:scalar_type_util",
 "//executorch/extension/aten_util:aten_bridge",
 "//executorch/backends/qnnpack:qnnpack_utils",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 ],
 )

2 changes: 1 addition & 1 deletion
backends/xnnpack/threadpool/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
 exported_headers = _THREADPOOL_HEADERS,
 exported_deps = [
 third_party_dep("pthreadpool"),
 third_party_dep("cpuinfo"),
 ],
 external_deps = ["cpuinfo"],
 exported_preprocessor_flags = [
 "-DET_USE_THREADPOOL",
 ],
Expand Down

21 changes: 1 addition & 20 deletions
backends/xnnpack/utils/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
 name = "xnnpack_constants",
 srcs = {
 "xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
 },
 outs = {
 "xnnpack_constants.py": ["xnnpack_constants.py"],
 },
 cmd = " && ".join([
 "echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
 "awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
 "if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
 ]),
 visibility = [
 "//executorch/backends/xnnpack/utils:xnnpack_utils",
 ],
)

python_library(
 name = "xnnpack_utils",
 srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
 srcs = glob(["*.py"]),
 deps = [
 "//caffe2:torch",
 "//executorch/exir:lib",
Expand Down

30 changes: 30 additions & 0 deletions
backends/xnnpack/utils/gen_xnnpack_constants.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
 echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
 echo "# All rights reserved."
 echo "#"
 echo "# This source code is licensed under the BSD-style license found in the"
 echo "# LICENSE file in the root directory of this source tree."
 echo ""
 echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi

29 changes: 29 additions & 0 deletions
backends/xnnpack/utils/xnnpack_constants.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX

2 changes: 1 addition & 1 deletion
shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
 "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
 "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
 "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
 "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
 "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
persist constants file#63

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

mcr229
wants to merge
3
commits into

from

 Closed


persist constants file
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0cab140

Fix CPUINFO dependency for xnnpack/threadpool


mcr229 Aug 20, 2023
4c1899f

move qnnpack utils under xnnpack


mcr229 Aug 20, 2023
cc3e95d

persist constants file (#63)


mcr229 Aug 20, 2023

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


2 changes: 1 addition & 1 deletion
backends/qnnpack/QNNPackBackend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down

21 changes: 1 addition & 20 deletions
backends/qnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
 ],
 )

 for aten_mode in (True, False):
 aten_suffix = "_aten" if aten_mode else ""
 runtime.cxx_library(
 name = "qnnpack_utils" + aten_suffix,
 srcs = [
 "utils/utils.cpp",
 ],
 exported_headers = ["utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/qnnpack/test/...",
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.cxx_library(
 name = "qnnpack_backend",
 srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
 "//executorch/runtime/core/exec_aten/util:tensor_util",
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 "//executorch/util:memory_utils",
 "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
 prefix = (
 "xplat/" if is_xplat() else ""
 ),
 ),
 ":qnnpack_schema",
 ":qnnpack_utils",
 ],
 platforms = [
 ANDROID,
Expand Down

3 changes: 0 additions & 3 deletions
backends/qnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_qnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/runtime/XNNExecutor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down

0
backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h

View file


Open in desktop


File renamed without changes.


18 changes: 17 additions & 1 deletion
backends/xnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_library(
 name = "dynamic_quant_utils",
 srcs = [
 "runtime/utils/utils.cpp",
 ],
 exported_headers = ["runtime/utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib",
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.genrule(
 name = "gen_xnnpack_schema",
 srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
 deps = [
 third_party_dep("XNNPACK"),
 ":xnnpack_schema",
 ":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/util:memory_utils",
 "//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down

3 changes: 3 additions & 0 deletions
backends/xnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_xnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down

13 changes: 3 additions & 10 deletions
backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
 "@fbsource//tools/build_defs:default_platform_defs.bzl",
 "ANDROID",
 "APPLE",
 "CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_test(
 name = "qnnpack_utils_test",
 srcs = ["test_utils.cpp"],
 name = "dynamic_quant_utils_test",
 srcs = ["runtime/test_runtime_utils.cpp"],
 fbcode_deps = [
 "//caffe2:ATen-cpu",
 ],
 xplat_deps = [
 "//caffe2:aten_cpu",
 ],
 platforms = [ANDROID, APPLE, CXX],
 deps = [
 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
 "//executorch/runtime/core/exec_aten/util:scalar_type_util",
 "//executorch/extension/aten_util:aten_bridge",
 "//executorch/backends/qnnpack:qnnpack_utils",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 ],
 )

2 changes: 1 addition & 1 deletion
backends/xnnpack/threadpool/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
 exported_headers = _THREADPOOL_HEADERS,
 exported_deps = [
 third_party_dep("pthreadpool"),
 third_party_dep("cpuinfo"),
 ],
 external_deps = ["cpuinfo"],
 exported_preprocessor_flags = [
 "-DET_USE_THREADPOOL",
 ],
Expand Down

21 changes: 1 addition & 20 deletions
backends/xnnpack/utils/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
 name = "xnnpack_constants",
 srcs = {
 "xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
 },
 outs = {
 "xnnpack_constants.py": ["xnnpack_constants.py"],
 },
 cmd = " && ".join([
 "echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
 "awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
 "if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
 ]),
 visibility = [
 "//executorch/backends/xnnpack/utils:xnnpack_utils",
 ],
)

python_library(
 name = "xnnpack_utils",
 srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
 srcs = glob(["*.py"]),
 deps = [
 "//caffe2:torch",
 "//executorch/exir:lib",
Expand Down

30 changes: 30 additions & 0 deletions
backends/xnnpack/utils/gen_xnnpack_constants.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
 echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
 echo "# All rights reserved."
 echo "#"
 echo "# This source code is licensed under the BSD-style license found in the"
 echo "# LICENSE file in the root directory of this source tree."
 echo ""
 echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi

29 changes: 29 additions & 0 deletions
backends/xnnpack/utils/xnnpack_constants.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX

2 changes: 1 addition & 1 deletion
shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
 "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
 "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
 "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
 "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
 "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
persist constants file#63

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

mcr229
wants to merge
3
commits into

from

 Closed


persist constants file
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0cab140

Fix CPUINFO dependency for xnnpack/threadpool


mcr229 Aug 20, 2023
4c1899f

move qnnpack utils under xnnpack


mcr229 Aug 20, 2023
cc3e95d

persist constants file (#63)


mcr229 Aug 20, 2023

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


2 changes: 1 addition & 1 deletion
backends/qnnpack/QNNPackBackend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down

21 changes: 1 addition & 20 deletions
backends/qnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
 ],
 )

 for aten_mode in (True, False):
 aten_suffix = "_aten" if aten_mode else ""
 runtime.cxx_library(
 name = "qnnpack_utils" + aten_suffix,
 srcs = [
 "utils/utils.cpp",
 ],
 exported_headers = ["utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/qnnpack/test/...",
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.cxx_library(
 name = "qnnpack_backend",
 srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
 "//executorch/runtime/core/exec_aten/util:tensor_util",
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 "//executorch/util:memory_utils",
 "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
 prefix = (
 "xplat/" if is_xplat() else ""
 ),
 ),
 ":qnnpack_schema",
 ":qnnpack_utils",
 ],
 platforms = [
 ANDROID,
Expand Down

3 changes: 0 additions & 3 deletions
backends/qnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_qnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/runtime/XNNExecutor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down

0
backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h

View file


Open in desktop


File renamed without changes.


18 changes: 17 additions & 1 deletion
backends/xnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_library(
 name = "dynamic_quant_utils",
 srcs = [
 "runtime/utils/utils.cpp",
 ],
 exported_headers = ["runtime/utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib",
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.genrule(
 name = "gen_xnnpack_schema",
 srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
 deps = [
 third_party_dep("XNNPACK"),
 ":xnnpack_schema",
 ":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/util:memory_utils",
 "//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down

3 changes: 3 additions & 0 deletions
backends/xnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_xnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down

13 changes: 3 additions & 10 deletions
backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
 "@fbsource//tools/build_defs:default_platform_defs.bzl",
 "ANDROID",
 "APPLE",
 "CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_test(
 name = "qnnpack_utils_test",
 srcs = ["test_utils.cpp"],
 name = "dynamic_quant_utils_test",
 srcs = ["runtime/test_runtime_utils.cpp"],
 fbcode_deps = [
 "//caffe2:ATen-cpu",
 ],
 xplat_deps = [
 "//caffe2:aten_cpu",
 ],
 platforms = [ANDROID, APPLE, CXX],
 deps = [
 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
 "//executorch/runtime/core/exec_aten/util:scalar_type_util",
 "//executorch/extension/aten_util:aten_bridge",
 "//executorch/backends/qnnpack:qnnpack_utils",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 ],
 )

2 changes: 1 addition & 1 deletion
backends/xnnpack/threadpool/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
 exported_headers = _THREADPOOL_HEADERS,
 exported_deps = [
 third_party_dep("pthreadpool"),
 third_party_dep("cpuinfo"),
 ],
 external_deps = ["cpuinfo"],
 exported_preprocessor_flags = [
 "-DET_USE_THREADPOOL",
 ],
Expand Down

21 changes: 1 addition & 20 deletions
backends/xnnpack/utils/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
 name = "xnnpack_constants",
 srcs = {
 "xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
 },
 outs = {
 "xnnpack_constants.py": ["xnnpack_constants.py"],
 },
 cmd = " && ".join([
 "echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
 "awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
 "if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
 ]),
 visibility = [
 "//executorch/backends/xnnpack/utils:xnnpack_utils",
 ],
)

python_library(
 name = "xnnpack_utils",
 srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
 srcs = glob(["*.py"]),
 deps = [
 "//caffe2:torch",
 "//executorch/exir:lib",
Expand Down

30 changes: 30 additions & 0 deletions
backends/xnnpack/utils/gen_xnnpack_constants.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
 echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
 echo "# All rights reserved."
 echo "#"
 echo "# This source code is licensed under the BSD-style license found in the"
 echo "# LICENSE file in the root directory of this source tree."
 echo ""
 echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi

29 changes: 29 additions & 0 deletions
backends/xnnpack/utils/xnnpack_constants.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX

2 changes: 1 addition & 1 deletion
shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
 "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
 "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
 "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
 "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
 "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
persist constants file#63

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

mcr229
wants to merge
3
commits into

from

 Closed


persist constants file
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0cab140

Fix CPUINFO dependency for xnnpack/threadpool


mcr229 Aug 20, 2023
4c1899f

move qnnpack utils under xnnpack


mcr229 Aug 20, 2023
cc3e95d

persist constants file (#63)


mcr229 Aug 20, 2023

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


2 changes: 1 addition & 1 deletion
backends/qnnpack/QNNPackBackend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down

21 changes: 1 addition & 20 deletions
backends/qnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
 ],
 )

 for aten_mode in (True, False):
 aten_suffix = "_aten" if aten_mode else ""
 runtime.cxx_library(
 name = "qnnpack_utils" + aten_suffix,
 srcs = [
 "utils/utils.cpp",
 ],
 exported_headers = ["utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/qnnpack/test/...",
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.cxx_library(
 name = "qnnpack_backend",
 srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
 "//executorch/runtime/core/exec_aten/util:tensor_util",
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 "//executorch/util:memory_utils",
 "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
 prefix = (
 "xplat/" if is_xplat() else ""
 ),
 ),
 ":qnnpack_schema",
 ":qnnpack_utils",
 ],
 platforms = [
 ANDROID,
Expand Down

3 changes: 0 additions & 3 deletions
backends/qnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_qnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/runtime/XNNExecutor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down

0
backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h

View file


Open in desktop


File renamed without changes.


18 changes: 17 additions & 1 deletion
backends/xnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_library(
 name = "dynamic_quant_utils",
 srcs = [
 "runtime/utils/utils.cpp",
 ],
 exported_headers = ["runtime/utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib",
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.genrule(
 name = "gen_xnnpack_schema",
 srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
 deps = [
 third_party_dep("XNNPACK"),
 ":xnnpack_schema",
 ":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/util:memory_utils",
 "//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down

3 changes: 3 additions & 0 deletions
backends/xnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_xnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down

13 changes: 3 additions & 10 deletions
backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
 "@fbsource//tools/build_defs:default_platform_defs.bzl",
 "ANDROID",
 "APPLE",
 "CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_test(
 name = "qnnpack_utils_test",
 srcs = ["test_utils.cpp"],
 name = "dynamic_quant_utils_test",
 srcs = ["runtime/test_runtime_utils.cpp"],
 fbcode_deps = [
 "//caffe2:ATen-cpu",
 ],
 xplat_deps = [
 "//caffe2:aten_cpu",
 ],
 platforms = [ANDROID, APPLE, CXX],
 deps = [
 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
 "//executorch/runtime/core/exec_aten/util:scalar_type_util",
 "//executorch/extension/aten_util:aten_bridge",
 "//executorch/backends/qnnpack:qnnpack_utils",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 ],
 )

2 changes: 1 addition & 1 deletion
backends/xnnpack/threadpool/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
 exported_headers = _THREADPOOL_HEADERS,
 exported_deps = [
 third_party_dep("pthreadpool"),
 third_party_dep("cpuinfo"),
 ],
 external_deps = ["cpuinfo"],
 exported_preprocessor_flags = [
 "-DET_USE_THREADPOOL",
 ],
Expand Down

21 changes: 1 addition & 20 deletions
backends/xnnpack/utils/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
 name = "xnnpack_constants",
 srcs = {
 "xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
 },
 outs = {
 "xnnpack_constants.py": ["xnnpack_constants.py"],
 },
 cmd = " && ".join([
 "echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
 "awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
 "if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
 ]),
 visibility = [
 "//executorch/backends/xnnpack/utils:xnnpack_utils",
 ],
)

python_library(
 name = "xnnpack_utils",
 srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
 srcs = glob(["*.py"]),
 deps = [
 "//caffe2:torch",
 "//executorch/exir:lib",
Expand Down

30 changes: 30 additions & 0 deletions
backends/xnnpack/utils/gen_xnnpack_constants.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
 echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
 echo "# All rights reserved."
 echo "#"
 echo "# This source code is licensed under the BSD-style license found in the"
 echo "# LICENSE file in the root directory of this source tree."
 echo ""
 echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi

29 changes: 29 additions & 0 deletions
backends/xnnpack/utils/xnnpack_constants.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX

2 changes: 1 addition & 1 deletion
shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
 "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
 "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
 "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
 "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
 "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
persist constants file#63

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

mcr229
wants to merge
3
commits into

from

 Closed


persist constants file
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0cab140

Fix CPUINFO dependency for xnnpack/threadpool


mcr229 Aug 20, 2023
4c1899f

move qnnpack utils under xnnpack


mcr229 Aug 20, 2023
cc3e95d

persist constants file (#63)


mcr229 Aug 20, 2023

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


2 changes: 1 addition & 1 deletion
backends/qnnpack/QNNPackBackend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down

21 changes: 1 addition & 20 deletions
backends/qnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
 ],
 )

 for aten_mode in (True, False):
 aten_suffix = "_aten" if aten_mode else ""
 runtime.cxx_library(
 name = "qnnpack_utils" + aten_suffix,
 srcs = [
 "utils/utils.cpp",
 ],
 exported_headers = ["utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/qnnpack/test/...",
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.cxx_library(
 name = "qnnpack_backend",
 srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
 "//executorch/runtime/core/exec_aten/util:tensor_util",
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 "//executorch/util:memory_utils",
 "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
 prefix = (
 "xplat/" if is_xplat() else ""
 ),
 ),
 ":qnnpack_schema",
 ":qnnpack_utils",
 ],
 platforms = [
 ANDROID,
Expand Down

3 changes: 0 additions & 3 deletions
backends/qnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_qnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/runtime/XNNExecutor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down

0
backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h

View file


Open in desktop


File renamed without changes.


18 changes: 17 additions & 1 deletion
backends/xnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_library(
 name = "dynamic_quant_utils",
 srcs = [
 "runtime/utils/utils.cpp",
 ],
 exported_headers = ["runtime/utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib",
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.genrule(
 name = "gen_xnnpack_schema",
 srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
 deps = [
 third_party_dep("XNNPACK"),
 ":xnnpack_schema",
 ":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/util:memory_utils",
 "//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down

3 changes: 3 additions & 0 deletions
backends/xnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_xnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down

13 changes: 3 additions & 10 deletions
backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
 "@fbsource//tools/build_defs:default_platform_defs.bzl",
 "ANDROID",
 "APPLE",
 "CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_test(
 name = "qnnpack_utils_test",
 srcs = ["test_utils.cpp"],
 name = "dynamic_quant_utils_test",
 srcs = ["runtime/test_runtime_utils.cpp"],
 fbcode_deps = [
 "//caffe2:ATen-cpu",
 ],
 xplat_deps = [
 "//caffe2:aten_cpu",
 ],
 platforms = [ANDROID, APPLE, CXX],
 deps = [
 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
 "//executorch/runtime/core/exec_aten/util:scalar_type_util",
 "//executorch/extension/aten_util:aten_bridge",
 "//executorch/backends/qnnpack:qnnpack_utils",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 ],
 )

2 changes: 1 addition & 1 deletion
backends/xnnpack/threadpool/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
 exported_headers = _THREADPOOL_HEADERS,
 exported_deps = [
 third_party_dep("pthreadpool"),
 third_party_dep("cpuinfo"),
 ],
 external_deps = ["cpuinfo"],
 exported_preprocessor_flags = [
 "-DET_USE_THREADPOOL",
 ],
Expand Down

21 changes: 1 addition & 20 deletions
backends/xnnpack/utils/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
 name = "xnnpack_constants",
 srcs = {
 "xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
 },
 outs = {
 "xnnpack_constants.py": ["xnnpack_constants.py"],
 },
 cmd = " && ".join([
 "echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
 "awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
 "if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
 ]),
 visibility = [
 "//executorch/backends/xnnpack/utils:xnnpack_utils",
 ],
)

python_library(
 name = "xnnpack_utils",
 srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
 srcs = glob(["*.py"]),
 deps = [
 "//caffe2:torch",
 "//executorch/exir:lib",
Expand Down

30 changes: 30 additions & 0 deletions
backends/xnnpack/utils/gen_xnnpack_constants.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
 echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
 echo "# All rights reserved."
 echo "#"
 echo "# This source code is licensed under the BSD-style license found in the"
 echo "# LICENSE file in the root directory of this source tree."
 echo ""
 echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi

29 changes: 29 additions & 0 deletions
backends/xnnpack/utils/xnnpack_constants.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX

2 changes: 1 addition & 1 deletion
shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
 "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
 "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
 "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
 "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
 "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
persist constants file#63

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

mcr229
wants to merge
3
commits into

from

 Closed


persist constants file
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0cab140

Fix CPUINFO dependency for xnnpack/threadpool


mcr229 Aug 20, 2023
4c1899f

move qnnpack utils under xnnpack


mcr229 Aug 20, 2023
cc3e95d

persist constants file (#63)


mcr229 Aug 20, 2023

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


2 changes: 1 addition & 1 deletion
backends/qnnpack/QNNPackBackend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down

21 changes: 1 addition & 20 deletions
backends/qnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
 ],
 )

 for aten_mode in (True, False):
 aten_suffix = "_aten" if aten_mode else ""
 runtime.cxx_library(
 name = "qnnpack_utils" + aten_suffix,
 srcs = [
 "utils/utils.cpp",
 ],
 exported_headers = ["utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/qnnpack/test/...",
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.cxx_library(
 name = "qnnpack_backend",
 srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
 "//executorch/runtime/core/exec_aten/util:tensor_util",
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 "//executorch/util:memory_utils",
 "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
 prefix = (
 "xplat/" if is_xplat() else ""
 ),
 ),
 ":qnnpack_schema",
 ":qnnpack_utils",
 ],
 platforms = [
 ANDROID,
Expand Down

3 changes: 0 additions & 3 deletions
backends/qnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_qnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/runtime/XNNExecutor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down

0
backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h

View file


Open in desktop


File renamed without changes.


18 changes: 17 additions & 1 deletion
backends/xnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_library(
 name = "dynamic_quant_utils",
 srcs = [
 "runtime/utils/utils.cpp",
 ],
 exported_headers = ["runtime/utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib",
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.genrule(
 name = "gen_xnnpack_schema",
 srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
 deps = [
 third_party_dep("XNNPACK"),
 ":xnnpack_schema",
 ":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/util:memory_utils",
 "//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down

3 changes: 3 additions & 0 deletions
backends/xnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_xnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down

13 changes: 3 additions & 10 deletions
backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
 "@fbsource//tools/build_defs:default_platform_defs.bzl",
 "ANDROID",
 "APPLE",
 "CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_test(
 name = "qnnpack_utils_test",
 srcs = ["test_utils.cpp"],
 name = "dynamic_quant_utils_test",
 srcs = ["runtime/test_runtime_utils.cpp"],
 fbcode_deps = [
 "//caffe2:ATen-cpu",
 ],
 xplat_deps = [
 "//caffe2:aten_cpu",
 ],
 platforms = [ANDROID, APPLE, CXX],
 deps = [
 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
 "//executorch/runtime/core/exec_aten/util:scalar_type_util",
 "//executorch/extension/aten_util:aten_bridge",
 "//executorch/backends/qnnpack:qnnpack_utils",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 ],
 )

2 changes: 1 addition & 1 deletion
backends/xnnpack/threadpool/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
 exported_headers = _THREADPOOL_HEADERS,
 exported_deps = [
 third_party_dep("pthreadpool"),
 third_party_dep("cpuinfo"),
 ],
 external_deps = ["cpuinfo"],
 exported_preprocessor_flags = [
 "-DET_USE_THREADPOOL",
 ],
Expand Down

21 changes: 1 addition & 20 deletions
backends/xnnpack/utils/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
 name = "xnnpack_constants",
 srcs = {
 "xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
 },
 outs = {
 "xnnpack_constants.py": ["xnnpack_constants.py"],
 },
 cmd = " && ".join([
 "echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
 "awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
 "if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
 ]),
 visibility = [
 "//executorch/backends/xnnpack/utils:xnnpack_utils",
 ],
)

python_library(
 name = "xnnpack_utils",
 srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
 srcs = glob(["*.py"]),
 deps = [
 "//caffe2:torch",
 "//executorch/exir:lib",
Expand Down

30 changes: 30 additions & 0 deletions
backends/xnnpack/utils/gen_xnnpack_constants.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
 echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
 echo "# All rights reserved."
 echo "#"
 echo "# This source code is licensed under the BSD-style license found in the"
 echo "# LICENSE file in the root directory of this source tree."
 echo ""
 echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi

29 changes: 29 additions & 0 deletions
backends/xnnpack/utils/xnnpack_constants.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX

2 changes: 1 addition & 1 deletion
shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
 "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
 "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
 "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
 "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
 "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
persist constants file#63

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

mcr229
wants to merge
3
commits into

from

 Closed


persist constants file
#63
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0cab140

Fix CPUINFO dependency for xnnpack/threadpool


mcr229 Aug 20, 2023
4c1899f

move qnnpack utils under xnnpack


mcr229 Aug 20, 2023
cc3e95d

persist constants file (#63)


mcr229 Aug 20, 2023

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


2 changes: 1 addition & 1 deletion
backends/qnnpack/QNNPackBackend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

#include <executorch/backends/qnnpack/executor/QNNExecutor.h>
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
#include <executorch/runtime/backend/backend_registry.h>
#include <executorch/runtime/core/error.h>
Expand Down

21 changes: 1 addition & 20 deletions
backends/qnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,25 +42,6 @@ def define_common_targets():
 ],
 )

 for aten_mode in (True, False):
 aten_suffix = "_aten" if aten_mode else ""
 runtime.cxx_library(
 name = "qnnpack_utils" + aten_suffix,
 srcs = [
 "utils/utils.cpp",
 ],
 exported_headers = ["utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/qnnpack/test/...",
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.cxx_library(
 name = "qnnpack_backend",
 srcs = [
Expand All@@ -84,14 +65,14 @@ def define_common_targets():
 "//executorch/runtime/core/exec_aten/util:tensor_util",
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 "//executorch/util:memory_utils",
 "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
 prefix = (
 "xplat/" if is_xplat() else ""
 ),
 ),
 ":qnnpack_schema",
 ":qnnpack_utils",
 ],
 platforms = [
 ANDROID,
Expand Down

3 changes: 0 additions & 3 deletions
backends/qnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_qnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/xnnpack/runtime/XNNExecutor.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>

namespace torch {
namespace executor {
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 * LICENSE file in the root directory of this source tree.
 */

#include <executorch/backends/qnnpack/utils/utils.h>
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
#include <executorch/runtime/platform/assert.h>

namespace torch {
Expand Down

0
backends/qnnpack/utils/utils.h → backends/xnnpack/runtime/utils/utils.h

View file


Open in desktop


File renamed without changes.


18 changes: 17 additions & 1 deletion
backends/xnnpack/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_library(
 name = "dynamic_quant_utils",
 srcs = [
 "runtime/utils/utils.cpp",
 ],
 exported_headers = ["runtime/utils/utils.h"],
 deps = [
 "//executorch/runtime/core/exec_aten:lib",
 "//executorch/runtime/backend:backend_registry",
 ],
 visibility = [
 "//executorch/backends/xnnpack/...",
 "@EXECUTORCH_CLIENTS",
 ],
 )

 runtime.genrule(
 name = "gen_xnnpack_schema",
 srcs = [
Expand DownExpand Up@@ -52,8 +68,8 @@ def define_common_targets():
 deps = [
 third_party_dep("XNNPACK"),
 ":xnnpack_schema",
 ":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
 "//executorch/runtime/backend:backend_registry",
 "//executorch/backends/qnnpack:qnnpack_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
 "//executorch/backends/xnnpack/threadpool:threadpool",
 "//executorch/util:memory_utils",
 "//executorch/runtime/core/exec_aten/util:tensor_util",
Expand Down

3 changes: 3 additions & 0 deletions
backends/xnnpack/test/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
load(":targets.bzl", "define_common_targets")

define_common_targets()

python_unittest(
 name = "test_xnnpack",
Expand Down

2 changes: 1 addition & 1 deletion
backends/qnnpack/test/test_utils.cpp → ...npack/test/runtime/test_runtime_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
#include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
#include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
#include <executorch/runtime/platform/runtime.h>
#include "executorch/backends/qnnpack/utils/utils.h"
#include "executorch/backends/xnnpack/runtime/utils/utils.h"

using namespace ::testing;

Expand Down

13 changes: 3 additions & 10 deletions
backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
load(
 "@fbsource//tools/build_defs:default_platform_defs.bzl",
 "ANDROID",
 "APPLE",
 "CXX",
)
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
 runtime.cxx_test(
 name = "qnnpack_utils_test",
 srcs = ["test_utils.cpp"],
 name = "dynamic_quant_utils_test",
 srcs = ["runtime/test_runtime_utils.cpp"],
 fbcode_deps = [
 "//caffe2:ATen-cpu",
 ],
 xplat_deps = [
 "//caffe2:aten_cpu",
 ],
 platforms = [ANDROID, APPLE, CXX],
 deps = [
 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
 "//executorch/runtime/core/exec_aten/util:scalar_type_util",
 "//executorch/extension/aten_util:aten_bridge",
 "//executorch/backends/qnnpack:qnnpack_utils",
 "//executorch/backends/xnnpack:dynamic_quant_utils",
 ],
 )

2 changes: 1 addition & 1 deletion
backends/xnnpack/threadpool/targets.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ def define_common_targets():
 exported_headers = _THREADPOOL_HEADERS,
 exported_deps = [
 third_party_dep("pthreadpool"),
 third_party_dep("cpuinfo"),
 ],
 external_deps = ["cpuinfo"],
 exported_preprocessor_flags = [
 "-DET_USE_THREADPOOL",
 ],
Expand Down

21 changes: 1 addition & 20 deletions
backends/xnnpack/utils/TARGETS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
load("@fbcode_macros//build_defs:python_library.bzl", "python_library")

buck_genrule(
 name = "xnnpack_constants",
 srcs = {
 "xnnpack.h": "//xplat/third-party/XNNPACK:xnnpack.h",
 },
 outs = {
 "xnnpack_constants.py": ["xnnpack_constants.py"],
 },
 cmd = " && ".join([
 "echo UINT32_MAX = 4294967295 > ${OUT}/xnnpack_constants.py",
 "awk '/^#define\\s+XNN_/ { print $2,\"=\",$3} ' xnnpack.h >> ${OUT}/xnnpack_constants.py",
 "if ! grep -qc \"^XNN_\" ${OUT}/xnnpack_constants.py; then false; fi",
 ]),
 visibility = [
 "//executorch/backends/xnnpack/utils:xnnpack_utils",
 ],
)

python_library(
 name = "xnnpack_utils",
 srcs = glob(["*.py"]) + [":xnnpack_constants[xnnpack_constants.py]"],
 srcs = glob(["*.py"]),
 deps = [
 "//caffe2:torch",
 "//executorch/exir:lib",
Expand Down

30 changes: 30 additions & 0 deletions
backends/xnnpack/utils/gen_xnnpack_constants.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Usage:
# This script is used to autogenerate constants found in the xnnpack header file
# as constants in python, which is used in xnnpack delegate. This script requires
# the path to the XNNPACK folder as an argument

# Example:
# bash gen_xnnpack_constants.sh ~/fbsource/xplat/third-party/XNNPACK/XNNPACK


# constant's file header
{
 echo "# Copyright (c) Meta Platforms, Inc. and affiliates."
 echo "# All rights reserved."
 echo "#"
 echo "# This source code is licensed under the BSD-style license found in the"
 echo "# LICENSE file in the root directory of this source tree."
 echo ""
 echo "# Auto-generated by gen_xnnpack_constants.sh script. Do not modify"
} > xnnpack_constants.py

echo UINT32_MAX = 4294967295 >> xnnpack_constants.py
awk '/^#define\s+XNN_/ { print $2,"=",$3} ' "$1"/include/xnnpack.h >> xnnpack_constants.py
if ! grep -qc "^XNN_" xnnpack_constants.py; then false; fi

29 changes: 29 additions & 0 deletions
backends/xnnpack/utils/xnnpack_constants.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Auto-generated by gen_xnnpack_constants.sh script. Do not modify
UINT32_MAX = 4294967295
XNN_EXTRA_BYTES = 16
XNN_MAX_TENSOR_DIMS = 6
XNN_FLAG_SPARSE_INFERENCE = 0x00000001
XNN_FLAG_HINT_SPARSE_INFERENCE = XNN_FLAG_SPARSE_INFERENCE
XNN_FLAG_FP16_INFERENCE = 0x00000002
XNN_FLAG_HINT_FP16_INFERENCE = XNN_FLAG_FP16_INFERENCE
XNN_FLAG_FORCE_FP16_INFERENCE = 0x00000004
XNN_FLAG_BASIC_PROFILING = 0x00000008
XNN_FLAG_DEPTHWISE_CONVOLUTION = 0x00000001
XNN_FLAG_TRANSPOSE_WEIGHTS = 0x00000001
XNN_FLAG_INPUT_NHWC = 0x00000002
XNN_FLAG_TENSORFLOW_SAME_PADDING = 0x00000004
XNN_FLAG_TENSORFLOW_RESHAPE_2D = 0x00000004
XNN_FLAG_TENSORFLOW_LEGACY_MODE = 0x00000004
XNN_FLAG_FP32_STATIC_WEIGHTS = 0x00000008
XNN_FLAG_ALIGN_CORNERS = 0x00000008
XNN_FLAG_YIELD_WORKERS = 0x00000010
XNN_VALUE_FLAG_EXTERNAL_INPUT = 0x00000001
XNN_VALUE_FLAG_EXTERNAL_OUTPUT = 0x00000002
XNN_VALUE_FLAG_PERSISTENT = 0x00000004
XNN_INVALID_VALUE_ID = UINT32_MAX

2 changes: 1 addition & 1 deletion
shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
 "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
 "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
 "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
 "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
 "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
 "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
}
Expand Down