Skip to content

Commit beb6f8a

Browse files
terryheocopybara-github
terryheo
authored and
copybara-github
committed
Internal change
LiteRT-PiperOrigin-RevId: 826628662
1 parent f07abba commit beb6f8a

File tree

3 files changed

+97
-106
lines changed

3 files changed

+97
-106
lines changed

‎litert/BUILD‎

Lines changed: 17 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("//litert/build_common:special_rule.bzl", "litert_friends")
16+
1517
package(
1618
# copybara:uncomment default_applicable_licenses = ["//third_party/odml:license"],
1719
default_visibility = [
@@ -33,13 +35,6 @@ package(
3335
package_group(
3436
name = "litert_cc_users_dynamic_link",
3537
packages = [
36-
# copybara:uncomment "INTERNAL_IMAGE_COLLECTION_INTEGRATION/...",
37-
# copybara:uncomment "//platforms/darwinn/compiler/...",
38-
# copybara:uncomment "@mediapipe//mediapipe/tasks/...",
39-
# copybara:uncomment "@mediapipe//mediapipe/tasks/javatests/...",
40-
# copybara:uncomment "//third_party/odml/genai_modules/...",
41-
# copybara:uncomment "//third_party/odml/infra/ml_drift_delegate/...",
42-
# copybara:uncomment "//third_party/odml/litert_lm/...",
4338
"//litert/cc/...",
4439
"//litert/compiler/plugin/...",
4540
"//litert/google/...",
@@ -56,39 +51,23 @@ package_group(
5651
"//litert/tools/...",
5752
"//litert/vendors/...",
5853
# When litert_link_capi_so=false
59-
# copybara:uncomment "//third_party/odml/litert/llm/...",
6054
"//ci/tools/...",
6155
# copybara:uncomment "//third_party/odml/litert/tensor/...",
62-
],
56+
] + litert_friends(),
6357
)
6458

6559
# Users with access to the LiteRT C++ API linked statically (i.e. litert/cc/).
6660
# For dynamically linked C++ API, use :litert_cc_users_dynamic_link.
6761
package_group(
6862
name = "litert_cc_users_static_link",
6963
packages = [
70-
# copybara:uncomment "INTERNAL_ANDROID_BACKEND_DIRECTORY/...",
71-
# copybara:uncomment "INTERNAL_ANDROID_APP_DIRECTORY/...",
72-
# copybara:uncomment "INTERNAL_EDGETPU_LLM_PROTOTYPE/...",
73-
# copybara:uncomment "//platforms/darwinn/compiler/...",
74-
# copybara:uncomment "//third_party/darwinn/litert/...",
75-
# copybara:uncomment "//third_party/darwinn/tflite/...",
76-
# copybara:uncomment "//third_party/deepmind/lyria_live/internal/odml/pipeline/cc/...",
77-
# copybara:uncomment "@mediapipe//mediapipe/calculators/tensor/...",
78-
# copybara:uncomment "//third_party/odml/genai_modules/...",
79-
# copybara:uncomment "//third_party/odml/infra/genai/inference/...",
80-
# copybara:uncomment "//third_party/odml/infra/ml_drift_delegate/...",
8164
"//litert/ats/...",
8265
"//litert/google/...",
8366
"//litert/integration_test/...",
8467
"//litert/js/...",
85-
"//research/xeno/audio/voicelm/calculators/...",
8668
"//litert/python/...",
8769
"//third_party/odml/litert/tensor/...",
8870
"//litert/samples/semantic_similarity/...",
89-
# When litert_link_capi_so=false
90-
# copybara:uncomment "//third_party/odml/litert_lm/...",
91-
# copybara:uncomment "//platforms/darwinn/devtools/google_tensor_tpu_delegate_executor/...",
9271
# TODO(b/424778444): Internal runtime would better not call cc runtime APIs. Remove below targets.
9372
"//litert/runtime/...",
9473
"//litert/cc/...",
@@ -98,37 +77,37 @@ package_group(
9877
"//litert/core/model/...",
9978
"//litert/test/...",
10079
"//litert/tools/...",
101-
],
80+
] + litert_friends(),
10281
)
10382

10483
# All packages with visibility to the internal APIs
10584
# such as litert/cc/internal and litert/c/internal.
10685
package_group(
10786
name = "litert_internal_users",
10887
packages = [
109-
# copybara:uncomment "@mediapipe//mediapipe/...",
110-
"//third_party/odml/infra/genai/conversion/juno/npu/...",
111-
"//third_party/odml/infra/ml_drift_delegate/...",
88+
"//ci/tools/...",
89+
"//litert/ats/...",
11290
"//litert/c/...",
11391
"//litert/cc/...",
114-
"//litert/cc/internal/...",
11592
"//litert/compiler/...",
11693
"//litert/core/...",
117-
"//litert/ats/...",
11894
"//litert/google/...",
11995
"//litert/integration_test/...",
96+
"//litert/kotlin/...",
12097
"//litert/python/...",
12198
"//litert/runtime/...",
99+
"//litert/sdk_util/...",
122100
"//litert/test/...",
123101
"//litert/tools/...",
124-
"//ci/tools/...",
125-
# copybara:uncomment "//platforms/darwinn/toolchain/third_party/...",
126-
# TODO(b/424778444) Targets above C API boundary shouldn't call internal. Remove below.
127-
# copybara:uncomment "//third_party/darwinn/litert/...",
128-
# copybara:uncomment "//third_party/darwinn/tflite/...",
129-
# copybara:uncomment "//learning/brain/mobile/lite/tooling/ai_edge_hub/...",
130-
# copybara:uncomment "@mediapipe//mediapipe/calculators/...",
131-
],
102+
"//litert/vendors/...",
103+
] + litert_friends(),
104+
)
105+
106+
# All packages with visibility to the internal APIs
107+
# such as litert/cc/internal and litert/c/internal.
108+
package_group(
109+
name = "litert_friends",
110+
packages = litert_friends(),
132111
)
133112

134113
# Users with access to the LiteRT C API.

‎litert/build_common/special_rule.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
"""External versions of LiteRT build rules that differ outside of Google."""
1616

17-
def lite_rt_friends():
17+
def litert_friends():
1818
"""Internal visibility for packages outside of LiteRT code location.
1919
2020
Return the package group declaration for internal code locations that need
21-
visibility to LiteRT APIs"""
21+
visibility to all LiteRT APIs"""
2222

2323
return []
2424

‎litert/cc/internal/BUILD‎

Lines changed: 78 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,34 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
1919
package(
2020
# copybara:uncomment default_applicable_licenses = ["@org_tensorflow//tensorflow:license"],
2121
default_visibility = [
22-
# Temporary visibility for GenAI until they bundle libLiteRtRuntimeCApi.so.
23-
# copybara:uncomment_begin(oss litert_lm)
24-
# "//litert:litert_cc_users_static_link",
25-
# "//litert/c:__pkg__",
26-
# "//litert/cc:__pkg__",
27-
# "//litert/cc/dynamic_runtime:__pkg__",
28-
# "//litert/core:__subpackages__",
29-
# "//litert/integration_test:__pkg__",
30-
# "//litert/kotlin:__pkg__",
31-
# "//litert/runtime/dispatch:__pkg__",
32-
# "//litert/sdk_util:__pkg__",
33-
# "//litert/test:__pkg__",
34-
# "//litert/vendors:__subpackages__",
22+
# copybara:uncomment_begin(oss)
23+
# "//litert:litert_internal_users",
3524
# copybara:uncomment_end_and_comment_begin
3625
"//visibility:public",
3726
# copybara:comment_end
3827
],
3928
)
4029

30+
internal_static_library_visibility = [
31+
# copybara:uncomment_begin(oss)
32+
# "//litert:litert_cc_users_static_link",
33+
# copybara:uncomment_end_and_comment_begin
34+
"//visibility:public",
35+
# copybara:comment_end
36+
]
37+
38+
next_library_visibility = [
39+
# copybara:uncomment_begin(oss)
40+
# "//litert:litert_friends",
41+
# copybara:uncomment_end_and_comment_begin
42+
"//visibility:public",
43+
# copybara:comment_end
44+
]
45+
46+
# -----------------------------------------------------------------------------
47+
# Runtime only internal C++ libraries.
48+
# -----------------------------------------------------------------------------
49+
4150
cc_library(
4251
name = "litert_dispatch_delegate",
4352
hdrs = ["litert_dispatch_delegate.h"],
@@ -100,6 +109,10 @@ cc_library(
100109
],
101110
)
102111

112+
# -----------------------------------------------------------------------------
113+
# Common internal C++ libraries.
114+
# -----------------------------------------------------------------------------
115+
103116
cc_library(
104117
name = "litert_c_types_printing",
105118
hdrs = ["litert_c_types_printing.h"],
@@ -269,13 +282,56 @@ cc_test(
269282
],
270283
)
271284

285+
cc_library(
286+
name = "litert_shared_library",
287+
srcs = ["litert_shared_library.cc"],
288+
hdrs = ["litert_shared_library.h"],
289+
deps = [
290+
"//litert/c:litert_common",
291+
"//litert/c/internal:litert_logging",
292+
"//litert/cc:litert_expected",
293+
"//litert/cc:litert_macros",
294+
"@com_google_absl//absl/debugging:leak_check",
295+
"@com_google_absl//absl/strings:str_format",
296+
"@com_google_absl//absl/strings:string_view",
297+
],
298+
)
299+
300+
cc_library(
301+
name = "test_litert_shared_library_impl",
302+
srcs = ["test_shared_library.cc"],
303+
)
304+
305+
cc_shared_library(
306+
name = "test_litert_shared_library",
307+
shared_lib_name = "test_shared_library.so",
308+
deps = [":test_litert_shared_library_impl"],
309+
)
310+
311+
cc_test(
312+
name = "litert_shared_library_test",
313+
srcs = ["litert_shared_library_test.cc"],
314+
data = [":test_litert_shared_library"],
315+
defines = ["LITERT_DEFINE_GTEST_STATUS_PRINTER"],
316+
deps = [
317+
":litert_shared_library",
318+
"//litert/test:matchers",
319+
"@com_google_absl//absl/strings",
320+
"@com_google_googletest//:gtest_main",
321+
],
322+
)
323+
324+
# -----------------------------------------------------------------------------
325+
# Internal static C++ libraries.
326+
#
327+
# There are shared version of these libraries available in cc/dynamic_runtime/.
328+
# -----------------------------------------------------------------------------
329+
272330
cc_library(
273331
name = "litert_model_predicates",
274332
srcs = ["litert_model_predicates.cc"],
275333
hdrs = ["litert_model_predicates.h"],
276-
visibility = [
277-
"//litert:litert_cc_users_static_link",
278-
],
334+
visibility = internal_static_library_visibility,
279335
deps = [
280336
":litert_detail",
281337
":litert_extended_model",
@@ -310,6 +366,7 @@ cc_library(
310366
name = "litert_op_options",
311367
srcs = ["litert_op_options.cc"],
312368
hdrs = ["litert_op_options.h"],
369+
visibility = internal_static_library_visibility,
313370
deps = [
314371
"//litert/c:litert_common",
315372
"//litert/c:litert_model",
@@ -350,9 +407,7 @@ cc_library(
350407
name = "litert_rewriter",
351408
srcs = ["litert_rewriter.cc"],
352409
hdrs = ["litert_rewriter.h"],
353-
visibility = [
354-
"//litert:litert_public",
355-
],
410+
visibility = internal_static_library_visibility,
356411
deps = [
357412
":litert_detail",
358413
":litert_extended_model",
@@ -384,49 +439,11 @@ cc_test(
384439
],
385440
)
386441

387-
cc_library(
388-
name = "litert_shared_library",
389-
srcs = ["litert_shared_library.cc"],
390-
hdrs = ["litert_shared_library.h"],
391-
deps = [
392-
"//litert/c:litert_common",
393-
"//litert/c/internal:litert_logging",
394-
"//litert/cc:litert_expected",
395-
"//litert/cc:litert_macros",
396-
"@com_google_absl//absl/debugging:leak_check",
397-
"@com_google_absl//absl/strings:str_format",
398-
"@com_google_absl//absl/strings:string_view",
399-
],
400-
)
401-
402-
cc_library(
403-
name = "test_litert_shared_library_impl",
404-
srcs = ["test_shared_library.cc"],
405-
)
406-
407-
cc_shared_library(
408-
name = "test_litert_shared_library",
409-
shared_lib_name = "test_shared_library.so",
410-
deps = [":test_litert_shared_library_impl"],
411-
)
412-
413-
cc_test(
414-
name = "litert_shared_library_test",
415-
srcs = ["litert_shared_library_test.cc"],
416-
data = [":test_litert_shared_library"],
417-
defines = ["LITERT_DEFINE_GTEST_STATUS_PRINTER"],
418-
deps = [
419-
":litert_shared_library",
420-
"//litert/test:matchers",
421-
"@com_google_absl//absl/strings",
422-
"@com_google_googletest//:gtest_main",
423-
],
424-
)
425-
426442
cc_library(
427443
name = "litert_extended_model",
428444
srcs = ["litert_extended_model.cc"],
429445
hdrs = ["litert_extended_model.h"],
446+
visibility = internal_static_library_visibility,
430447
deps = [
431448
":litert_consts",
432449
":litert_detail",
@@ -476,21 +493,16 @@ exports_files(glob([
476493
"*.cc",
477494
]))
478495

496+
# -----------------------------------------------------------------------------
497+
# New / experimental features.
479498
# -----------------------------------------------------------------------------
480499

481500
# Advanced CompiledModel with new / experimental features.
482501
cc_library(
483502
name = "litert_compiled_model_next",
484503
srcs = ["litert_compiled_model_next.cc"],
485504
hdrs = ["litert_compiled_model_next.h"],
486-
visibility = [
487-
# copybara:uncomment_begin(oss litert_lm)
488-
# "//platforms/darwinn:__subpackages__",
489-
# "//litert:__subpackages__",
490-
# copybara:uncomment_end_and_comment_begin
491-
"//visibility:public",
492-
# copybara:comment_end
493-
],
505+
visibility = next_library_visibility,
494506
deps = [
495507
":litert_handle",
496508
"//litert/c:litert_common",

0 commit comments

Comments
 (0)