Skip to content

GitLab

T
tangled
Commit 620219f7 authored by Michael Crouse's avatar Michael Crouse Committed by Chromium LUCI CQ
Browse files
Options

[TFLite] Fix test for windows and create custom resolver. 

This fixes some path and test data issues that cause tests to fail
when enabling TFLite in the build.

This also creates a TFLite resolver for Chrome with the set of ops
to be supported initially.

Bug: 1165517
Change-Id: Ib0acdcb380578e94f4b7172b5ebe27ab6faafc25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2631186Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Reviewed-by: default avatarSophie Chang <sophiechang@chromium.org>
Commit-Queue: Michael Crouse <mcrouse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844164}
parent 840abe8b
Show whitespace changes
Inline Side-by-side
Showing with 412 additions and 21 deletions
chrome/browser/BUILD.gn
View file @ 620219f7
...@@ -2468,7 +2468,7 @@ static_library("browser") { ...@@ -2468,7 +2468,7 @@ static_library("browser") {
"tflite_experiment/tflite_experiment_switches.h", "tflite_experiment/tflite_experiment_switches.h",
] ]
deps += [ "//chrome/services/machine_learning" ] public_deps += [ "//chrome/services/machine_learning" ]
} }
# Platforms that have a network diagnostics dialog. All others fall through # Platforms that have a network diagnostics dialog. All others fall through
......
chrome/browser/tflite_experiment/tflite_experiment_keyed_service_browsertest.cc
View file @ 620219f7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "chrome/browser/tflite_experiment/tflite_experiment_keyed_service.h" #include "chrome/browser/tflite_experiment/tflite_experiment_keyed_service.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/json/json_reader.h" #include "base/json/json_reader.h"
#include "base/path_service.h" #include "base/path_service.h"
...@@ -25,9 +26,7 @@ ...@@ -25,9 +26,7 @@
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
constexpr char kTFLiteModelName[] = "simple_test.tflite";
constexpr char kNavigationURL[] = "https://google.com"; constexpr char kNavigationURL[] = "https://google.com";
constexpr char kTFLiteExperimentLogName[] = "tflite_experiment.log";
namespace { namespace {
// Fetch and calculate the total number of samples from all the bins for // Fetch and calculate the total number of samples from all the bins for
...@@ -90,16 +89,6 @@ IN_PROC_BROWSER_TEST_F(TFLiteExperimentKeyedServiceDisabledBrowserTest, ...@@ -90,16 +89,6 @@ IN_PROC_BROWSER_TEST_F(TFLiteExperimentKeyedServiceDisabledBrowserTest,
EXPECT_FALSE(tflite_experiment_keyed_service->tflite_predictor()); EXPECT_FALSE(tflite_experiment_keyed_service->tflite_predictor());
} }
IN_PROC_BROWSER_TEST_F(
TFLiteExperimentKeyedServiceDisabledBrowserTest,
TFLiteExperimentEnabledButTFLitePredictorDisabledOnNavigation) {
GURL navigation_url(kNavigationURL);
ui_test_utils::NavigateToURL(browser(), navigation_url);
WaitForTFLiteObserverToCallNullTFLitePredictor();
histogram_tester()->ExpectUniqueSample(
"TFLiteExperiment.Observer.TFLitePredictor.Null", true, 1);
}
class TFLiteExperimentKeyedServiceBrowserTest : public InProcessBrowserTest { class TFLiteExperimentKeyedServiceBrowserTest : public InProcessBrowserTest {
public: public:
TFLiteExperimentKeyedServiceBrowserTest() = default; TFLiteExperimentKeyedServiceBrowserTest() = default;
...@@ -112,21 +101,21 @@ class TFLiteExperimentKeyedServiceBrowserTest : public InProcessBrowserTest { ...@@ -112,21 +101,21 @@ class TFLiteExperimentKeyedServiceBrowserTest : public InProcessBrowserTest {
// Set TFLite model path. // Set TFLite model path.
base::PathService::Get(chrome::DIR_TEST_DATA, &g_test_data_directory); base::PathService::Get(chrome::DIR_TEST_DATA, &g_test_data_directory);
g_test_data_directory = g_test_data_directory =
g_test_data_directory.Append(FILE_PATH_LITERAL(kTFLiteModelName)); g_test_data_directory.Append(FILE_PATH_LITERAL("simple_test.tflite"));
cmd->AppendSwitchASCII(tflite_experiment::switches::kTFLiteModelPath, cmd->AppendSwitchASCII(tflite_experiment::switches::kTFLiteModelPath,
g_test_data_directory.value()); g_test_data_directory.MaybeAsASCII());
// Set TFLite experiment log path. // Set TFLite experiment log path.
cmd->AppendSwitchASCII( cmd->AppendSwitchASCII(
tflite_experiment::switches::kTFLiteExperimentLogPath, tflite_experiment::switches::kTFLiteExperimentLogPath,
GetTFLiteExperimentLogPath().value()); GetTFLiteExperimentLogPath().MaybeAsASCII());
} }
base::FilePath GetTFLiteExperimentLogPath() { base::FilePath GetTFLiteExperimentLogPath() {
base::FilePath g_test_data_directory; base::FilePath g_test_data_directory;
base::PathService::Get(chrome::DIR_TEST_DATA, &g_test_data_directory); base::PathService::Get(chrome::DIR_TEST_DATA, &g_test_data_directory);
g_test_data_directory = g_test_data_directory = g_test_data_directory.Append(
g_test_data_directory.Append(kTFLiteExperimentLogName); FILE_PATH_LITERAL("tflite_experiment.log"));
return g_test_data_directory; return g_test_data_directory;
} }
......
chrome/services/machine_learning/BUILD.gn
View file @ 620219f7
...@@ -27,6 +27,8 @@ source_set("machine_learning") { ...@@ -27,6 +27,8 @@ source_set("machine_learning") {
if (build_with_tflite_lib) { if (build_with_tflite_lib) {
sources += [ sources += [
"chrome_tflite_op_resolver.cc",
"chrome_tflite_op_resolver.h",
"in_process_tflite_predictor.cc", "in_process_tflite_predictor.cc",
"in_process_tflite_predictor.h", "in_process_tflite_predictor.h",
] ]
...@@ -65,6 +67,8 @@ source_set("unit_tests") { ...@@ -65,6 +67,8 @@ source_set("unit_tests") {
sources += [ "in_process_tflite_predictor_unittest.cc" ] sources += [ "in_process_tflite_predictor_unittest.cc" ]
} }
data = [ "//chrome/test/data/" ]
deps = [ deps = [
":machine_learning", ":machine_learning",
":metrics", ":metrics",
......
chrome/services/machine_learning/chrome_tflite_op_resolver.cc 0 → 100644
View file @ 620219f7
// Copyright 2021 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/services/machine_learning/chrome_tflite_op_resolver.h"
#include "third_party/tflite/src/tensorflow/lite/c/common.h"
#include "third_party/tflite/src/tensorflow/lite/kernels/builtin_op_kernels.h"
#include "third_party/tflite/src/tensorflow/lite/schema/schema_generated.h"
namespace machine_learning {
ChromeTFLiteOpResolver::ChromeTFLiteOpResolver() {
AddBuiltin(tflite::BuiltinOperator_ABS, tflite::ops::builtin::Register_ABS());
AddBuiltin(tflite::BuiltinOperator_HARD_SWISH,
tflite::ops::builtin::Register_HARD_SWISH());
AddBuiltin(tflite::BuiltinOperator_RELU,
tflite::ops::builtin::Register_RELU(), /* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_RELU_N1_TO_1,
tflite::ops::builtin::Register_RELU_N1_TO_1());
AddBuiltin(tflite::BuiltinOperator_RELU6,
tflite::ops::builtin::Register_RELU6(), /* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_TANH,
tflite::ops::builtin::Register_TANH(), /* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_LOGISTIC,
tflite::ops::builtin::Register_LOGISTIC(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_AVERAGE_POOL_2D,
tflite::ops::builtin::Register_AVERAGE_POOL_2D(),
/* min_version */ 1,
/* max_version */ 3);
AddBuiltin(tflite::BuiltinOperator_MAX_POOL_2D,
tflite::ops::builtin::Register_MAX_POOL_2D(),
/* min_version */ 1,
/* max_version */ 3);
AddBuiltin(tflite::BuiltinOperator_L2_POOL_2D,
tflite::ops::builtin::Register_L2_POOL_2D());
AddBuiltin(tflite::BuiltinOperator_CONV_2D,
tflite::ops::builtin::Register_CONV_2D(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_DEPTHWISE_CONV_2D,
tflite::ops::builtin::Register_DEPTHWISE_CONV_2D(),
/* min_version = */ 1,
/* max_version = */ 5);
AddBuiltin(tflite::BuiltinOperator_SVDF,
tflite::ops::builtin::Register_SVDF(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_RNN, tflite::ops::builtin::Register_RNN(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_BIDIRECTIONAL_SEQUENCE_RNN,
tflite::ops::builtin::Register_BIDIRECTIONAL_SEQUENCE_RNN(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_UNIDIRECTIONAL_SEQUENCE_RNN,
tflite::ops::builtin::Register_UNIDIRECTIONAL_SEQUENCE_RNN(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_EMBEDDING_LOOKUP,
tflite::ops::builtin::Register_EMBEDDING_LOOKUP(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_EMBEDDING_LOOKUP_SPARSE,
tflite::ops::builtin::Register_EMBEDDING_LOOKUP_SPARSE());
AddBuiltin(tflite::BuiltinOperator_FULLY_CONNECTED,
tflite::ops::builtin::Register_FULLY_CONNECTED(),
/* min_version = */ 1,
/* max_version = */ 8);
AddBuiltin(tflite::BuiltinOperator_LSH_PROJECTION,
tflite::ops::builtin::Register_LSH_PROJECTION());
AddBuiltin(tflite::BuiltinOperator_HASHTABLE_LOOKUP,
tflite::ops::builtin::Register_HASHTABLE_LOOKUP());
AddBuiltin(tflite::BuiltinOperator_SOFTMAX,
tflite::ops::builtin::Register_SOFTMAX(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_CONCATENATION,
tflite::ops::builtin::Register_CONCATENATION(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_ADD, tflite::ops::builtin::Register_ADD(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_SPACE_TO_BATCH_ND,
tflite::ops::builtin::Register_SPACE_TO_BATCH_ND(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_BATCH_TO_SPACE_ND,
tflite::ops::builtin::Register_BATCH_TO_SPACE_ND(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_MUL, tflite::ops::builtin::Register_MUL(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_L2_NORMALIZATION,
tflite::ops::builtin::Register_L2_NORMALIZATION(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_LOCAL_RESPONSE_NORMALIZATION,
tflite::ops::builtin::Register_LOCAL_RESPONSE_NORMALIZATION());
AddBuiltin(tflite::BuiltinOperator_LSTM,
tflite::ops::builtin::Register_LSTM(), /* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_BIDIRECTIONAL_SEQUENCE_LSTM,
tflite::ops::builtin::Register_BIDIRECTIONAL_SEQUENCE_LSTM(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_UNIDIRECTIONAL_SEQUENCE_LSTM,
tflite::ops::builtin::Register_UNIDIRECTIONAL_SEQUENCE_LSTM(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_PAD, tflite::ops::builtin::Register_PAD(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_PADV2,
tflite::ops::builtin::Register_PADV2(), /* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_RESHAPE,
tflite::ops::builtin::Register_RESHAPE());
AddBuiltin(tflite::BuiltinOperator_RESIZE_BILINEAR,
tflite::ops::builtin::Register_RESIZE_BILINEAR(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_RESIZE_NEAREST_NEIGHBOR,
tflite::ops::builtin::Register_RESIZE_NEAREST_NEIGHBOR(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_SKIP_GRAM,
tflite::ops::builtin::Register_SKIP_GRAM());
AddBuiltin(tflite::BuiltinOperator_SPACE_TO_DEPTH,
tflite::ops::builtin::Register_SPACE_TO_DEPTH(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_DEPTH_TO_SPACE,
tflite::ops::builtin::Register_DEPTH_TO_SPACE());
AddBuiltin(tflite::BuiltinOperator_GATHER,
tflite::ops::builtin::Register_GATHER(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_TRANSPOSE,
tflite::ops::builtin::Register_TRANSPOSE(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_MEAN,
tflite::ops::builtin::Register_MEAN(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_DIV, tflite::ops::builtin::Register_DIV(),
/* min_version */ 1,
/* max_version */ 2);
AddBuiltin(tflite::BuiltinOperator_SUB, tflite::ops::builtin::Register_SUB(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_SPLIT,
tflite::ops::builtin::Register_SPLIT(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_SPLIT_V,
tflite::ops::builtin::Register_SPLIT_V(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_SQUEEZE,
tflite::ops::builtin::Register_SQUEEZE());
AddBuiltin(tflite::BuiltinOperator_STRIDED_SLICE,
tflite::ops::builtin::Register_STRIDED_SLICE(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_EXP, tflite::ops::builtin::Register_EXP());
AddBuiltin(tflite::BuiltinOperator_TOPK_V2,
tflite::ops::builtin::Register_TOPK_V2(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_LOG, tflite::ops::builtin::Register_LOG());
AddBuiltin(tflite::BuiltinOperator_LOG_SOFTMAX,
tflite::ops::builtin::Register_LOG_SOFTMAX(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_CAST,
tflite::ops::builtin::Register_CAST());
AddBuiltin(tflite::BuiltinOperator_DEQUANTIZE,
tflite::ops::builtin::Register_DEQUANTIZE(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_PRELU,
tflite::ops::builtin::Register_PRELU());
AddBuiltin(tflite::BuiltinOperator_MAXIMUM,
tflite::ops::builtin::Register_MAXIMUM(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_MINIMUM,
tflite::ops::builtin::Register_MINIMUM(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_ARG_MAX,
tflite::ops::builtin::Register_ARG_MAX(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_ARG_MIN,
tflite::ops::builtin::Register_ARG_MIN(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_GREATER,
tflite::ops::builtin::Register_GREATER(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_GREATER_EQUAL,
tflite::ops::builtin::Register_GREATER_EQUAL(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_LESS,
tflite::ops::builtin::Register_LESS(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_LESS_EQUAL,
tflite::ops::builtin::Register_LESS_EQUAL(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_FLOOR,
tflite::ops::builtin::Register_FLOOR());
AddBuiltin(tflite::BuiltinOperator_CEIL,
tflite::ops::builtin::Register_CEIL());
AddBuiltin(tflite::BuiltinOperator_ROUND,
tflite::ops::builtin::Register_ROUND());
AddBuiltin(tflite::BuiltinOperator_NEG, tflite::ops::builtin::Register_NEG());
AddBuiltin(tflite::BuiltinOperator_SELECT,
tflite::ops::builtin::Register_SELECT(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_SELECT_V2,
tflite::ops::builtin::Register_SELECT_V2());
AddBuiltin(tflite::BuiltinOperator_SLICE,
tflite::ops::builtin::Register_SLICE(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_SIN, tflite::ops::builtin::Register_SIN());
AddBuiltin(tflite::BuiltinOperator_COS, tflite::ops::builtin::Register_COS());
AddBuiltin(tflite::BuiltinOperator_TRANSPOSE_CONV,
tflite::ops::builtin::Register_TRANSPOSE_CONV(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_TILE,
tflite::ops::builtin::Register_TILE(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_SUM, tflite::ops::builtin::Register_SUM(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_REDUCE_PROD,
tflite::ops::builtin::Register_REDUCE_PROD());
AddBuiltin(tflite::BuiltinOperator_REDUCE_MAX,
tflite::ops::builtin::Register_REDUCE_MAX(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_REDUCE_MIN,
tflite::ops::builtin::Register_REDUCE_MIN(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_REDUCE_ANY,
tflite::ops::builtin::Register_REDUCE_ANY());
AddBuiltin(tflite::BuiltinOperator_EXPAND_DIMS,
tflite::ops::builtin::Register_EXPAND_DIMS());
AddBuiltin(tflite::BuiltinOperator_SPARSE_TO_DENSE,
tflite::ops::builtin::Register_SPARSE_TO_DENSE(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_EQUAL,
tflite::ops::builtin::Register_EQUAL(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_NOT_EQUAL,
tflite::ops::builtin::Register_NOT_EQUAL(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_SQRT,
tflite::ops::builtin::Register_SQRT());
AddBuiltin(tflite::BuiltinOperator_RSQRT,
tflite::ops::builtin::Register_RSQRT());
AddBuiltin(tflite::BuiltinOperator_SHAPE,
tflite::ops::builtin::Register_SHAPE());
AddBuiltin(tflite::BuiltinOperator_RANK,
tflite::ops::builtin::Register_RANK());
AddBuiltin(tflite::BuiltinOperator_POW, tflite::ops::builtin::Register_POW());
AddBuiltin(tflite::BuiltinOperator_FAKE_QUANT,
tflite::ops::builtin::Register_FAKE_QUANT(), 1, 2);
AddBuiltin(tflite::BuiltinOperator_PACK,
tflite::ops::builtin::Register_PACK(),
/* min_version = */ 1,
/* max_version = */ 3);
AddBuiltin(tflite::BuiltinOperator_ONE_HOT,
tflite::ops::builtin::Register_ONE_HOT());
AddBuiltin(tflite::BuiltinOperator_LOGICAL_OR,
tflite::ops::builtin::Register_LOGICAL_OR());
AddBuiltin(tflite::BuiltinOperator_LOGICAL_AND,
tflite::ops::builtin::Register_LOGICAL_AND());
AddBuiltin(tflite::BuiltinOperator_LOGICAL_NOT,
tflite::ops::builtin::Register_LOGICAL_NOT());
AddBuiltin(tflite::BuiltinOperator_UNPACK,
tflite::ops::builtin::Register_UNPACK(),
/* min_version = */ 1,
/* max_version = */ 4);
AddBuiltin(tflite::BuiltinOperator_FLOOR_DIV,
tflite::ops::builtin::Register_FLOOR_DIV(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_SQUARE,
tflite::ops::builtin::Register_SQUARE());
AddBuiltin(tflite::BuiltinOperator_ZEROS_LIKE,
tflite::ops::builtin::Register_ZEROS_LIKE());
AddBuiltin(tflite::BuiltinOperator_FLOOR_MOD,
tflite::ops::builtin::Register_FLOOR_MOD());
AddBuiltin(tflite::BuiltinOperator_RANGE,
tflite::ops::builtin::Register_RANGE());
AddBuiltin(tflite::BuiltinOperator_LEAKY_RELU,
tflite::ops::builtin::Register_LEAKY_RELU(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_SQUARED_DIFFERENCE,
tflite::ops::builtin::Register_SQUARED_DIFFERENCE());
AddBuiltin(tflite::BuiltinOperator_FILL,
tflite::ops::builtin::Register_FILL(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_MIRROR_PAD,
tflite::ops::builtin::Register_MIRROR_PAD(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_UNIQUE,
tflite::ops::builtin::Register_UNIQUE());
AddBuiltin(tflite::BuiltinOperator_REVERSE_V2,
tflite::ops::builtin::Register_REVERSE_V2(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_ADD_N,
tflite::ops::builtin::Register_ADD_N());
AddBuiltin(tflite::BuiltinOperator_GATHER_ND,
tflite::ops::builtin::Register_GATHER_ND(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_WHERE,
tflite::ops::builtin::Register_WHERE());
AddBuiltin(tflite::BuiltinOperator_ELU, tflite::ops::builtin::Register_ELU());
AddBuiltin(tflite::BuiltinOperator_REVERSE_SEQUENCE,
tflite::ops::builtin::Register_REVERSE_SEQUENCE());
AddBuiltin(tflite::BuiltinOperator_MATRIX_DIAG,
tflite::ops::builtin::Register_MATRIX_DIAG());
AddBuiltin(tflite::BuiltinOperator_QUANTIZE,
tflite::ops::builtin::Register_QUANTIZE(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(tflite::BuiltinOperator_MATRIX_SET_DIAG,
tflite::ops::builtin::Register_MATRIX_SET_DIAG());
AddBuiltin(tflite::BuiltinOperator_IF, tflite::ops::builtin::Register_IF());
AddBuiltin(tflite::BuiltinOperator_WHILE,
tflite::ops::builtin::Register_WHILE());
AddBuiltin(tflite::BuiltinOperator_NON_MAX_SUPPRESSION_V4,
tflite::ops::builtin::Register_NON_MAX_SUPPRESSION_V4());
AddBuiltin(tflite::BuiltinOperator_NON_MAX_SUPPRESSION_V5,
tflite::ops::builtin::Register_NON_MAX_SUPPRESSION_V5());
AddBuiltin(tflite::BuiltinOperator_SCATTER_ND,
tflite::ops::builtin::Register_SCATTER_ND());
AddBuiltin(tflite::BuiltinOperator_DENSIFY,
tflite::ops::builtin::Register_DENSIFY());
AddBuiltin(tflite::BuiltinOperator_SEGMENT_SUM,
tflite::ops::builtin::Register_SEGMENT_SUM());
AddBuiltin(tflite::BuiltinOperator_BATCH_MATMUL,
tflite::ops::builtin::Register_BATCH_MATMUL(),
/* min_version = */ 1,
/* max_version = */ 2);
}
} // namespace machine_learning
chrome/services/machine_learning/chrome_tflite_op_resolver.h 0 → 100644
View file @ 620219f7
// Copyright 2021 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_SERVICES_MACHINE_LEARNING_CHROME_TFLITE_OP_RESOLVER_H_
#define CHROME_SERVICES_MACHINE_LEARNING_CHROME_TFLITE_OP_RESOLVER_H_
#include "third_party/tflite/src/tensorflow/lite/model.h"
#include "third_party/tflite/src/tensorflow/lite/mutable_op_resolver.h"
namespace machine_learning {
// This class maintains all the currently supported TFLite
// operations for Chrome and registers them for use.
class ChromeTFLiteOpResolver : public tflite::MutableOpResolver {
public:
ChromeTFLiteOpResolver();
};
} // namespace machine_learning
#endif // CHROME_SERVICES_MACHINE_LEARNING_CHROME_TFLITE_OP_RESOLVER_H_
chrome/services/machine_learning/in_process_tflite_predictor.cc
View file @ 620219f7
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "chrome/services/machine_learning/in_process_tflite_predictor.h" #include "chrome/services/machine_learning/in_process_tflite_predictor.h"
#include "base/check.h" #include "base/check.h"
#include "chrome/services/machine_learning/chrome_tflite_op_resolver.h"
#include "third_party/tflite/src/tensorflow/lite/interpreter.h" #include "third_party/tflite/src/tensorflow/lite/interpreter.h"
#include "third_party/tflite/src/tensorflow/lite/kernels/register.h"
#include "third_party/tflite/src/tensorflow/lite/model.h" #include "third_party/tflite/src/tensorflow/lite/model.h"
namespace machine_learning { namespace machine_learning {
...@@ -46,7 +46,7 @@ bool InProcessTFLitePredictor::LoadModel() { ...@@ -46,7 +46,7 @@ bool InProcessTFLitePredictor::LoadModel() {
} }
bool InProcessTFLitePredictor::BuildInterpreter() { bool InProcessTFLitePredictor::BuildInterpreter() {
tflite::ops::builtin::BuiltinOpResolver resolver; ChromeTFLiteOpResolver resolver;
tflite::InterpreterBuilder builder(*model_, resolver); tflite::InterpreterBuilder builder(*model_, resolver);
if (builder(&interpreter_, num_threads_) != kTfLiteOk || !interpreter_) if (builder(&interpreter_, num_threads_) != kTfLiteOk || !interpreter_)
......
chrome/services/machine_learning/in_process_tflite_predictor_unittest.cc
View file @ 620219f7
...@@ -51,7 +51,7 @@ class InProcessTFLitePredictorTest : public ::testing::Test { ...@@ -51,7 +51,7 @@ class InProcessTFLitePredictorTest : public ::testing::Test {
.Append(FILE_PATH_LITERAL("data")) .Append(FILE_PATH_LITERAL("data"))
.Append(FILE_PATH_LITERAL("simple_test.tflite")); .Append(FILE_PATH_LITERAL("simple_test.tflite"));
EXPECT_TRUE(base::PathExists(model_file_path)); EXPECT_TRUE(base::PathExists(model_file_path));
return model_file_path.value().c_str(); return model_file_path.AsUTF8Unsafe();
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment