Moved OutputType and Activation to image_segmenter

mediapipe/tasks/python/components/proto/BUILD

@@ -1,24 +0,0 @@
-# Copyright 2022 The MediaPipe Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Placeholder for internal Python strict library compatibility macro.
-
-package(default_visibility = ["//mediapipe/tasks:internal"])
-
-licenses(["notice"])
-
-py_library(
-    name = "segmenter_options",
-    srcs = ["segmenter_options.py"]
-)

mediapipe/tasks/python/components/proto/segmenter_options.py

@@ -1,28 +0,0 @@
-# Copyright 2022 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Segmenter options data class."""
-
-import enum
-
-
-class OutputType(enum.Enum):
-  UNSPECIFIED = 0
-  CATEGORY_MASK = 1
-  CONFIDENCE_MASK = 2
-
-
-class Activation(enum.Enum):
-  NONE = 0
-  SIGMOID = 1
-  SOFTMAX = 2

mediapipe/tasks/python/test/vision/BUILD

@@ -48,7 +48,6 @@ py_test(
         "//mediapipe/python:_framework_bindings",
         "//mediapipe/tasks/python/core:base_options",
         "//mediapipe/tasks/python/test:test_utils",
-        "//mediapipe/tasks/python/components/proto:segmenter_options",
         "//mediapipe/tasks/python/vision:image_segmenter",
         "//mediapipe/tasks/python/vision/core:vision_task_running_mode",
         "@absl_py//absl/testing:parameterized",

mediapipe/tasks/python/test/vision/image_segmenter_test.py

@@ -24,7 +24,6 @@ from absl.testing import parameterized
 
 from mediapipe.python._framework_bindings import image as image_module
 from mediapipe.python._framework_bindings import image_frame
-from mediapipe.tasks.python.components.proto import segmenter_options
 from mediapipe.tasks.python.core import base_options as base_options_module
 from mediapipe.tasks.python.test import test_utils
 from mediapipe.tasks.python.vision import image_segmenter
@@ -33,8 +32,8 @@ from mediapipe.tasks.python.vision.core import vision_task_running_mode
 _BaseOptions = base_options_module.BaseOptions
 _Image = image_module.Image
 _ImageFormat = image_frame.ImageFormat
-_OutputType = segmenter_options.OutputType
+_OutputType = image_segmenter.OutputType
-_Activation = segmenter_options.Activation
+_Activation = image_segmenter.Activation
 _ImageSegmenter = image_segmenter.ImageSegmenter
 _ImageSegmenterOptions = image_segmenter.ImageSegmenterOptions
 _RUNNING_MODE = vision_task_running_mode.VisionTaskRunningMode

mediapipe/tasks/python/vision/BUILD

@@ -48,7 +48,6 @@ py_library(
         "//mediapipe/python:packet_getter",
         "//mediapipe/tasks/cc/components/proto:segmenter_options_py_pb2",
         "//mediapipe/tasks/cc/vision/image_segmenter/proto:image_segmenter_options_py_pb2",
-        "//mediapipe/tasks/python/components/proto:segmenter_options",
         "//mediapipe/tasks/python/core:base_options",
         "//mediapipe/tasks/python/core:optional_dependencies",
         "//mediapipe/tasks/python/core:task_info",

mediapipe/tasks/python/vision/image_segmenter.py

@@ -15,6 +15,7 @@
 
 import dataclasses
 from typing import Callable, List, Mapping, Optional
+import enum
 
 from mediapipe.python import packet_creator
 from mediapipe.python import packet_getter
@@ -23,7 +24,6 @@ from mediapipe.python._framework_bindings import packet
 from mediapipe.python._framework_bindings import task_runner
 from mediapipe.tasks.cc.components.proto import segmenter_options_pb2
 from mediapipe.tasks.cc.vision.image_segmenter.proto import image_segmenter_options_pb2
-from mediapipe.tasks.python.components.proto import segmenter_options
 from mediapipe.tasks.python.core import base_options as base_options_module
 from mediapipe.tasks.python.core import task_info as task_info_module
 from mediapipe.tasks.python.core.optional_dependencies import doc_controls
@@ -33,8 +33,6 @@ from mediapipe.tasks.python.vision.core import vision_task_running_mode
 _BaseOptions = base_options_module.BaseOptions
 _SegmenterOptionsProto = segmenter_options_pb2.SegmenterOptions
 _ImageSegmenterOptionsProto = image_segmenter_options_pb2.ImageSegmenterOptions
-_OutputType = segmenter_options.OutputType
-_Activation = segmenter_options.Activation
 _RunningMode = vision_task_running_mode.VisionTaskRunningMode
 _TaskInfo = task_info_module.TaskInfo
 _TaskRunner = task_runner.TaskRunner
@@ -48,6 +46,18 @@ _TASK_GRAPH_NAME = 'mediapipe.tasks.vision.ImageSegmenterGraph'
 _MICRO_SECONDS_PER_MILLISECOND = 1000
 
 
+class OutputType(enum.Enum):
+  UNSPECIFIED = 0
+  CATEGORY_MASK = 1
+  CONFIDENCE_MASK = 2
+
+
+class Activation(enum.Enum):
+  NONE = 0
+  SIGMOID = 1
+  SOFTMAX = 2
+
+
 @dataclasses.dataclass
 class ImageSegmenterOptions:
   """Options for the image segmenter task.
@@ -69,8 +79,8 @@ class ImageSegmenterOptions:
   """
   base_options: _BaseOptions
   running_mode: _RunningMode = _RunningMode.IMAGE
-  output_type: Optional[_OutputType] = _OutputType.CATEGORY_MASK
+  output_type: Optional[OutputType] = OutputType.CATEGORY_MASK
-  activation: Optional[_Activation] = _Activation.NONE
+  activation: Optional[Activation] = Activation.NONE
   result_callback: Optional[
       Callable[[List[image_module.Image], image_module.Image, int],
                None]] = None