From 1167f61f9825cc80e3e81b53b08a59f1a19ef456 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Tue, 6 Dec 2022 18:02:35 -0800 Subject: [PATCH] Remove generic Options template argument from TaskRunner PiperOrigin-RevId: 493462947 --- mediapipe/tasks/web/audio/core/BUILD | 5 +---- .../tasks/web/audio/core/audio_task_runner.ts | 3 +-- mediapipe/tasks/web/core/task_runner.ts | 14 ++++++-------- .../web/text/text_classifier/text_classifier.ts | 2 +- .../tasks/web/text/text_embedder/text_embedder.ts | 2 +- .../tasks/web/vision/core/vision_task_runner.ts | 3 +-- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/mediapipe/tasks/web/audio/core/BUILD b/mediapipe/tasks/web/audio/core/BUILD index 9ab6c7be..cea68983 100644 --- a/mediapipe/tasks/web/audio/core/BUILD +++ b/mediapipe/tasks/web/audio/core/BUILD @@ -7,8 +7,5 @@ package(default_visibility = ["//mediapipe/tasks:internal"]) mediapipe_ts_library( name = "audio_task_runner", srcs = ["audio_task_runner.ts"], - deps = [ - "//mediapipe/tasks/web/core", - "//mediapipe/tasks/web/core:task_runner", - ], + deps = ["//mediapipe/tasks/web/core:task_runner"], ) diff --git a/mediapipe/tasks/web/audio/core/audio_task_runner.ts b/mediapipe/tasks/web/audio/core/audio_task_runner.ts index 00cfe025..24d78378 100644 --- a/mediapipe/tasks/web/audio/core/audio_task_runner.ts +++ b/mediapipe/tasks/web/audio/core/audio_task_runner.ts @@ -15,10 +15,9 @@ */ import {TaskRunner} from '../../../../tasks/web/core/task_runner'; -import {TaskRunnerOptions} from '../../../../tasks/web/core/task_runner_options'; /** Base class for all MediaPipe Audio Tasks. */ -export abstract class AudioTaskRunner extends TaskRunner { +export abstract class AudioTaskRunner extends TaskRunner { private defaultSampleRate = 48000; /** diff --git a/mediapipe/tasks/web/core/task_runner.ts b/mediapipe/tasks/web/core/task_runner.ts index e2ab42e3..71e159dc 100644 --- a/mediapipe/tasks/web/core/task_runner.ts +++ b/mediapipe/tasks/web/core/task_runner.ts @@ -37,10 +37,9 @@ export class GraphRunnerImageLib extends GraphRunnerImageLibType {} * supported and loads the relevant WASM binary. * @return A fully instantiated instance of `T`. */ -export async function -createTaskRunner, O extends TaskRunnerOptions>( +export async function createTaskRunner( type: WasmMediaPipeConstructor, initializeCanvas: boolean, - fileset: WasmFileset, options: O): Promise { + fileset: WasmFileset, options: TaskRunnerOptions): Promise { const fileLocator: FileLocator = { locateFile() { // The only file loaded with this mechanism is the Wasm binary @@ -61,7 +60,7 @@ createTaskRunner, O extends TaskRunnerOptions>( } /** Base class for all MediaPipe Tasks. */ -export abstract class TaskRunner { +export abstract class TaskRunner { protected abstract baseOptions: BaseOptionsProto; protected graphRunner: GraphRunnerImageLib; private processingErrors: Error[] = []; @@ -71,10 +70,9 @@ export abstract class TaskRunner { * supported and loads the relevant WASM binary. * @return A fully instantiated instance of `T`. */ - protected static async createInstance, - O extends TaskRunnerOptions>( + protected static async createInstance( type: WasmMediaPipeConstructor, initializeCanvas: boolean, - fileset: WasmFileset, options: O): Promise { + fileset: WasmFileset, options: TaskRunnerOptions): Promise { return createTaskRunner(type, initializeCanvas, fileset, options); } @@ -92,7 +90,7 @@ export abstract class TaskRunner { } /** Configures the shared options of a MediaPipe Task. */ - async setOptions(options: O): Promise { + async setOptions(options: TaskRunnerOptions): Promise { if (options.baseOptions) { this.baseOptions = await convertBaseOptionsToProto( options.baseOptions, this.baseOptions); diff --git a/mediapipe/tasks/web/text/text_classifier/text_classifier.ts b/mediapipe/tasks/web/text/text_classifier/text_classifier.ts index 8810d4b4..4a858883 100644 --- a/mediapipe/tasks/web/text/text_classifier/text_classifier.ts +++ b/mediapipe/tasks/web/text/text_classifier/text_classifier.ts @@ -41,7 +41,7 @@ const TEXT_CLASSIFIER_GRAPH = // tslint:disable:jspb-use-builder-pattern /** Performs Natural Language classification. */ -export class TextClassifier extends TaskRunner { +export class TextClassifier extends TaskRunner { private classificationResult: TextClassifierResult = {classifications: []}; private readonly options = new TextClassifierGraphOptions(); diff --git a/mediapipe/tasks/web/text/text_embedder/text_embedder.ts b/mediapipe/tasks/web/text/text_embedder/text_embedder.ts index 62f9b06d..cd5bc644 100644 --- a/mediapipe/tasks/web/text/text_embedder/text_embedder.ts +++ b/mediapipe/tasks/web/text/text_embedder/text_embedder.ts @@ -45,7 +45,7 @@ const TEXT_EMBEDDER_CALCULATOR = /** * Performs embedding extraction on text. */ -export class TextEmbedder extends TaskRunner { +export class TextEmbedder extends TaskRunner { private embeddingResult: TextEmbedderResult = {embeddings: []}; private readonly options = new TextEmbedderGraphOptionsProto(); diff --git a/mediapipe/tasks/web/vision/core/vision_task_runner.ts b/mediapipe/tasks/web/vision/core/vision_task_runner.ts index 78b4859f..3432b521 100644 --- a/mediapipe/tasks/web/vision/core/vision_task_runner.ts +++ b/mediapipe/tasks/web/vision/core/vision_task_runner.ts @@ -20,8 +20,7 @@ import {ImageSource} from '../../../../web/graph_runner/graph_runner'; import {VisionTaskOptions} from './vision_task_options'; /** Base class for all MediaPipe Vision Tasks. */ -export abstract class VisionTaskRunner extends - TaskRunner { +export abstract class VisionTaskRunner extends TaskRunner { /** Configures the shared options of a vision task. */ override async setOptions(options: VisionTaskOptions): Promise { await super.setOptions(options);