Skip to content

Commit 32afa63

Browse files
ai-edge-botcopybara-github
ai-edge-bot
authored and
copybara-github
committed
Refactor to remove deprecated interfaces and fix clang tidy issues (cc/options)
LiteRT-PiperOrigin-RevId: 884085334
1 parent 85d3747 commit 32afa63

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+288
-207
lines changed

‎litert/cc/BUILD‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ cc_library(
4848
name = "litert_any",
4949
hdrs = ["litert_any.h"],
5050
deps = [
51+
":litert_common",
5152
":litert_expected",
5253
":litert_macros",
5354
"//litert/c:litert_any",
@@ -107,10 +108,12 @@ cc_library(
107108
srcs = ["litert_macros.cc"],
108109
hdrs = ["litert_macros.h"],
109110
deps = [
111+
":litert_common",
110112
":litert_expected",
111113
"//litert/c:litert_common",
112114
"//litert/c/internal:litert_logging",
113115
"//litert/cc/internal:litert_source_location",
116+
"@com_google_absl//absl/log:absl_check",
114117
"@com_google_absl//absl/status",
115118
"@com_google_absl//absl/status:statusor",
116119
],
@@ -120,6 +123,7 @@ cc_test(
120123
name = "litert_macros_test",
121124
srcs = ["litert_macros_test.cc"],
122125
deps = [
126+
":litert_common",
123127
":litert_expected",
124128
":litert_macros",
125129
"//litert/c:litert_common",
@@ -149,6 +153,7 @@ cc_test(
149153
srcs = ["litert_expected_test.cc"],
150154
deps = [
151155
":litert_buffer_ref",
156+
":litert_common",
152157
":litert_expected",
153158
"//litert/c:litert_common",
154159
"@com_google_absl//absl/strings",
@@ -206,6 +211,7 @@ cc_library(
206211
":litert_macros",
207212
"//litert/c:litert_common",
208213
"//litert/c:litert_opaque_options",
214+
"//litert/cc:litert_common",
209215
"//litert/cc/internal:litert_handle",
210216
"@com_google_absl//absl/strings:string_view",
211217
],
@@ -215,6 +221,7 @@ cc_test(
215221
name = "litert_opaque_options_test",
216222
srcs = ["litert_opaque_options_test.cc"],
217223
deps = [
224+
":litert_common",
218225
":litert_expected",
219226
":litert_macros",
220227
":litert_opaque_options",
@@ -288,6 +295,7 @@ cc_library(
288295
"//litert/c:litert_metrics",
289296
"//litert/c:litert_model_types",
290297
"//litert/c:litert_tensor_buffer_types",
298+
"//litert/c/internal:litert_scheduling_info",
291299
"//litert/cc/internal:litert_consts",
292300
"//litert/cc/internal:litert_handle",
293301
"@com_google_absl//absl/algorithm:container",
@@ -617,6 +625,7 @@ cc_library(
617625
"//litert/c:litert_layout",
618626
"//litert/c:litert_tensor_buffer",
619627
"//litert/c/internal:litert_logging",
628+
"//litert/cc:litert_common",
620629
"//litert/cc/internal:litert_handle",
621630
"//litert/cc/internal:litert_tensor_buffer_without_registry",
622631
"@com_google_absl//absl/types:span",
@@ -710,6 +719,7 @@ cc_library_with_testonly_vis(
710719
],
711720
deps = [
712721
":litert_any",
722+
":litert_common",
713723
":litert_environment_options",
714724
":litert_expected",
715725
":litert_macros",
@@ -802,6 +812,7 @@ cc_library(
802812
# copybara:comment_end
803813
],
804814
deps = [
815+
":litert_common",
805816
":litert_element_type",
806817
":litert_expected",
807818
":litert_macros",
@@ -825,6 +836,7 @@ cc_library(
825836
],
826837
deps = [
827838
":litert_buffer_ref",
839+
":litert_common",
828840
":litert_element_type",
829841
":litert_expected",
830842
":litert_macros",
@@ -852,21 +864,14 @@ cc_library(
852864
# copybara:comment_end
853865
],
854866
deps = [
855-
":litert_buffer_ref",
867+
":litert_common",
856868
":litert_element_type",
857869
":litert_expected",
858870
":litert_layout",
859871
":litert_macros",
860-
"//litert/c:litert_common",
861872
"//litert/c:litert_layout",
862873
"//litert/c:litert_model_types",
863-
"//litert/c:litert_op_code",
864-
"//litert/cc/internal:litert_consts",
865-
"//litert/cc/internal:litert_detail",
866-
"//litert/cc/internal:litert_handle",
867-
"@com_google_absl//absl/container:inlined_vector",
868874
"@com_google_absl//absl/strings:string_view",
869-
"@com_google_absl//absl/types:span",
870875
],
871876
)
872877

@@ -917,6 +922,7 @@ cc_library(
917922
# copybara:comment_end
918923
],
919924
deps = [
925+
":litert_common",
920926
":litert_expected",
921927
":litert_tensor_buffer_types",
922928
"//litert/c:litert_common",
@@ -967,6 +973,7 @@ cc_library(
967973
"//litert/c:litert_tensor_buffer_types",
968974
"//litert/c:litert_webgpu_types",
969975
"//litert/c/internal:litert_tensor_buffer_registry", # buildcleaner: keep
976+
"//litert/cc:litert_common",
970977
"//litert/cc/internal:litert_handle",
971978
"//litert/cc/internal:litert_tensor_buffer_without_registry",
972979
"@com_google_absl//absl/cleanup",
@@ -997,6 +1004,7 @@ cc_test(
9971004
# srcs = ["litert_tensor_buffer_test.cc"],
9981005
# linkopts = litert_android_linkopts(),
9991006
# deps = [
1007+
# ":litert_common",
10001008
# ":litert_element_type",
10011009
# ":litert_environment",
10021010
# ":litert_environment_options",

‎litert/cc/dynamic_runtime/BUILD‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ cc_library(
7878
deps = [
7979
":litert_environment",
8080
":litert_tensor_buffer",
81+
"//litert/cc:litert_common",
8182
"//litert/cc:litert_expected",
8283
"//litert/cc:litert_layout",
8384
"//litert/cc/internal:litert_handle",
@@ -174,6 +175,7 @@ cc_library(
174175
],
175176
deps = [
176177
"//litert/cc:litert_buffer_ref",
178+
"//litert/cc:litert_common",
177179
"//litert/cc:litert_element_type",
178180
"//litert/cc:litert_expected",
179181
"//litert/cc:litert_macros",
@@ -216,9 +218,11 @@ cc_library(
216218
deps = [
217219
":litert_model",
218220
"//litert/cc:litert_buffer_ref",
221+
"//litert/cc:litert_common",
219222
"//litert/cc:litert_element_type",
220223
"//litert/cc:litert_expected",
221224
"//litert/cc:litert_macros",
225+
"//litert/cc:litert_model_types",
222226
"//litert/cc:litert_ranked_tensor_type",
223227
"//litert/cc/internal:litert_consts",
224228
"//litert/cc/internal:litert_detail",
@@ -245,6 +249,7 @@ cc_library(
245249
deps = [
246250
":litert_extended_model",
247251
":litert_op_options",
252+
"//litert/cc:litert_common",
248253
"//litert/cc:litert_element_type",
249254
"//litert/cc:litert_expected",
250255
"//litert/cc:litert_layout",
@@ -344,6 +349,7 @@ cc_library(
344349
srcs = ["//litert/cc:litert_opaque_options.cc"],
345350
hdrs = ["//litert/cc:litert_opaque_options.h"],
346351
deps = [
352+
"//litert/cc:litert_common",
347353
"//litert/cc:litert_expected",
348354
"//litert/cc:litert_macros",
349355
"//litert/cc/internal:litert_handle",
@@ -364,6 +370,7 @@ cc_test(
364370
":litert_opaque_options",
365371
"//litert/c:litert_common",
366372
"//litert/c:litert_opaque_options",
373+
"//litert/cc:litert_common",
367374
"//litert/cc:litert_expected",
368375
"//litert/cc:litert_macros",
369376
"//litert/cc/internal:litert_handle",
@@ -381,6 +388,7 @@ cc_library(
381388
"@com_google_absl//absl/strings:string_view",
382389
"@flatbuffers//:runtime_cc",
383390
# copybara:uncomment "@flatbuffers//src:util",
391+
"//litert/cc:litert_common",
384392
"//litert/cc:litert_expected",
385393
"//litert/cc:litert_macros",
386394
] + select({
@@ -415,6 +423,7 @@ cc_test(
415423
# copybara:comment_end
416424
"@com_google_absl//absl/strings:string_view",
417425
"//litert/c:litert_common",
426+
"//litert/cc:litert_common",
418427
"//litert/c:litert_op_code",
419428
"//litert/cc:litert_buffer_ref",
420429
"//litert/cc:litert_expected",
@@ -435,6 +444,7 @@ cc_library(
435444
deps = [
436445
":litert_environment",
437446
":litert_event",
447+
"//litert/cc:litert_common",
438448
"//litert/cc:litert_expected",
439449
"//litert/cc:litert_macros",
440450
"//litert/cc:litert_ranked_tensor_type",
@@ -468,6 +478,7 @@ cc_test(
468478
"//litert/c:litert_model_types",
469479
"//litert/c:litert_tensor_buffer",
470480
"//litert/c:litert_tensor_buffer_types",
481+
"//litert/cc:litert_common",
471482
"//litert/cc:litert_element_type",
472483
"//litert/cc:litert_environment_options",
473484
"//litert/cc:litert_expected",
@@ -511,6 +522,7 @@ cc_library(
511522
hdrs = ["//litert/cc:litert_environment.h"],
512523
deps = [
513524
"//litert/cc:litert_any",
525+
"//litert/cc:litert_common",
514526
"//litert/cc:litert_environment_options",
515527
"//litert/cc:litert_expected",
516528
"//litert/cc:litert_macros",

‎litert/cc/internal/BUILD‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ cc_library(
8888
"//litert/c:litert_tensor_buffer_types",
8989
"//litert/c:litert_webgpu_types",
9090
"//litert/c/internal:litert_logging",
91+
"//litert/cc:litert_common",
9192
"//litert/cc:litert_environment",
9293
"//litert/cc:litert_event",
9394
"//litert/cc:litert_expected",
@@ -285,6 +286,7 @@ cc_library(
285286
deps = [
286287
"//litert/c:litert_common",
287288
"//litert/c/internal:litert_logging",
289+
"//litert/cc:litert_common",
288290
"//litert/cc:litert_expected",
289291
"//litert/cc:litert_macros",
290292
"@com_google_absl//absl/debugging:leak_check",
@@ -370,6 +372,7 @@ cc_library(
370372
"//litert/c:litert_model_types",
371373
"//litert/c:litert_op_code",
372374
"//litert/c:litert_op_options",
375+
"//litert/cc:litert_common",
373376
"//litert/cc:litert_expected",
374377
"//litert/cc:litert_macros",
375378
"@com_google_absl//absl/strings:string_view",
@@ -389,6 +392,7 @@ cc_test(
389392
"//litert/c:litert_common",
390393
"//litert/c:litert_op_code",
391394
"//litert/cc:litert_buffer_ref",
395+
"//litert/cc:litert_common",
392396
"//litert/cc:litert_expected",
393397
"//litert/core/model",
394398
"//litert/core/model:buffer_manager",
@@ -415,6 +419,7 @@ cc_library(
415419
"//litert/c:litert_layout",
416420
"//litert/c:litert_model_types",
417421
"//litert/c:litert_op_code",
422+
"//litert/cc:litert_common",
418423
"//litert/cc:litert_element_type",
419424
"//litert/cc:litert_expected",
420425
"//litert/cc:litert_layout",
@@ -459,10 +464,12 @@ cc_library(
459464
"//litert/c:litert_model_types",
460465
"//litert/c:litert_op_code",
461466
"//litert/cc:litert_buffer_ref",
467+
"//litert/cc:litert_common",
462468
"//litert/cc:litert_element_type",
463469
"//litert/cc:litert_expected",
464470
"//litert/cc:litert_macros",
465471
"//litert/cc:litert_model",
472+
"//litert/cc:litert_model_types",
466473
"//litert/cc:litert_ranked_tensor_type",
467474
"@com_google_absl//absl/container:inlined_vector",
468475
"@com_google_absl//absl/strings:string_view",
@@ -482,6 +489,7 @@ cc_test(
482489
"//litert/c:litert_common",
483490
"//litert/c:litert_op_code",
484491
"//litert/cc:litert_buffer_ref",
492+
"//litert/cc:litert_common",
485493
"//litert/cc:litert_element_type",
486494
"//litert/cc:litert_expected",
487495
"//litert/core/model",

‎litert/cc/internal/litert_builder.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "litert/c/litert_op_code.h"
2626
#include "litert/cc/internal/litert_detail.h"
2727
#include "litert/cc/internal/litert_extended_model.h"
28+
#include "litert/cc/litert_common.h"
2829
#include "litert/cc/litert_expected.h"
2930

3031
namespace litert {
@@ -64,7 +65,7 @@ Expected<Tensor> Builder::BuildTensor(const RankedTensorSpec& spec) const {
6465

6566
Expected<Tensor> Builder::CloneTensor(const Tensor& src) const {
6667
if (src.TypeId() != kLiteRtRankedTensorType) {
67-
return Unexpected(kLiteRtStatusErrorUnsupported);
68+
return Unexpected(Status::kErrorUnsupported);
6869
}
6970
auto ranked_type = src.RankedTensorType();
7071
if (!ranked_type) {

‎litert/cc/internal/litert_builder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class Builder : public internal::NonOwnedHandle<LiteRtBuilder> {
153153
template <typename T>
154154
Expected<void> SetOpOptions(Op& op, T&& options) const {
155155
if constexpr (!std::is_base_of_v<OpOptions, T>) {
156-
return Unexpected(kLiteRtStatusErrorInvalidArgument);
156+
return Unexpected(Status::kErrorInvalidArgument);
157157
}
158158
options.op = op.Get();
159159
options.SetOpOptions(this->Get());

‎litert/cc/internal/litert_compiled_model_next.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ Expected<CompiledModelNext> CompiledModelNext::Create(
6868
if (auto status = env_holder.runtime->CreateModelFromFile(
6969
model_filename.c_str(), &litert_model);
7070
status != kLiteRtStatusOk) {
71-
return Unexpected(status, "Failed to load model from file");
71+
return Unexpected(ToStatus(status), "Failed to load model from file");
7272
}
7373
LiteRtCompiledModel compiled_model;
7474
if (auto status = env_holder.runtime->CreateCompiledModel(
7575
env_holder.handle, litert_model, compilation_options.Get(),
7676
&compiled_model);
7777
status != kLiteRtStatusOk) {
7878
env_holder.runtime->DestroyModel(litert_model);
79-
return Unexpected(status, "Failed to compile model");
79+
return Unexpected(ToStatus(status), "Failed to compile model");
8080
}
8181
return CompiledModelNext(env_holder, litert_model,
8282
/*model_owned=*/OwnHandle::kYes, compiled_model,
@@ -110,7 +110,7 @@ Expected<void> CompiledModelNext::StartMetricsCollection(int detail_level) {
110110
if (auto status = env_.runtime->CompiledModelStartMetricsCollection(
111111
Get(), detail_level);
112112
status != kLiteRtStatusOk) {
113-
return Unexpected(status, "Failed to start metrics collection");
113+
return Unexpected(ToStatus(status), "Failed to start metrics collection");
114114
}
115115
return {};
116116
}
@@ -143,15 +143,15 @@ Expected<void> CompiledModelNext::SetSchedulingInfo(
143143
auto status =
144144
env_.runtime->CompiledModelSetSchedulingInfo(Get(), &scheduling_info);
145145
if (status != kLiteRtStatusOk) {
146-
return Unexpected(status, "Failed to set scheduling info");
146+
return Unexpected(ToStatus(status), "Failed to set scheduling info");
147147
}
148148
return {};
149149
}
150150

151151
Expected<void> CompiledModelNext::ClearSchedulingInfo() const {
152152
auto status = env_.runtime->CompiledModelSetSchedulingInfo(Get(), nullptr);
153153
if (status != kLiteRtStatusOk) {
154-
return Unexpected(status, "Failed to clear scheduling info");
154+
return Unexpected(ToStatus(status), "Failed to clear scheduling info");
155155
}
156156
return {};
157157
}

0 commit comments

Comments
 (0)