From f42c0ccc7699b0ae7b857d288904d26c671419c7 Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Wed, 29 Jun 2022 09:51:36 +0000 Subject: [PATCH] format code --- .pre-commit-hooks/cpplint.hook | 2 +- paddlespeech/audio/_internal/module_utils.py | 4 ++++ .../audio/src/pybind/kaldi/feature_common_inl.h | 16 ++++++++-------- .../audio/src/pybind/kaldi/kaldi_feature.cc | 7 ++++--- .../audio/src/pybind/kaldi/kaldi_feature.h | 5 +++-- .../src/pybind/kaldi/kaldi_feature_wrapper.h | 4 ++-- paddlespeech/audio/src/pybind/pybind.cpp | 4 ++-- .../ds2_ol/onnx/local/onnx_infer_shape.py | 9 +++++++++ tools/setup_helpers/extension.py | 3 ++- 9 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.pre-commit-hooks/cpplint.hook b/.pre-commit-hooks/cpplint.hook index 316b0bace..2c3e68ccb 100644 --- a/.pre-commit-hooks/cpplint.hook +++ b/.pre-commit-hooks/cpplint.hook @@ -45,7 +45,7 @@ exec 1>&2 cpplint=cpplint sum=0 -filters='-build/include_order,-build/namespaces,-legal/copyright,-runtime/references,-build/include_what_you_use' +filters='-build/include_order,-build/namespaces,-legal/copyright,-runtime/references,-build/include_what_you_use,-whitespace/indent,-build/header_guard' # for cpp for file in $(git diff-index --name-status $against -- | grep -E '\.[ch](pp)?$' | awk '{print $2}'); do diff --git a/paddlespeech/audio/_internal/module_utils.py b/paddlespeech/audio/_internal/module_utils.py index 523af2be7..b19cc316c 100644 --- a/paddlespeech/audio/_internal/module_utils.py +++ b/paddlespeech/audio/_internal/module_utils.py @@ -108,9 +108,11 @@ def is_soundfile_available(): def requires_soundfile(): if is_soundfile_available(): + def decorator(func): return func else: + def decorator(func): @wraps(func) def wrapped(*args, **kwargs): @@ -128,9 +130,11 @@ def is_sox_available(): def requires_sox(): if is_sox_available(): + def decorator(func): return func else: + def decorator(func): @wraps(func) def wrapped(*args, **kwargs): diff --git a/paddlespeech/audio/src/pybind/kaldi/feature_common_inl.h b/paddlespeech/audio/src/pybind/kaldi/feature_common_inl.h index 5844bf1b6..c894b9775 100644 --- a/paddlespeech/audio/src/pybind/kaldi/feature_common_inl.h +++ b/paddlespeech/audio/src/pybind/kaldi/feature_common_inl.h @@ -15,7 +15,7 @@ #include "base/kaldi-common.h" namespace paddleaudio { -namespace kaldi { +namespace kaldi { template StreamingFeatureTpl::StreamingFeatureTpl(const Options& opts) @@ -72,15 +72,15 @@ bool StreamingFeatureTpl::Compute( for (::kaldi::int32 frame = 0; frame < num_frames; frame++) { ::kaldi::BaseFloat raw_log_energy = 0.0; ::kaldi::ExtractWindow(0, - waves, - frame, - frame_opts, - window_function_, - &window, - need_raw_log_energy ? &raw_log_energy : NULL); + waves, + frame, + frame_opts, + window_function_, + &window, + need_raw_log_energy ? &raw_log_energy : NULL); ::kaldi::Vector<::kaldi::BaseFloat> this_feature(computer_.Dim(), - ::kaldi::kUndefined); + ::kaldi::kUndefined); computer_.Compute(raw_log_energy, vtln_warp, &window, &this_feature); ::kaldi::SubVector<::kaldi::BaseFloat> output_row( feats->Data() + frame * Dim(), Dim()); diff --git a/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.cc b/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.cc index faafac903..115fa1145 100644 --- a/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.cc +++ b/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.cc @@ -77,7 +77,8 @@ bool InitFbank(float samp_freq, // frame opts } py::array_t ComputeFbankStreaming(const py::array_t& wav) { - return paddleaudio::kaldi::KaldiFeatureWrapper::GetInstance()->ComputeFbank(wav); + return paddleaudio::kaldi::KaldiFeatureWrapper::GetInstance()->ComputeFbank( + wav); } py::array_t ComputeFbank( @@ -144,5 +145,5 @@ void ResetFbank() { paddleaudio::kaldi::KaldiFeatureWrapper::GetInstance()->ResetFbank(); } -} // kaldi -} // paddleaudio +} // namespace kaldi +} // namespace paddleaudio diff --git a/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.h b/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.h index ff55a707a..ee638cf5d 100644 --- a/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.h +++ b/paddlespeech/audio/src/pybind/kaldi/kaldi_feature.h @@ -16,6 +16,7 @@ #include #include +#include #include "paddlespeech/audio/src/pybind/kaldi/kaldi_feature_wrapper.h" @@ -88,5 +89,5 @@ py::array_t ComputeFbankStreaming(const py::array_t& wav); py::array_t TestFun(const py::array_t& wav); -} // namespace kaldi -} // namespace paddleaudio \ No newline at end of file +} // namespace kaldi +} // namespace paddleaudio diff --git a/paddlespeech/audio/src/pybind/kaldi/kaldi_feature_wrapper.h b/paddlespeech/audio/src/pybind/kaldi/kaldi_feature_wrapper.h index d2c01a7d8..ebbd7a9e1 100644 --- a/paddlespeech/audio/src/pybind/kaldi/kaldi_feature_wrapper.h +++ b/paddlespeech/audio/src/pybind/kaldi/kaldi_feature_wrapper.h @@ -36,5 +36,5 @@ class KaldiFeatureWrapper { std::unique_ptr fbank_; }; -} // namespace kaldi -} // namespace paddleaudio +} // namespace kaldi +} // namespace paddleaudio diff --git a/paddlespeech/audio/src/pybind/pybind.cpp b/paddlespeech/audio/src/pybind/pybind.cpp index 949ce23c2..c61575f41 100644 --- a/paddlespeech/audio/src/pybind/pybind.cpp +++ b/paddlespeech/audio/src/pybind/pybind.cpp @@ -1,8 +1,8 @@ // Copyright (c) 2017 Facebook Inc. (Soumith Chintala), All rights reserved. // Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. -#include "paddlespeech/audio/src/pybind/sox/io.h" #include "paddlespeech/audio/src/pybind/kaldi/kaldi_feature.h" +#include "paddlespeech/audio/src/pybind/sox/io.h" // Sox PYBIND11_MODULE(_paddleaudio, m) { @@ -19,4 +19,4 @@ PYBIND11_MODULE(_paddleaudio, m) { m.def("ComputeFbankStreaming", &paddleaudio::kaldi::ComputeFbankStreaming, "compute fbank streaming"); -} \ No newline at end of file +} diff --git a/speechx/examples/ds2_ol/onnx/local/onnx_infer_shape.py b/speechx/examples/ds2_ol/onnx/local/onnx_infer_shape.py index 088d3ef5c..838b67510 100755 --- a/speechx/examples/ds2_ol/onnx/local/onnx_infer_shape.py +++ b/speechx/examples/ds2_ol/onnx/local/onnx_infer_shape.py @@ -499,6 +499,15 @@ class SymbolicShapeInference: + + + + + + + + + 'Attention', 'BiasGelu', \ 'EmbedLayerNormalization', \ 'FastGelu', 'Gelu', 'LayerNormalization', \ diff --git a/tools/setup_helpers/extension.py b/tools/setup_helpers/extension.py index 97babab6b..ed76cec3c 100644 --- a/tools/setup_helpers/extension.py +++ b/tools/setup_helpers/extension.py @@ -35,7 +35,8 @@ def _get_build(var, default=False): _BUILD_SOX = False if platform.system() == "Windows" else _get_build( "BUILD_SOX", True) _BUILD_MAD = _get_build("BUILD_MAD", False) -_BUILD_KALDI = False if platform.system() == "Windows" else _get_build("BUILD_KALDI", True) +_BUILD_KALDI = False if platform.system() == "Windows" else _get_build( + "BUILD_KALDI", True) # _BUILD_RNNT = _get_build("BUILD_RNNT", True) # _BUILD_CTC_DECODER = False if platform.system() == "Windows" else _get_build("BUILD_CTC_DECODER", True) # _USE_FFMPEG = _get_build("USE_FFMPEG", False)