From 65cb5f4e6b6da9e8bfa5ea02b67dad880a9a97f2 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Mon, 8 May 2023 16:18:00 -0700 Subject: [PATCH] Do not depend on *.ts files in ts_declaration PiperOrigin-RevId: 530435849 --- .../tasks/web/vision/image_segmenter/BUILD | 27 ++++++------------ ...ptions.d.ts => image_segmenter_options.ts} | 0 ..._result.d.ts => image_segmenter_result.ts} | 0 .../web/vision/interactive_segmenter/BUILD | 27 ++++++------------ ....d.ts => interactive_segmenter_options.ts} | 0 ...t.d.ts => interactive_segmenter_result.ts} | 0 .../tasks/web/vision/pose_landmarker/BUILD | 28 ++++++------------- ...ptions.d.ts => pose_landmarker_options.ts} | 0 ..._result.d.ts => pose_landmarker_result.ts} | 0 9 files changed, 26 insertions(+), 56 deletions(-) rename mediapipe/tasks/web/vision/image_segmenter/{image_segmenter_options.d.ts => image_segmenter_options.ts} (100%) rename mediapipe/tasks/web/vision/image_segmenter/{image_segmenter_result.d.ts => image_segmenter_result.ts} (100%) rename mediapipe/tasks/web/vision/interactive_segmenter/{interactive_segmenter_options.d.ts => interactive_segmenter_options.ts} (100%) rename mediapipe/tasks/web/vision/interactive_segmenter/{interactive_segmenter_result.d.ts => interactive_segmenter_result.ts} (100%) rename mediapipe/tasks/web/vision/pose_landmarker/{pose_landmarker_options.d.ts => pose_landmarker_options.ts} (100%) rename mediapipe/tasks/web/vision/pose_landmarker/{pose_landmarker_result.d.ts => pose_landmarker_result.ts} (100%) diff --git a/mediapipe/tasks/web/vision/image_segmenter/BUILD b/mediapipe/tasks/web/vision/image_segmenter/BUILD index 1a008cc95..4d9aca996 100644 --- a/mediapipe/tasks/web/vision/image_segmenter/BUILD +++ b/mediapipe/tasks/web/vision/image_segmenter/BUILD @@ -1,6 +1,6 @@ # This contains the MediaPipe Image Segmenter Task. -load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_declaration", "mediapipe_ts_library") +load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_library") load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") package(default_visibility = ["//mediapipe/tasks:internal"]) @@ -9,9 +9,12 @@ licenses(["notice"]) mediapipe_ts_library( name = "image_segmenter", - srcs = ["image_segmenter.ts"], + srcs = [ + "image_segmenter.ts", + "image_segmenter_options.ts", + "image_segmenter_result.ts", + ], deps = [ - ":image_segmenter_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/framework:calculator_options_jspb_proto", "//mediapipe/tasks/cc/core/proto:base_options_jspb_proto", @@ -19,27 +22,16 @@ mediapipe_ts_library( "//mediapipe/tasks/cc/vision/image_segmenter/proto:image_segmenter_graph_options_jspb_proto", "//mediapipe/tasks/cc/vision/image_segmenter/proto:segmenter_options_jspb_proto", "//mediapipe/tasks/web/core", + "//mediapipe/tasks/web/core:classifier_options", "//mediapipe/tasks/web/vision/core:image_processing_options", + "//mediapipe/tasks/web/vision/core:mask", + "//mediapipe/tasks/web/vision/core:vision_task_options", "//mediapipe/tasks/web/vision/core:vision_task_runner", "//mediapipe/util:label_map_jspb_proto", "//mediapipe/web/graph_runner:graph_runner_ts", ], ) -mediapipe_ts_declaration( - name = "image_segmenter_types", - srcs = [ - "image_segmenter_options.d.ts", - "image_segmenter_result.d.ts", - ], - deps = [ - "//mediapipe/tasks/web/core", - "//mediapipe/tasks/web/core:classifier_options", - "//mediapipe/tasks/web/vision/core:mask", - "//mediapipe/tasks/web/vision/core:vision_task_options", - ], -) - mediapipe_ts_library( name = "image_segmenter_test_lib", testonly = True, @@ -48,7 +40,6 @@ mediapipe_ts_library( ], deps = [ ":image_segmenter", - ":image_segmenter_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/tasks/web/core", "//mediapipe/tasks/web/core:task_runner_test_utils", diff --git a/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.d.ts b/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.ts similarity index 100% rename from mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.d.ts rename to mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.ts diff --git a/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_result.d.ts b/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_result.ts similarity index 100% rename from mediapipe/tasks/web/vision/image_segmenter/image_segmenter_result.d.ts rename to mediapipe/tasks/web/vision/image_segmenter/image_segmenter_result.ts diff --git a/mediapipe/tasks/web/vision/interactive_segmenter/BUILD b/mediapipe/tasks/web/vision/interactive_segmenter/BUILD index 57b0946a2..c4216463f 100644 --- a/mediapipe/tasks/web/vision/interactive_segmenter/BUILD +++ b/mediapipe/tasks/web/vision/interactive_segmenter/BUILD @@ -1,6 +1,6 @@ # This contains the MediaPipe Interactive Segmenter Task. -load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_declaration", "mediapipe_ts_library") +load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_library") load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") package(default_visibility = ["//mediapipe/tasks:internal"]) @@ -9,9 +9,12 @@ licenses(["notice"]) mediapipe_ts_library( name = "interactive_segmenter", - srcs = ["interactive_segmenter.ts"], + srcs = [ + "interactive_segmenter.ts", + "interactive_segmenter_options.ts", + "interactive_segmenter_result.ts", + ], deps = [ - ":interactive_segmenter_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/framework:calculator_options_jspb_proto", "//mediapipe/tasks/cc/core/proto:base_options_jspb_proto", @@ -19,8 +22,11 @@ mediapipe_ts_library( "//mediapipe/tasks/cc/vision/image_segmenter/proto:segmenter_options_jspb_proto", "//mediapipe/tasks/web/components/containers:keypoint", "//mediapipe/tasks/web/core", + "//mediapipe/tasks/web/core:classifier_options", "//mediapipe/tasks/web/vision/core:image_processing_options", + "//mediapipe/tasks/web/vision/core:mask", "//mediapipe/tasks/web/vision/core:types", + "//mediapipe/tasks/web/vision/core:vision_task_options", "//mediapipe/tasks/web/vision/core:vision_task_runner", "//mediapipe/util:color_jspb_proto", "//mediapipe/util:render_data_jspb_proto", @@ -28,20 +34,6 @@ mediapipe_ts_library( ], ) -mediapipe_ts_declaration( - name = "interactive_segmenter_types", - srcs = [ - "interactive_segmenter_options.d.ts", - "interactive_segmenter_result.d.ts", - ], - deps = [ - "//mediapipe/tasks/web/core", - "//mediapipe/tasks/web/core:classifier_options", - "//mediapipe/tasks/web/vision/core:mask", - "//mediapipe/tasks/web/vision/core:vision_task_options", - ], -) - mediapipe_ts_library( name = "interactive_segmenter_test_lib", testonly = True, @@ -50,7 +42,6 @@ mediapipe_ts_library( ], deps = [ ":interactive_segmenter", - ":interactive_segmenter_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/tasks/web/core", "//mediapipe/tasks/web/core:task_runner_test_utils", diff --git a/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.d.ts b/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.ts similarity index 100% rename from mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.d.ts rename to mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.ts diff --git a/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_result.d.ts b/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_result.ts similarity index 100% rename from mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_result.d.ts rename to mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_result.ts diff --git a/mediapipe/tasks/web/vision/pose_landmarker/BUILD b/mediapipe/tasks/web/vision/pose_landmarker/BUILD index 566513b40..727f44407 100644 --- a/mediapipe/tasks/web/vision/pose_landmarker/BUILD +++ b/mediapipe/tasks/web/vision/pose_landmarker/BUILD @@ -3,7 +3,7 @@ # This task takes video frames and outputs synchronized frames along with # the detection results for one or more pose categories, using Pose Landmarker. -load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_declaration", "mediapipe_ts_library") +load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_library") load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") package(default_visibility = ["//mediapipe/tasks:internal"]) @@ -12,10 +12,13 @@ licenses(["notice"]) mediapipe_ts_library( name = "pose_landmarker", - srcs = ["pose_landmarker.ts"], + srcs = [ + "pose_landmarker.ts", + "pose_landmarker_options.ts", + "pose_landmarker_result.ts", + ], visibility = ["//visibility:public"], deps = [ - ":pose_landmarker_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/framework:calculator_options_jspb_proto", "//mediapipe/framework/formats:landmark_jspb_proto", @@ -28,28 +31,14 @@ mediapipe_ts_library( "//mediapipe/tasks/web/components/processors:landmark_result", "//mediapipe/tasks/web/core", "//mediapipe/tasks/web/vision/core:image_processing_options", + "//mediapipe/tasks/web/vision/core:mask", "//mediapipe/tasks/web/vision/core:types", + "//mediapipe/tasks/web/vision/core:vision_task_options", "//mediapipe/tasks/web/vision/core:vision_task_runner", "//mediapipe/web/graph_runner:graph_runner_ts", ], ) -mediapipe_ts_declaration( - name = "pose_landmarker_types", - srcs = [ - "pose_landmarker_options.d.ts", - "pose_landmarker_result.d.ts", - ], - visibility = ["//visibility:public"], - deps = [ - "//mediapipe/tasks/web/components/containers:category", - "//mediapipe/tasks/web/components/containers:landmark", - "//mediapipe/tasks/web/core", - "//mediapipe/tasks/web/vision/core:mask", - "//mediapipe/tasks/web/vision/core:vision_task_options", - ], -) - mediapipe_ts_library( name = "pose_landmarker_test_lib", testonly = True, @@ -58,7 +47,6 @@ mediapipe_ts_library( ], deps = [ ":pose_landmarker", - ":pose_landmarker_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/tasks/web/components/processors:landmark_result", "//mediapipe/tasks/web/core", diff --git a/mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.d.ts b/mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.ts similarity index 100% rename from mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.d.ts rename to mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.ts diff --git a/mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_result.d.ts b/mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_result.ts similarity index 100% rename from mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_result.d.ts rename to mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_result.ts