Add build variants for _gms to some MediaPipe libraries that use TFLite
This change alters some cc_library to cc_library_with_tflite to add _gms variants to some select MediaPipe libraries. This CL also makes minimal changes in the code to make the _gms variants buildable. PiperOrigin-RevId: 518336242
This commit is contained in:
committed by
Copybara-Service
parent
384f77b5c3
commit
88effb19e5
@@ -14,6 +14,7 @@
|
||||
#
|
||||
|
||||
load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")
|
||||
load("@org_tensorflow//tensorflow/lite/core/shims:cc_library_with_tflite.bzl", "cc_library_with_tflite")
|
||||
load("@bazel_skylib//lib:selects.bzl", "selects")
|
||||
|
||||
licenses(["notice"])
|
||||
@@ -312,15 +313,19 @@ cc_library(
|
||||
alwayslink = 1,
|
||||
)
|
||||
|
||||
cc_library(
|
||||
# TODO: Re-evaluate which of these libraries we can avoid making
|
||||
# cc_library_with_tflite and can be changed back to cc_library.
|
||||
cc_library_with_tflite(
|
||||
name = "tflite_model_calculator",
|
||||
srcs = ["tflite_model_calculator.cc"],
|
||||
tflite_deps = [
|
||||
"@org_tensorflow//tensorflow/lite:framework_stable",
|
||||
],
|
||||
deps = [
|
||||
"//mediapipe/framework:calculator_framework",
|
||||
"//mediapipe/framework:packet",
|
||||
"//mediapipe/framework/port:ret_check",
|
||||
"@com_google_absl//absl/status",
|
||||
"@org_tensorflow//tensorflow/lite/core/shims:framework_stable",
|
||||
],
|
||||
alwayslink = 1,
|
||||
)
|
||||
|
||||
@@ -66,7 +66,7 @@ class TfLiteCustomOpResolverCalculator : public CalculatorBase {
|
||||
} else {
|
||||
cc->OutputSidePackets()
|
||||
.Index(0)
|
||||
.Set<tflite_shims::ops::builtin::BuiltinOpResolver>();
|
||||
.Set<tflite::ops::builtin::BuiltinOpResolver>();
|
||||
}
|
||||
return absl::OkStatus();
|
||||
}
|
||||
@@ -77,7 +77,7 @@ class TfLiteCustomOpResolverCalculator : public CalculatorBase {
|
||||
const TfLiteCustomOpResolverCalculatorOptions& options =
|
||||
cc->Options<TfLiteCustomOpResolverCalculatorOptions>();
|
||||
|
||||
std::unique_ptr<tflite_shims::ops::builtin::BuiltinOpResolver> op_resolver;
|
||||
std::unique_ptr<tflite::ops::builtin::BuiltinOpResolver> op_resolver;
|
||||
if (options.use_gpu()) {
|
||||
op_resolver = absl::make_unique<mediapipe::OpResolver>();
|
||||
} else {
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "mediapipe/framework/packet.h"
|
||||
#include "mediapipe/framework/port/ret_check.h"
|
||||
#include "tensorflow/lite/allocation.h"
|
||||
#include "tensorflow/lite/core/shims/cc/model.h"
|
||||
#include "tensorflow/lite/model.h"
|
||||
|
||||
namespace mediapipe {
|
||||
|
||||
@@ -82,7 +82,7 @@ class TfLiteModelCalculator : public CalculatorBase {
|
||||
}
|
||||
|
||||
if (cc->InputSidePackets().HasTag("MODEL_FD")) {
|
||||
#ifdef ABSL_HAVE_MMAP
|
||||
#if defined(ABSL_HAVE_MMAP) && !TFLITE_WITH_STABLE_ABI
|
||||
model_packet = cc->InputSidePackets().Tag("MODEL_FD");
|
||||
const auto& model_fd =
|
||||
model_packet.Get<std::tuple<int, size_t, size_t>>();
|
||||
|
||||
Reference in New Issue
Block a user