Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
DeepSpeech
提交
0d76ff5c
D
DeepSpeech
项目概览
PaddlePaddle
/
DeepSpeech
9 个月 前同步成功
通知
200
Star
8425
Fork
1598
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
245
列表
看板
标记
里程碑
合并请求
3
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
DeepSpeech
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
245
Issue
245
列表
看板
标记
里程碑
合并请求
3
合并请求
3
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
0d76ff5c
编写于
11月 25, 2022
作者:
Y
YangZhou
提交者:
GitHub
11月 25, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add version && link fortran.dylib in mac (#2684)
* add version && link fortran.dylib in mac
上级
0ffcd477
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
13 deletion
+25
-13
audio/CMakeLists.txt
audio/CMakeLists.txt
+1
-4
audio/cmake/external/pybind.cmake
audio/cmake/external/pybind.cmake
+4
-1
audio/paddleaudio/third_party/kaldi/CMakeLists.txt
audio/paddleaudio/third_party/kaldi/CMakeLists.txt
+2
-2
audio/setup.py
audio/setup.py
+18
-6
未找到文件。
audio/CMakeLists.txt
浏览文件 @
0d76ff5c
cmake_minimum_required
(
VERSION 3.1
8
FATAL_ERROR
)
cmake_minimum_required
(
VERSION 3.1
6
FATAL_ERROR
)
# Use compiler ID "AppleClang" instead of "Clang" for XCode.
# Not setting this sometimes makes XCode C compiler gets detected as "Clang",
...
...
@@ -50,9 +50,6 @@ set(THIRD_PARTY_PATH ${fc_patch})
include
(
openblas
)
if
(
NOT PY_VERSION
)
set
(
PY_VERSION 3.7
)
endif
()
set
(
PYBIND11_PYTHON_VERSION
${
PY_VERSION
}
)
include
(
pybind
)
...
...
audio/cmake/external/pybind.cmake
浏览文件 @
0d76ff5c
include
(
FetchContent
)
include
(
ExternalProject
)
#the pybind11 is from:https://github.com/pybind/pybind11
# Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>, All rights reserved.
FetchContent_Declare
(
pybind
URL https://
github.com/pybind/pybind11/archive/refs/tags
/v2.10.0.zip
URL https://
paddleaudio.bj.bcebos.com/build
/v2.10.0.zip
URL_HASH SHA256=225df6e6dea7cea7c5754d4ed954e9ca7c43947b849b3795f87cb56437f1bd19
)
FetchContent_MakeAvailable
(
pybind
)
...
...
audio/paddleaudio/third_party/kaldi/CMakeLists.txt
浏览文件 @
0d76ff5c
...
...
@@ -43,7 +43,7 @@ add_library(kaldi-matrix STATIC
target_include_directories
(
kaldi-matrix PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
if
(
NOT MSVC
)
target_link_libraries
(
kaldi-matrix PUBLIC kaldi-base libopenblas
${
GFORTRAN_LIBRARIES_DIR
}
/libgfortran.a
)
target_link_libraries
(
kaldi-matrix PUBLIC kaldi-base libopenblas
${
LIBGFORTRAN_LIBRARIES
}
)
else
()
target_link_libraries
(
kaldi-matrix PUBLIC kaldi-base openblas
)
endif
()
...
...
@@ -108,7 +108,7 @@ add_dependencies(libkaldi kaldi-base kaldi-matrix kaldi-util kaldi-feat-common k
target_include_directories
(
libkaldi INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
if
(
APPLE
)
target_link_libraries
(
libkaldi INTERFACE
${
KALDI_LIBRARIES
}
libopenblas
${
GFORTRAN_LIBRARIES_DIR
}
/libgfortran.a
)
target_link_libraries
(
libkaldi INTERFACE
${
KALDI_LIBRARIES
}
libopenblas
${
LIBGFORTRAN_LIBRARIES
}
)
elseif
(
MSVC
)
target_link_libraries
(
libkaldi INTERFACE kaldi-base kaldi-matrix kaldi-util kaldi-feat-common kaldi-mfcc kaldi-fbank openblas
)
else
()
...
...
audio/setup.py
浏览文件 @
0d76ff5c
...
...
@@ -44,7 +44,7 @@ base = [
"colorlog"
,
"pathos == 0.2.8"
,
"pybind11"
,
"
Ninja
"
,
"
parameterized
"
,
"tqdm"
]
...
...
@@ -182,10 +182,18 @@ def _get_version(sha):
def
_make_version_file
(
version
,
sha
):
sha
=
"Unknown"
if
sha
is
None
else
sha
version_path
=
ROOT_DIR
/
"paddleaudio"
/
"
version
.py"
with
open
(
version_path
,
"
w
"
)
as
f
:
version_path
=
ROOT_DIR
/
"paddleaudio"
/
"
__init__
.py"
with
open
(
version_path
,
"
a
"
)
as
f
:
f
.
write
(
f
"__version__ = '
{
version
}
'
\n
"
)
f
.
write
(
f
"__commit__ = '
{
sha
}
'
\n
"
)
def
_rm_version
():
file_
=
ROOT_DIR
/
"paddleaudio"
/
"__init__.py"
with
open
(
file_
,
"r"
)
as
f
:
lines
=
f
.
readlines
()
with
open
(
file_
,
"w"
)
as
f
:
for
line
in
lines
:
if
"__version__"
not
in
line
:
f
.
write
(
line
)
################################# Steup ##################################
...
...
@@ -218,6 +226,8 @@ def main():
print
(
"-- Git tag:"
,
tag
)
version
=
_get_version
(
sha
)
print
(
"-- Building version"
,
version
)
_rm_version
()
_make_version_file
(
version
,
sha
)
setup_info
=
dict
(
...
...
@@ -233,7 +243,7 @@ def main():
"audio process"
"paddlepaddle"
,
],
python_requires
=
'>=3.
7
'
,
python_requires
=
'>=3.
6
'
,
install_requires
=
requirements
[
"install"
],
extras_require
=
{
'develop'
:
...
...
@@ -260,14 +270,16 @@ def main():
'License :: OSI Approved :: Apache Software License'
,
'Programming Language :: Python'
,
'Programming Language :: Python :: 3'
,
'Programming Language :: Python :: 3.6'
,
'Programming Language :: Python :: 3.7'
,
'Programming Language :: Python :: 3.8'
,
'Programming Language :: Python :: 3.9'
,
'Programming Language :: Python :: 3.10'
,
],
)
setup
(
**
setup_info
)
_rm_version
()
if
__name__
==
'__main__'
:
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录