Skip to content

fix file name #3895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions paddlespeech/s2t/models/whisper/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
#
# Modified from OpenAI Whisper 2022 (https://github.com/openai/whisper/whisper/__init__.py)
from paddlespeech.s2t.models.whisper.whipser import decode
from paddlespeech.s2t.models.whisper.whipser import DecodingOptions
from paddlespeech.s2t.models.whisper.whipser import DecodingResult
from paddlespeech.s2t.models.whisper.whipser import detect_language
from paddlespeech.s2t.models.whisper.whipser import log_mel_spectrogram
from paddlespeech.s2t.models.whisper.whipser import ModelDimensions
from paddlespeech.s2t.models.whisper.whipser import transcribe
from paddlespeech.s2t.models.whisper.whipser import Whisper
from paddlespeech.s2t.models.whisper.whisper import decode
from paddlespeech.s2t.models.whisper.whisper import DecodingOptions
from paddlespeech.s2t.models.whisper.whisper import DecodingResult
from paddlespeech.s2t.models.whisper.whisper import detect_language
from paddlespeech.s2t.models.whisper.whisper import log_mel_spectrogram
from paddlespeech.s2t.models.whisper.whisper import ModelDimensions
from paddlespeech.s2t.models.whisper.whisper import transcribe
from paddlespeech.s2t.models.whisper.whisper import Whisper
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
import numpy as np
import paddle
import paddle.nn.functional as F
import paddlespeech.s2t.modules.align as paddlespeech_nn
import soundfile
import tqdm
from paddle import nn
from paddle.distribution import Categorical

import paddlespeech.s2t.modules.align as paddlespeech_nn
from paddlespeech.s2t.models.whisper import utils
from paddlespeech.s2t.models.whisper.tokenizer import get_tokenizer
from paddlespeech.s2t.models.whisper.tokenizer import LANGUAGES
Expand Down Expand Up @@ -475,8 +476,8 @@ def transcribe(
if dtype == np.float32:
decode_options["fp16"] = False

if decode_options.get(
"language") == 'None' or decode_options.get("language", None) is None:
if decode_options.get("language") == 'None' or decode_options.get(
"language", None) is None:
if not model.is_multilingual:
decode_options["language"] = "en"
else:
Expand Down Expand Up @@ -1206,8 +1207,9 @@ def run(self, mel: paddle.Tensor) -> List[DecodingResult]:
DecodingResult(
audio_features=features,
language=language,
language_probs=probs) for features, language, probs in
zip(audio_features, languages, language_probs)
language_probs=probs)
for features, language, probs in zip(audio_features, languages,
language_probs)
]

# repeat the audio & text tensors by the group size, for beam search or best-of-n sampling
Expand Down