From 937a6b14228591e30f74142ba4f51e456224bb35 Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Thu, 18 May 2023 20:17:07 -0700 Subject: [PATCH] Internal change PiperOrigin-RevId: 533327411 --- mediapipe/gpu/BUILD | 6 +++++- mediapipe/gpu/gpu_service.h | 3 ++- mediapipe/gpu/gpu_shared_data_internal.cc | 3 ++- mediapipe/tasks/cc/core/model_resources_cache.h | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mediapipe/gpu/BUILD b/mediapipe/gpu/BUILD index c785e562..e7c65b7c 100644 --- a/mediapipe/gpu/BUILD +++ b/mediapipe/gpu/BUILD @@ -38,7 +38,10 @@ cc_library( srcs = ["gpu_service.cc"], hdrs = ["gpu_service.h"], visibility = ["//visibility:public"], - deps = ["//mediapipe/framework:graph_service"] + select({ + deps = [ + "//mediapipe/framework:graph_service", + "@com_google_absl//absl/base:core_headers", + ] + select({ "//conditions:default": [ ":gpu_shared_data_internal", ], @@ -630,6 +633,7 @@ cc_library( "//mediapipe/framework:executor", "//mediapipe/framework/deps:no_destructor", "//mediapipe/framework/port:ret_check", + "@com_google_absl//absl/base:core_headers", ] + select({ "//conditions:default": [], "//mediapipe:apple": [ diff --git a/mediapipe/gpu/gpu_service.h b/mediapipe/gpu/gpu_service.h index 65fecd0b..dd3bd3bf 100644 --- a/mediapipe/gpu/gpu_service.h +++ b/mediapipe/gpu/gpu_service.h @@ -15,6 +15,7 @@ #ifndef MEDIAPIPE_GPU_GPU_SERVICE_H_ #define MEDIAPIPE_GPU_GPU_SERVICE_H_ +#include "absl/base/attributes.h" #include "mediapipe/framework/graph_service.h" #if !MEDIAPIPE_DISABLE_GPU @@ -29,7 +30,7 @@ class GpuResources { }; #endif // MEDIAPIPE_DISABLE_GPU -extern const GraphService kGpuService; +ABSL_CONST_INIT extern const GraphService kGpuService; } // namespace mediapipe diff --git a/mediapipe/gpu/gpu_shared_data_internal.cc b/mediapipe/gpu/gpu_shared_data_internal.cc index f542f0bb..1098c82e 100644 --- a/mediapipe/gpu/gpu_shared_data_internal.cc +++ b/mediapipe/gpu/gpu_shared_data_internal.cc @@ -14,6 +14,7 @@ #include "mediapipe/gpu/gpu_shared_data_internal.h" +#include "absl/base/attributes.h" #include "mediapipe/framework/deps/no_destructor.h" #include "mediapipe/framework/port/ret_check.h" #include "mediapipe/gpu/gl_context.h" @@ -116,7 +117,7 @@ GpuResources::~GpuResources() { #endif // __APPLE__ } -extern const GraphService kGpuService; +ABSL_CONST_INIT extern const GraphService kGpuService; absl::Status GpuResources::PrepareGpuNode(CalculatorNode* node) { CHECK(node->Contract().ServiceRequests().contains(kGpuService.key)); diff --git a/mediapipe/tasks/cc/core/model_resources_cache.h b/mediapipe/tasks/cc/core/model_resources_cache.h index 75c24f34..113cfb2d 100644 --- a/mediapipe/tasks/cc/core/model_resources_cache.h +++ b/mediapipe/tasks/cc/core/model_resources_cache.h @@ -103,8 +103,8 @@ class ModelResourcesCache { }; // Global service for mediapipe task model resources cache. -const mediapipe::GraphService kModelResourcesCacheService( - "mediapipe::tasks::ModelResourcesCacheService"); +inline constexpr mediapipe::GraphService + kModelResourcesCacheService("mediapipe::tasks::ModelResourcesCacheService"); } // namespace core } // namespace tasks