address review concerns

rebase and revise per reviewer's concerns
This commit is contained in:
Koan-Sin Tan 2020-04-01 09:13:25 +08:00
parent 9d022cb885
commit 80935f002e
2 changed files with 8 additions and 19 deletions

View File

@ -103,11 +103,7 @@ TfLiteDelegatePtrMap GetDelegates(Settings* s) {
} }
if (s->xnnpack_delegate) { if (s->xnnpack_delegate) {
TfLiteXNNPackDelegateOptions xnnpack_options = auto delegate = evaluation::CreateXNNPACKDelegate(s->number_of_threads);
TfLiteXNNPackDelegateOptionsDefault();
xnnpack_options.num_threads = s->number_of_threads;
auto delegate = evaluation::CreateXNNPACKDelegate(&xnnpack_options);
if (!delegate) { if (!delegate) {
LOG(INFO) << "XNNPACK acceleration is unsupported on this platform."; LOG(INFO) << "XNNPACK acceleration is unsupported on this platform.";
} else { } else {

View File

@ -96,10 +96,9 @@ MACH_ARM_SRCS = [
cc_library( cc_library(
name = "cpuinfo_impl", name = "cpuinfo_impl",
srcs = select({ srcs = select({
":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS,
":linux_arm": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS,
":linux_x86_64": COMMON_SRCS + X86_SRCS + LINUX_SRCS + LINUX_X86_SRCS, ":linux_x86_64": COMMON_SRCS + X86_SRCS + LINUX_SRCS + LINUX_X86_SRCS,
":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS, ":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS,
":linux_arm": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS,
":macos_x86_64": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS, ":macos_x86_64": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS,
":android_armv7": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS + ANDROID_ARM_SRCS, ":android_armv7": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS + ANDROID_ARM_SRCS,
":android_arm64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS + ANDROID_ARM_SRCS, ":android_arm64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS + ANDROID_ARM_SRCS,
@ -159,18 +158,6 @@ cc_library(
############################# Build configurations ############################# ############################# Build configurations #############################
config_setting(
name = "linux_aarch64",
values = {"cpu": "aarch64"},
visibility = ["//visibility:public"],
)
config_setting(
name = "linux_arm",
values = {"cpu": "arm"},
visibility = ["//visibility:public"],
)
config_setting( config_setting(
name = "linux_x86_64", name = "linux_x86_64",
values = {"cpu": "k8"}, values = {"cpu": "k8"},
@ -181,6 +168,12 @@ config_setting(
values = {"cpu": "aarch64"}, values = {"cpu": "aarch64"},
) )
config_setting(
name = "linux_arm",
values = {"cpu": "arm"},
visibility = ["//visibility:public"],
)
config_setting( config_setting(
name = "macos_x86_64", name = "macos_x86_64",
values = { values = {