From 444cd00ee66bf2716e33f6d8907fd2d59dc473bf Mon Sep 17 00:00:00 2001 From: kinaryml Date: Tue, 21 Mar 2023 23:15:55 -0700 Subject: [PATCH] Moved audio_record.py to tasks/python/audio/core --- mediapipe/tasks/python/audio/core/BUILD | 7 ++++++- .../{components/containers => audio/core}/audio_record.py | 0 mediapipe/tasks/python/audio/core/base_audio_task_api.py | 2 +- mediapipe/tasks/python/components/containers/BUILD | 5 ----- mediapipe/tasks/python/test/audio/BUILD | 4 ++-- mediapipe/tasks/python/test/audio/audio_classifier_test.py | 2 +- mediapipe/tasks/python/test/audio/audio_embedder_test.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename mediapipe/tasks/python/{components/containers => audio/core}/audio_record.py (100%) diff --git a/mediapipe/tasks/python/audio/core/BUILD b/mediapipe/tasks/python/audio/core/BUILD index 28dc4b96..461ffb8b 100644 --- a/mediapipe/tasks/python/audio/core/BUILD +++ b/mediapipe/tasks/python/audio/core/BUILD @@ -23,6 +23,11 @@ py_library( srcs = ["audio_task_running_mode.py"], ) +py_library( + name = "audio_record", + srcs = ["audio_record.py"], +) + py_library( name = "base_audio_task_api", srcs = [ @@ -30,10 +35,10 @@ py_library( ], deps = [ ":audio_task_running_mode", + ":audio_record", "//mediapipe/framework:calculator_py_pb2", "//mediapipe/python:_framework_bindings", "//mediapipe/python:packet_creator", "//mediapipe/tasks/python/core:optional_dependencies", - "//mediapipe/tasks/python/components/containers:audio_record", ], ) diff --git a/mediapipe/tasks/python/components/containers/audio_record.py b/mediapipe/tasks/python/audio/core/audio_record.py similarity index 100% rename from mediapipe/tasks/python/components/containers/audio_record.py rename to mediapipe/tasks/python/audio/core/audio_record.py diff --git a/mediapipe/tasks/python/audio/core/base_audio_task_api.py b/mediapipe/tasks/python/audio/core/base_audio_task_api.py index 73b1273c..aa5b28fc 100644 --- a/mediapipe/tasks/python/audio/core/base_audio_task_api.py +++ b/mediapipe/tasks/python/audio/core/base_audio_task_api.py @@ -21,8 +21,8 @@ from mediapipe.python._framework_bindings import packet as packet_module from mediapipe.python._framework_bindings import task_runner as task_runner_module from mediapipe.python._framework_bindings import timestamp as timestamp_module from mediapipe.tasks.python.audio.core import audio_task_running_mode as running_mode_module +from mediapipe.tasks.python.audio.core import audio_record from mediapipe.tasks.python.core.optional_dependencies import doc_controls -from mediapipe.tasks.python.components.containers import audio_record _TaskRunner = task_runner_module.TaskRunner _Packet = packet_module.Packet diff --git a/mediapipe/tasks/python/components/containers/BUILD b/mediapipe/tasks/python/components/containers/BUILD index 61163365..7108617f 100644 --- a/mediapipe/tasks/python/components/containers/BUILD +++ b/mediapipe/tasks/python/components/containers/BUILD @@ -23,11 +23,6 @@ py_library( srcs = ["audio_data.py"], ) -py_library( - name = "audio_record", - srcs = ["audio_record.py"], -) - py_library( name = "bounding_box", srcs = ["bounding_box.py"], diff --git a/mediapipe/tasks/python/test/audio/BUILD b/mediapipe/tasks/python/test/audio/BUILD index d6e0788f..6bf69a27 100644 --- a/mediapipe/tasks/python/test/audio/BUILD +++ b/mediapipe/tasks/python/test/audio/BUILD @@ -27,9 +27,9 @@ py_test( ], deps = [ "//mediapipe/tasks/python/audio:audio_classifier", + "//mediapipe/tasks/python/audio/core:audio_record", "//mediapipe/tasks/python/audio/core:audio_task_running_mode", "//mediapipe/tasks/python/components/containers:audio_data", - "//mediapipe/tasks/python/components/containers:audio_record", "//mediapipe/tasks/python/components/containers:classification_result", "//mediapipe/tasks/python/core:base_options", "//mediapipe/tasks/python/test:test_utils", @@ -45,9 +45,9 @@ py_test( ], deps = [ "//mediapipe/tasks/python/audio:audio_embedder", + "//mediapipe/tasks/python/audio/core:audio_record", "//mediapipe/tasks/python/audio/core:audio_task_running_mode", "//mediapipe/tasks/python/components/containers:audio_data", - "//mediapipe/tasks/python/components/containers:audio_record", "//mediapipe/tasks/python/components/containers:embedding_result", "//mediapipe/tasks/python/core:base_options", "//mediapipe/tasks/python/test:test_utils", diff --git a/mediapipe/tasks/python/test/audio/audio_classifier_test.py b/mediapipe/tasks/python/test/audio/audio_classifier_test.py index 665a5ca1..8880c02f 100644 --- a/mediapipe/tasks/python/test/audio/audio_classifier_test.py +++ b/mediapipe/tasks/python/test/audio/audio_classifier_test.py @@ -25,9 +25,9 @@ from scipy.io import wavfile from mediapipe.tasks.python.audio import audio_classifier from mediapipe.tasks.python.audio.core import audio_task_running_mode +from mediapipe.tasks.python.audio.core import audio_record from mediapipe.tasks.python.components.containers import audio_data as audio_data_module from mediapipe.tasks.python.components.containers import classification_result as classification_result_module -from mediapipe.tasks.python.components.containers import audio_record from mediapipe.tasks.python.core import base_options as base_options_module from mediapipe.tasks.python.test import test_utils diff --git a/mediapipe/tasks/python/test/audio/audio_embedder_test.py b/mediapipe/tasks/python/test/audio/audio_embedder_test.py index 2015d2bc..f1e8ec6e 100644 --- a/mediapipe/tasks/python/test/audio/audio_embedder_test.py +++ b/mediapipe/tasks/python/test/audio/audio_embedder_test.py @@ -25,8 +25,8 @@ from scipy.io import wavfile from mediapipe.tasks.python.audio import audio_embedder from mediapipe.tasks.python.audio.core import audio_task_running_mode +from mediapipe.tasks.python.audio.core import audio_record from mediapipe.tasks.python.components.containers import audio_data as audio_data_module -from mediapipe.tasks.python.components.containers import audio_record from mediapipe.tasks.python.core import base_options as base_options_module from mediapipe.tasks.python.test import test_utils