Open up framework visibility.

PiperOrigin-RevId: 493660013
This commit is contained in:
Jiuqiang Tang 2022-12-07 11:24:15 -08:00 committed by Copybara-Service
parent d84eec387b
commit 80c605459c
4 changed files with 13 additions and 64 deletions

View File

@ -20,7 +20,9 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
licenses(["notice"]) licenses(["notice"])
package(default_visibility = ["//visibility:private"]) package(default_visibility = [
"//mediapipe:__subpackages__",
])
bzl_library( bzl_library(
name = "expand_template_bzl", name = "expand_template_bzl",
@ -50,13 +52,11 @@ mediapipe_proto_library(
cc_library( cc_library(
name = "aligned_malloc_and_free", name = "aligned_malloc_and_free",
hdrs = ["aligned_malloc_and_free.h"], hdrs = ["aligned_malloc_and_free.h"],
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
name = "cleanup", name = "cleanup",
hdrs = ["cleanup.h"], hdrs = ["cleanup.h"],
visibility = ["//visibility:public"],
deps = ["@com_google_absl//absl/base:core_headers"], deps = ["@com_google_absl//absl/base:core_headers"],
) )
@ -86,7 +86,6 @@ cc_library(
# Use this library through "mediapipe/framework/port:gtest_main". # Use this library through "mediapipe/framework/port:gtest_main".
visibility = [ visibility = [
"//mediapipe/framework/port:__pkg__", "//mediapipe/framework/port:__pkg__",
"//third_party/visionai/algorithms/tracking:__pkg__",
], ],
deps = [ deps = [
"//mediapipe/framework/port:core_proto", "//mediapipe/framework/port:core_proto",
@ -108,7 +107,6 @@ cc_library(
name = "file_helpers", name = "file_helpers",
srcs = ["file_helpers.cc"], srcs = ["file_helpers.cc"],
hdrs = ["file_helpers.h"], hdrs = ["file_helpers.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":file_path", ":file_path",
"//mediapipe/framework/port:status", "//mediapipe/framework/port:status",
@ -134,7 +132,6 @@ cc_library(
cc_library( cc_library(
name = "image_resizer", name = "image_resizer",
hdrs = ["image_resizer.h"], hdrs = ["image_resizer.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework/port:opencv_imgproc", "//mediapipe/framework/port:opencv_imgproc",
], ],
@ -151,7 +148,9 @@ cc_library(
cc_library( cc_library(
name = "mathutil", name = "mathutil",
hdrs = ["mathutil.h"], hdrs = ["mathutil.h"],
visibility = ["//visibility:public"], visibility = [
"//mediapipe:__subpackages__",
],
deps = [ deps = [
"//mediapipe/framework/port:integral_types", "//mediapipe/framework/port:integral_types",
"//mediapipe/framework/port:logging", "//mediapipe/framework/port:logging",
@ -171,7 +170,6 @@ cc_library(
cc_library( cc_library(
name = "no_destructor", name = "no_destructor",
hdrs = ["no_destructor.h"], hdrs = ["no_destructor.h"],
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
@ -190,7 +188,6 @@ cc_library(
cc_library( cc_library(
name = "random", name = "random",
hdrs = ["random_base.h"], hdrs = ["random_base.h"],
visibility = ["//visibility:public"],
deps = ["//mediapipe/framework/port:integral_types"], deps = ["//mediapipe/framework/port:integral_types"],
) )
@ -211,14 +208,12 @@ cc_library(
name = "registration_token", name = "registration_token",
srcs = ["registration_token.cc"], srcs = ["registration_token.cc"],
hdrs = ["registration_token.h"], hdrs = ["registration_token.h"],
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
name = "registration", name = "registration",
srcs = ["registration.cc"], srcs = ["registration.cc"],
hdrs = ["registration.h"], hdrs = ["registration.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":registration_token", ":registration_token",
"//mediapipe/framework/port:logging", "//mediapipe/framework/port:logging",
@ -279,7 +274,6 @@ cc_library(
hdrs = [ hdrs = [
"re2.h", "re2.h",
], ],
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
@ -310,7 +304,6 @@ cc_library(
cc_library( cc_library(
name = "thread_options", name = "thread_options",
hdrs = ["thread_options.h"], hdrs = ["thread_options.h"],
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
@ -356,7 +349,6 @@ cc_library(
cc_test( cc_test(
name = "mathutil_unittest", name = "mathutil_unittest",
srcs = ["mathutil_unittest.cc"], srcs = ["mathutil_unittest.cc"],
visibility = ["//visibility:public"],
deps = [ deps = [
":mathutil", ":mathutil",
"//mediapipe/framework/port:benchmark", "//mediapipe/framework/port:benchmark",
@ -368,7 +360,6 @@ cc_test(
name = "registration_token_test", name = "registration_token_test",
srcs = ["registration_token_test.cc"], srcs = ["registration_token_test.cc"],
linkstatic = 1, linkstatic = 1,
visibility = ["//visibility:public"],
deps = [ deps = [
":registration_token", ":registration_token",
"//mediapipe/framework/port:gtest_main", "//mediapipe/framework/port:gtest_main",
@ -381,7 +372,6 @@ cc_test(
timeout = "long", timeout = "long",
srcs = ["safe_int_test.cc"], srcs = ["safe_int_test.cc"],
linkstatic = 1, linkstatic = 1,
visibility = ["//visibility:public"],
deps = [ deps = [
":intops", ":intops",
"//mediapipe/framework/port:gtest_main", "//mediapipe/framework/port:gtest_main",
@ -393,7 +383,6 @@ cc_test(
name = "monotonic_clock_test", name = "monotonic_clock_test",
srcs = ["monotonic_clock_test.cc"], srcs = ["monotonic_clock_test.cc"],
linkstatic = 1, linkstatic = 1,
visibility = ["//visibility:public"],
deps = [ deps = [
":clock", ":clock",
"//mediapipe/framework/port:gtest_main", "//mediapipe/framework/port:gtest_main",

View File

@ -18,7 +18,7 @@
licenses(["notice"]) licenses(["notice"])
package( package(
default_visibility = ["//visibility:private"], default_visibility = ["//visibility:public"],
features = ["-parse_headers"], features = ["-parse_headers"],
) )
@ -28,7 +28,6 @@ config_setting(
define_values = { define_values = {
"USE_MEDIAPIPE_THREADPOOL": "1", "USE_MEDIAPIPE_THREADPOOL": "1",
}, },
visibility = ["//visibility:public"],
) )
#TODO : remove from OSS. #TODO : remove from OSS.
@ -37,13 +36,11 @@ config_setting(
define_values = { define_values = {
"USE_MEDIAPIPE_THREADPOOL": "0", "USE_MEDIAPIPE_THREADPOOL": "0",
}, },
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
name = "aligned_malloc_and_free", name = "aligned_malloc_and_free",
hdrs = ["aligned_malloc_and_free.h"], hdrs = ["aligned_malloc_and_free.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework/deps:aligned_malloc_and_free", "//mediapipe/framework/deps:aligned_malloc_and_free",
"@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:core_headers",
@ -57,7 +54,6 @@ cc_library(
"advanced_proto_inc.h", "advanced_proto_inc.h",
"proto_ns.h", "proto_ns.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
":advanced_proto_lite", ":advanced_proto_lite",
":core_proto", ":core_proto",
@ -72,7 +68,6 @@ cc_library(
"advanced_proto_lite_inc.h", "advanced_proto_lite_inc.h",
"proto_ns.h", "proto_ns.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
":core_proto", ":core_proto",
"//mediapipe/framework:port", "//mediapipe/framework:port",
@ -83,7 +78,6 @@ cc_library(
cc_library( cc_library(
name = "any_proto", name = "any_proto",
hdrs = ["any_proto.h"], hdrs = ["any_proto.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":core_proto", ":core_proto",
], ],
@ -94,7 +88,6 @@ cc_library(
hdrs = [ hdrs = [
"commandlineflags.h", "commandlineflags.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
"//third_party:glog", "//third_party:glog",
"@com_google_absl//absl/flags:flag", "@com_google_absl//absl/flags:flag",
@ -107,7 +100,6 @@ cc_library(
"core_proto_inc.h", "core_proto_inc.h",
"proto_ns.h", "proto_ns.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"@com_google_protobuf//:protobuf", "@com_google_protobuf//:protobuf",
@ -117,7 +109,6 @@ cc_library(
cc_library( cc_library(
name = "file_helpers", name = "file_helpers",
hdrs = ["file_helpers.h"], hdrs = ["file_helpers.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":status", ":status",
"//mediapipe/framework/deps:file_helpers", "//mediapipe/framework/deps:file_helpers",
@ -128,7 +119,6 @@ cc_library(
cc_library( cc_library(
name = "image_resizer", name = "image_resizer",
hdrs = ["image_resizer.h"], hdrs = ["image_resizer.h"],
visibility = ["//visibility:public"],
deps = select({ deps = select({
"//conditions:default": [ "//conditions:default": [
"//mediapipe/framework/deps:image_resizer", "//mediapipe/framework/deps:image_resizer",
@ -140,14 +130,12 @@ cc_library(
cc_library( cc_library(
name = "integral_types", name = "integral_types",
hdrs = ["integral_types.h"], hdrs = ["integral_types.h"],
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
name = "benchmark", name = "benchmark",
testonly = 1, testonly = 1,
hdrs = ["benchmark.h"], hdrs = ["benchmark.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
"@com_google_benchmark//:benchmark", "@com_google_benchmark//:benchmark",
], ],
@ -158,7 +146,6 @@ cc_library(
hdrs = [ hdrs = [
"re2.h", "re2.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework/deps:re2", "//mediapipe/framework/deps:re2",
], ],
@ -173,7 +160,6 @@ cc_library(
"gtest-spi.h", "gtest-spi.h",
"status_matchers.h", "status_matchers.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
":status_matchers", ":status_matchers",
"//mediapipe/framework/deps:message_matchers", "//mediapipe/framework/deps:message_matchers",
@ -190,7 +176,6 @@ cc_library(
"gtest-spi.h", "gtest-spi.h",
"status_matchers.h", "status_matchers.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
":status_matchers", ":status_matchers",
"//mediapipe/framework/deps:message_matchers", "//mediapipe/framework/deps:message_matchers",
@ -204,7 +189,6 @@ cc_library(
hdrs = [ hdrs = [
"logging.h", "logging.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"//third_party:glog", "//third_party:glog",
@ -217,7 +201,6 @@ cc_library(
hdrs = [ hdrs = [
"map_util.h", "map_util.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"//mediapipe/framework/deps:map_util", "//mediapipe/framework/deps:map_util",
@ -227,7 +210,6 @@ cc_library(
cc_library( cc_library(
name = "numbers", name = "numbers",
hdrs = ["numbers.h"], hdrs = ["numbers.h"],
visibility = ["//visibility:public"],
deps = ["//mediapipe/framework/deps:numbers"], deps = ["//mediapipe/framework/deps:numbers"],
) )
@ -238,13 +220,11 @@ config_setting(
define_values = { define_values = {
"MEDIAPIPE_DISABLE_OPENCV": "1", "MEDIAPIPE_DISABLE_OPENCV": "1",
}, },
visibility = ["//visibility:public"],
) )
cc_library( cc_library(
name = "opencv_core", name = "opencv_core",
hdrs = ["opencv_core_inc.h"], hdrs = ["opencv_core_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
"//third_party:opencv", "//third_party:opencv",
], ],
@ -253,7 +233,6 @@ cc_library(
cc_library( cc_library(
name = "opencv_imgproc", name = "opencv_imgproc",
hdrs = ["opencv_imgproc_inc.h"], hdrs = ["opencv_imgproc_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":opencv_core", ":opencv_core",
"//third_party:opencv", "//third_party:opencv",
@ -263,7 +242,6 @@ cc_library(
cc_library( cc_library(
name = "opencv_imgcodecs", name = "opencv_imgcodecs",
hdrs = ["opencv_imgcodecs_inc.h"], hdrs = ["opencv_imgcodecs_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":opencv_core", ":opencv_core",
"//third_party:opencv", "//third_party:opencv",
@ -273,7 +251,6 @@ cc_library(
cc_library( cc_library(
name = "opencv_highgui", name = "opencv_highgui",
hdrs = ["opencv_highgui_inc.h"], hdrs = ["opencv_highgui_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":opencv_core", ":opencv_core",
"//third_party:opencv", "//third_party:opencv",
@ -283,7 +260,6 @@ cc_library(
cc_library( cc_library(
name = "opencv_video", name = "opencv_video",
hdrs = ["opencv_video_inc.h"], hdrs = ["opencv_video_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":opencv_core", ":opencv_core",
"//mediapipe/framework:port", "//mediapipe/framework:port",
@ -294,7 +270,6 @@ cc_library(
cc_library( cc_library(
name = "opencv_features2d", name = "opencv_features2d",
hdrs = ["opencv_features2d_inc.h"], hdrs = ["opencv_features2d_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":opencv_core", ":opencv_core",
"//third_party:opencv", "//third_party:opencv",
@ -304,7 +279,6 @@ cc_library(
cc_library( cc_library(
name = "opencv_calib3d", name = "opencv_calib3d",
hdrs = ["opencv_calib3d_inc.h"], hdrs = ["opencv_calib3d_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":opencv_core", ":opencv_core",
"//third_party:opencv", "//third_party:opencv",
@ -314,7 +288,6 @@ cc_library(
cc_library( cc_library(
name = "opencv_videoio", name = "opencv_videoio",
hdrs = ["opencv_videoio_inc.h"], hdrs = ["opencv_videoio_inc.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
":opencv_core", ":opencv_core",
"//mediapipe/framework:port", "//mediapipe/framework:port",
@ -328,7 +301,6 @@ cc_library(
"parse_text_proto.h", "parse_text_proto.h",
"proto_ns.h", "proto_ns.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
":core_proto", ":core_proto",
":logging", ":logging",
@ -339,14 +311,12 @@ cc_library(
cc_library( cc_library(
name = "point", name = "point",
hdrs = ["point2.h"], hdrs = ["point2.h"],
visibility = ["//visibility:public"],
deps = ["//mediapipe/framework/deps:point"], deps = ["//mediapipe/framework/deps:point"],
) )
cc_library( cc_library(
name = "port", name = "port",
hdrs = ["port.h"], hdrs = ["port.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:core_headers",
@ -356,14 +326,12 @@ cc_library(
cc_library( cc_library(
name = "rectangle", name = "rectangle",
hdrs = ["rectangle.h"], hdrs = ["rectangle.h"],
visibility = ["//visibility:public"],
deps = ["//mediapipe/framework/deps:rectangle"], deps = ["//mediapipe/framework/deps:rectangle"],
) )
cc_library( cc_library(
name = "ret_check", name = "ret_check",
hdrs = ["ret_check.h"], hdrs = ["ret_check.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"//mediapipe/framework/deps:ret_check", "//mediapipe/framework/deps:ret_check",
@ -373,7 +341,6 @@ cc_library(
cc_library( cc_library(
name = "singleton", name = "singleton",
hdrs = ["singleton.h"], hdrs = ["singleton.h"],
visibility = ["//visibility:public"],
deps = ["//mediapipe/framework/deps:singleton"], deps = ["//mediapipe/framework/deps:singleton"],
) )
@ -382,7 +349,6 @@ cc_library(
hdrs = [ hdrs = [
"source_location.h", "source_location.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"//mediapipe/framework/deps:source_location", "//mediapipe/framework/deps:source_location",
@ -397,7 +363,6 @@ cc_library(
"status_builder.h", "status_builder.h",
"status_macros.h", "status_macros.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
":source_location", ":source_location",
"//mediapipe/framework:port", "//mediapipe/framework:port",
@ -412,7 +377,6 @@ cc_library(
hdrs = [ hdrs = [
"statusor.h", "statusor.h",
], ],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"@com_google_absl//absl/status:statusor", "@com_google_absl//absl/status:statusor",
@ -423,7 +387,6 @@ cc_library(
name = "status_matchers", name = "status_matchers",
testonly = 1, testonly = 1,
hdrs = ["status_matchers.h"], hdrs = ["status_matchers.h"],
visibility = ["//visibility:private"],
deps = [ deps = [
":status", ":status",
"@com_google_googletest//:gtest", "@com_google_googletest//:gtest",
@ -433,7 +396,6 @@ cc_library(
cc_library( cc_library(
name = "threadpool", name = "threadpool",
hdrs = ["threadpool.h"], hdrs = ["threadpool.h"],
visibility = ["//visibility:public"],
deps = select({ deps = select({
"//conditions:default": [":threadpool_impl_default_to_google"], "//conditions:default": [":threadpool_impl_default_to_google"],
"//mediapipe:android": [":threadpool_impl_default_to_mediapipe"], "//mediapipe:android": [":threadpool_impl_default_to_mediapipe"],
@ -460,7 +422,6 @@ alias(
cc_library( cc_library(
name = "topologicalsorter", name = "topologicalsorter",
hdrs = ["topologicalsorter.h"], hdrs = ["topologicalsorter.h"],
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:port", "//mediapipe/framework:port",
"//mediapipe/framework/deps:topologicalsorter", "//mediapipe/framework/deps:topologicalsorter",
@ -470,6 +431,5 @@ cc_library(
cc_library( cc_library(
name = "vector", name = "vector",
hdrs = ["vector.h"], hdrs = ["vector.h"],
visibility = ["//visibility:public"],
deps = ["//mediapipe/framework/deps:vector"], deps = ["//mediapipe/framework/deps:vector"],
) )

View File

@ -140,7 +140,7 @@ cc_library(
name = "circular_buffer", name = "circular_buffer",
hdrs = ["circular_buffer.h"], hdrs = ["circular_buffer.h"],
visibility = [ visibility = [
"//visibility:public", "//mediapipe:__subpackages__",
], ],
deps = [ deps = [
"//mediapipe/framework/port:integral_types", "//mediapipe/framework/port:integral_types",
@ -151,7 +151,6 @@ cc_test(
name = "circular_buffer_test", name = "circular_buffer_test",
size = "small", size = "small",
srcs = ["circular_buffer_test.cc"], srcs = ["circular_buffer_test.cc"],
visibility = ["//visibility:public"],
deps = [ deps = [
":circular_buffer", ":circular_buffer",
"//mediapipe/framework/port:gtest_main", "//mediapipe/framework/port:gtest_main",
@ -164,7 +163,7 @@ cc_library(
name = "trace_buffer", name = "trace_buffer",
srcs = ["trace_buffer.h"], srcs = ["trace_buffer.h"],
hdrs = ["trace_buffer.h"], hdrs = ["trace_buffer.h"],
visibility = ["//visibility:public"], visibility = ["//mediapipe/framework/profiler:__subpackages__"],
deps = [ deps = [
":circular_buffer", ":circular_buffer",
"//mediapipe/framework:calculator_profile_cc_proto", "//mediapipe/framework:calculator_profile_cc_proto",

View File

@ -20,7 +20,9 @@ load(
licenses(["notice"]) licenses(["notice"])
package(default_visibility = ["//mediapipe:__subpackages__"]) package(default_visibility = [
"//mediapipe:__subpackages__",
])
filegroup( filegroup(
name = "test_graph", name = "test_graph",
@ -40,7 +42,6 @@ mediapipe_simple_subgraph(
testonly = 1, testonly = 1,
graph = "dub_quad_test_subgraph.pbtxt", graph = "dub_quad_test_subgraph.pbtxt",
register_as = "DubQuadTestSubgraph", register_as = "DubQuadTestSubgraph",
visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/framework:test_calculators", "//mediapipe/framework:test_calculators",
], ],
@ -51,7 +52,7 @@ mediapipe_simple_subgraph(
testonly = 1, testonly = 1,
graph = "nested_test_subgraph.pbtxt", graph = "nested_test_subgraph.pbtxt",
register_as = "NestedTestSubgraph", register_as = "NestedTestSubgraph",
visibility = ["//visibility:public"], visibility = ["//mediapipe/framework:__subpackages__"],
deps = [ deps = [
":dub_quad_test_subgraph", ":dub_quad_test_subgraph",
"//mediapipe/framework:test_calculators", "//mediapipe/framework:test_calculators",