Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
xuning
/
sherpaonnx
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
Fangjun Kuang
2024-05-17 09:20:07 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
GitHub
2024-05-17 09:20:07 +0800
Commit
8af2af84664d3285ba452bf453bb928a3eb6e978
8af2af84
1 parent
65635b09
Add tail_paddings to Whisper C API. (#886)
显示空白字符变更
内嵌
并排对比
正在显示
13 个修改的文件
包含
25 行增加
和
5 行删除
CMakeLists.txt
nodejs-examples/test-offline-nemo-ctc.js
nodejs-examples/test-offline-paraformer.js
nodejs-examples/test-offline-transducer.js
nodejs-examples/test-offline-whisper.js
scripts/dotnet/offline.cs
scripts/go/sherpa_onnx.go
scripts/node-addon-api/src/non-streaming-asr.cc
sherpa-onnx/c-api/c-api.cc
sherpa-onnx/c-api/c-api.h
swift-api-examples/SherpaOnnx.swift
wasm/asr/sherpa-onnx-asr.js
wasm/nodejs/sherpa-onnx-wasm-nodejs.cc
CMakeLists.txt
查看文件 @
8af2af8
cmake_minimum_required
(
VERSION 3.13 FATAL_ERROR
)
project
(
sherpa-onnx
)
set
(
SHERPA_ONNX_VERSION
"1.9.2
4
"
)
set
(
SHERPA_ONNX_VERSION
"1.9.2
5
"
)
# Disable warning about
#
...
...
nodejs-examples/test-offline-nemo-ctc.js
查看文件 @
8af2af8
...
...
@@ -29,6 +29,7 @@ function createOfflineRecognizer() {
decoder
:
''
,
language
:
''
,
task
:
''
,
tailPaddings
:
-
1
,
},
tdnn
:
{
model
:
''
,
...
...
nodejs-examples/test-offline-paraformer.js
查看文件 @
8af2af8
...
...
@@ -29,6 +29,7 @@ function createOfflineRecognizer() {
decoder
:
''
,
language
:
''
,
task
:
''
,
tailPaddings
:
-
1
,
},
tdnn
:
{
model
:
''
,
...
...
nodejs-examples/test-offline-transducer.js
查看文件 @
8af2af8
...
...
@@ -32,6 +32,7 @@ function createOfflineRecognizer() {
decoder
:
''
,
language
:
''
,
task
:
''
,
tailPaddings
:
-
1
,
},
tdnn
:
{
model
:
''
,
...
...
nodejs-examples/test-offline-whisper.js
查看文件 @
8af2af8
...
...
@@ -29,6 +29,7 @@ function createOfflineRecognizer() {
decoder
:
'./sherpa-onnx-whisper-tiny.en/tiny.en-decoder.int8.onnx'
,
language
:
''
,
task
:
'transcribe'
,
tailPaddings
:
-
1
,
},
tdnn
:
{
model
:
''
,
...
...
scripts/dotnet/offline.cs
查看文件 @
8af2af8
...
...
@@ -301,6 +301,7 @@ namespace SherpaOnnx
Decoder
=
""
;
Language
=
""
;
Task
=
"transcribe"
;
TailPaddings
=
-
1
;
}
[
MarshalAs
(
UnmanagedType
.
LPStr
)]
public
string
Encoder
;
...
...
@@ -313,6 +314,8 @@ namespace SherpaOnnx
[
MarshalAs
(
UnmanagedType
.
LPStr
)]
public
string
Task
;
public
int
TailPaddings
;
}
[
StructLayout
(
LayoutKind
.
Sequential
)]
...
...
scripts/go/sherpa_onnx.go
查看文件 @
8af2af8
...
...
@@ -340,6 +340,7 @@ type OfflineWhisperModelConfig struct {
Decoder
string
Language
string
Task
string
TailPaddings
int
}
type
OfflineTdnnModelConfig
struct
{
...
...
@@ -441,6 +442,8 @@ func NewOfflineRecognizer(config *OfflineRecognizerConfig) *OfflineRecognizer {
c
.
model_config
.
whisper
.
task
=
C
.
CString
(
config
.
ModelConfig
.
Whisper
.
Task
)
defer
C
.
free
(
unsafe
.
Pointer
(
c
.
model_config
.
whisper
.
task
))
c
.
model_config
.
whisper
.
tail_paddings
=
C
.
int
(
config
.
ModelConfig
.
Whisper
.
TailPaddings
)
c
.
model_config
.
tdnn
.
model
=
C
.
CString
(
config
.
ModelConfig
.
Tdnn
.
Model
)
defer
C
.
free
(
unsafe
.
Pointer
(
c
.
model_config
.
tdnn
.
model
))
...
...
scripts/node-addon-api/src/non-streaming-asr.cc
查看文件 @
8af2af8
...
...
@@ -74,7 +74,8 @@ static SherpaOnnxOfflineWhisperModelConfig GetOfflineWhisperModelConfig(
SHERPA_ONNX_ASSIGN_ATTR_STR
(
encoder
,
encoder
);
SHERPA_ONNX_ASSIGN_ATTR_STR
(
decoder
,
decoder
);
SHERPA_ONNX_ASSIGN_ATTR_STR
(
language
,
language
);
SHERPA_ONNX_ASSIGN_ATTR_STR
(
task
,
languagek
);
SHERPA_ONNX_ASSIGN_ATTR_STR
(
task
,
task
);
SHERPA_ONNX_ASSIGN_ATTR_INT32
(
tail_paddings
,
tailPaddings
);
return
c
;
}
...
...
sherpa-onnx/c-api/c-api.cc
查看文件 @
8af2af8
...
...
@@ -341,6 +341,9 @@ SherpaOnnxOfflineRecognizer *CreateOfflineRecognizer(
recognizer_config
.
model_config
.
whisper
.
task
=
"transcribe"
;
}
recognizer_config
.
model_config
.
whisper
.
tail_paddings
=
SHERPA_ONNX_OR
(
config
->
model_config
.
whisper
.
tail_paddings
,
-
1
);
recognizer_config
.
model_config
.
tdnn
.
model
=
SHERPA_ONNX_OR
(
config
->
model_config
.
tdnn
.
model
,
""
);
...
...
sherpa-onnx/c-api/c-api.h
查看文件 @
8af2af8
...
...
@@ -359,6 +359,7 @@ SHERPA_ONNX_API typedef struct SherpaOnnxOfflineWhisperModelConfig {
const
char
*
decoder
;
const
char
*
language
;
const
char
*
task
;
int32_t
tail_paddings
;
}
SherpaOnnxOfflineWhisperModelConfig
;
SHERPA_ONNX_API
typedef
struct
SherpaOnnxOfflineTdnnModelConfig
{
...
...
swift-api-examples/SherpaOnnx.swift
查看文件 @
8af2af8
...
...
@@ -314,13 +314,15 @@ func sherpaOnnxOfflineWhisperModelConfig(
encoder
:
String
=
""
,
decoder
:
String
=
""
,
language
:
String
=
""
,
task
:
String
=
"transcribe"
task
:
String
=
"transcribe"
,
tailPaddings
:
Int
=
-
1
)
->
SherpaOnnxOfflineWhisperModelConfig
{
return
SherpaOnnxOfflineWhisperModelConfig
(
encoder
:
toCPointer
(
encoder
),
decoder
:
toCPointer
(
decoder
),
language
:
toCPointer
(
language
),
task
:
toCPointer
(
task
)
task
:
toCPointer
(
task
),
tail_paddings
:
Int32
(
tailPaddings
)
)
}
...
...
wasm/asr/sherpa-onnx-asr.js
查看文件 @
8af2af8
...
...
@@ -453,6 +453,8 @@ function initSherpaOnnxOfflineWhisperModelConfig(config, Module) {
Module
.
setValue
(
ptr
+
12
,
buffer
+
offset
,
'i8*'
);
offset
+=
taskLen
;
Module
.
setValue
(
ptr
+
16
,
config
.
tailPaddings
||
-
1
,
'i32'
);
return
{
buffer
:
buffer
,
ptr
:
ptr
,
len
:
len
,
}
...
...
wasm/nodejs/sherpa-onnx-wasm-nodejs.cc
查看文件 @
8af2af8
...
...
@@ -14,7 +14,7 @@ static_assert(sizeof(SherpaOnnxOfflineTransducerModelConfig) == 3 * 4, "");
static_assert
(
sizeof
(
SherpaOnnxOfflineParaformerModelConfig
)
==
4
,
""
);
static_assert
(
sizeof
(
SherpaOnnxOfflineNemoEncDecCtcModelConfig
)
==
4
,
""
);
static_assert
(
sizeof
(
SherpaOnnxOfflineWhisperModelConfig
)
==
4
*
4
,
""
);
static_assert
(
sizeof
(
SherpaOnnxOfflineWhisperModelConfig
)
==
5
*
4
,
""
);
static_assert
(
sizeof
(
SherpaOnnxOfflineTdnnModelConfig
)
==
4
,
""
);
static_assert
(
sizeof
(
SherpaOnnxOfflineLMConfig
)
==
2
*
4
,
""
);
...
...
@@ -80,6 +80,7 @@ void PrintOfflineRecognizerConfig(SherpaOnnxOfflineRecognizerConfig *config) {
fprintf
(
stdout
,
"decoder: %s
\n
"
,
whisper
->
decoder
);
fprintf
(
stdout
,
"language: %s
\n
"
,
whisper
->
language
);
fprintf
(
stdout
,
"task: %s
\n
"
,
whisper
->
task
);
fprintf
(
stdout
,
"tail_paddings: %d
\n
"
,
whisper
->
tail_paddings
);
fprintf
(
stdout
,
"----------offline tdnn model config----------
\n
"
);
fprintf
(
stdout
,
"model: %s
\n
"
,
tdnn
->
model
);
...
...
请
注册
或
登录
后发表评论