Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
DeepSpeech
提交
532b6204
D
DeepSpeech
项目概览
PaddlePaddle
/
DeepSpeech
大约 2 年 前同步成功
通知
210
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看板
提交
532b6204
编写于
10月 09, 2022
作者:
H
Hui Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor speechx cmake
上级
c9b0c96b
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
50 addition
and
51 deletion
+50
-51
speechx/CMakeLists.txt
speechx/CMakeLists.txt
+1
-43
speechx/build.sh
speechx/build.sh
+3
-7
speechx/cmake/absl.cmake
speechx/cmake/absl.cmake
+0
-0
speechx/cmake/boost.cmake
speechx/cmake/boost.cmake
+0
-0
speechx/cmake/eigen.cmake
speechx/cmake/eigen.cmake
+0
-0
speechx/cmake/gflags.cmake
speechx/cmake/gflags.cmake
+0
-0
speechx/cmake/glog.cmake
speechx/cmake/glog.cmake
+0
-0
speechx/cmake/gtest.cmake
speechx/cmake/gtest.cmake
+0
-0
speechx/cmake/kenlm.cmake
speechx/cmake/kenlm.cmake
+0
-0
speechx/cmake/libsndfile.cmake
speechx/cmake/libsndfile.cmake
+0
-0
speechx/cmake/openblas.cmake
speechx/cmake/openblas.cmake
+4
-1
speechx/cmake/openfst.cmake
speechx/cmake/openfst.cmake
+0
-0
speechx/cmake/paddleinference.cmake
speechx/cmake/paddleinference.cmake
+42
-0
未找到文件。
speechx/CMakeLists.txt
浏览文件 @
532b6204
...
@@ -13,7 +13,6 @@ set(CMAKE_CXX_STANDARD 14)
...
@@ -13,7 +13,6 @@ set(CMAKE_CXX_STANDARD 14)
set
(
speechx_cmake_dir
${
PROJECT_SOURCE_DIR
}
/cmake
)
set
(
speechx_cmake_dir
${
PROJECT_SOURCE_DIR
}
/cmake
)
# Modules
# Modules
list
(
APPEND CMAKE_MODULE_PATH
${
speechx_cmake_dir
}
/external
)
list
(
APPEND CMAKE_MODULE_PATH
${
speechx_cmake_dir
}
)
list
(
APPEND CMAKE_MODULE_PATH
${
speechx_cmake_dir
}
)
include
(
FetchContent
)
include
(
FetchContent
)
include
(
ExternalProject
)
include
(
ExternalProject
)
...
@@ -83,48 +82,7 @@ add_dependencies(openfst gflags glog)
...
@@ -83,48 +82,7 @@ add_dependencies(openfst gflags glog)
# paddle lib
# paddle lib
set
(
paddle_SOURCE_DIR
${
fc_patch
}
/paddle-lib
)
include
(
paddleinference
)
set
(
paddle_PREFIX_DIR
${
fc_patch
}
/paddle-lib-prefix
)
ExternalProject_Add
(
paddle
URL https://paddle-inference-lib.bj.bcebos.com/2.2.2/cxx_c/Linux/CPU/gcc8.2_avx_mkl/paddle_inference.tgz
URL_HASH SHA256=7c6399e778c6554a929b5a39ba2175e702e115145e8fa690d2af974101d98873
PREFIX
${
paddle_PREFIX_DIR
}
SOURCE_DIR
${
paddle_SOURCE_DIR
}
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
""
)
set
(
PADDLE_LIB
${
fc_patch
}
/paddle-lib
)
include_directories
(
"
${
PADDLE_LIB
}
/paddle/include"
)
set
(
PADDLE_LIB_THIRD_PARTY_PATH
"
${
PADDLE_LIB
}
/third_party/install/"
)
include_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
protobuf/include"
)
include_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
xxhash/include"
)
include_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
cryptopp/include"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
protobuf/lib"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
xxhash/lib"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
cryptopp/lib"
)
link_directories
(
"
${
PADDLE_LIB
}
/paddle/lib"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
mklml/lib"
)
##paddle with mkl
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp"
)
set
(
MATH_LIB_PATH
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
mklml"
)
include_directories
(
"
${
MATH_LIB_PATH
}
/include"
)
set
(
MATH_LIB
${
MATH_LIB_PATH
}
/lib/libmklml_intel
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
MATH_LIB_PATH
}
/lib/libiomp5
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
)
set
(
MKLDNN_PATH
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
mkldnn"
)
include_directories
(
"
${
MKLDNN_PATH
}
/include"
)
set
(
MKLDNN_LIB
${
MKLDNN_PATH
}
/lib/libmkldnn.so.0
)
set
(
EXTERNAL_LIB
"-lrt -ldl -lpthread"
)
set
(
DEPS
${
PADDLE_LIB
}
/paddle/lib/libpaddle_inference
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
)
set
(
DEPS
${
DEPS
}
${
MATH_LIB
}
${
MKLDNN_LIB
}
glog gflags protobuf xxhash cryptopp
${
EXTERNAL_LIB
}
)
###############################################################################
###############################################################################
...
...
speechx/build.sh
浏览文件 @
532b6204
#!/usr/bin/env bash
#!/usr/bin/env bash
set
-xe
# the build script had verified in the paddlepaddle docker image.
# the build script had verified in the paddlepaddle docker image.
# please follow the instruction below to install PaddlePaddle image.
# please follow the instruction below to install PaddlePaddle image.
...
@@ -17,11 +18,6 @@ fi
...
@@ -17,11 +18,6 @@ fi
#rm -rf build
#rm -rf build
mkdir
-p
build
mkdir
-p
build
cd
build
cmake ..
-DBOOST_ROOT
:STRING
=
${
boost_SOURCE_DIR
}
cmake
-B
build
-DBOOST_ROOT
:STRING
=
${
boost_SOURCE_DIR
}
#cmake ..
cmake
--build
build
make
-j
cd
-
speechx/cmake/
external/
absl.cmake
→
speechx/cmake/absl.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/
external/
boost.cmake
→
speechx/cmake/boost.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/e
xternal/e
igen.cmake
→
speechx/cmake/eigen.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/
external/
gflags.cmake
→
speechx/cmake/gflags.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/
external/
glog.cmake
→
speechx/cmake/glog.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/
external/
gtest.cmake
→
speechx/cmake/gtest.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/
external/
kenlm.cmake
→
speechx/cmake/kenlm.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/
external/
libsndfile.cmake
→
speechx/cmake/libsndfile.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/
external/
openblas.cmake
→
speechx/cmake/openblas.cmake
浏览文件 @
532b6204
...
@@ -43,6 +43,7 @@ ExternalProject_Add(
...
@@ -43,6 +43,7 @@ ExternalProject_Add(
# https://cmake.org/cmake/help/latest/module/ExternalProject.html?highlight=externalproject_get_property#external-project-definition
# https://cmake.org/cmake/help/latest/module/ExternalProject.html?highlight=externalproject_get_property#external-project-definition
ExternalProject_Get_Property
(
OPENBLAS INSTALL_DIR
)
ExternalProject_Get_Property
(
OPENBLAS INSTALL_DIR
)
message
(
STATUS
"OPENBLAS install dir:
${
INSTALL_DIR
}
"
)
set
(
OpenBLAS_INSTALL_PREFIX
${
INSTALL_DIR
}
)
set
(
OpenBLAS_INSTALL_PREFIX
${
INSTALL_DIR
}
)
add_library
(
openblas STATIC IMPORTED
)
add_library
(
openblas STATIC IMPORTED
)
add_dependencies
(
openblas OPENBLAS
)
add_dependencies
(
openblas OPENBLAS
)
...
@@ -55,4 +56,6 @@ set_target_properties(openblas PROPERTIES IMPORTED_LOCATION ${OpenBLAS_INSTALL_P
...
@@ -55,4 +56,6 @@ set_target_properties(openblas PROPERTIES IMPORTED_LOCATION ${OpenBLAS_INSTALL_P
# ${CMAKE_INSTALL_LIBDIR} lib
# ${CMAKE_INSTALL_LIBDIR} lib
# ${CMAKE_INSTALL_INCLUDEDIR} include
# ${CMAKE_INSTALL_INCLUDEDIR} include
link_directories
(
${
OpenBLAS_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_LIBDIR
}
)
link_directories
(
${
OpenBLAS_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_LIBDIR
}
)
include_directories
(
${
OpenBLAS_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_INCLUDEDIR
}
)
# include_directories(${OpenBLAS_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
\ No newline at end of file
# fix for can not find `cblas.h`
include_directories
(
${
OpenBLAS_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_INCLUDEDIR
}
/openblas
)
\ No newline at end of file
speechx/cmake/
external/
openfst.cmake
→
speechx/cmake/openfst.cmake
浏览文件 @
532b6204
文件已移动
speechx/cmake/paddleinference.cmake
0 → 100644
浏览文件 @
532b6204
set
(
paddle_SOURCE_DIR
${
fc_patch
}
/paddle-lib
)
set
(
paddle_PREFIX_DIR
${
fc_patch
}
/paddle-lib-prefix
)
ExternalProject_Add
(
paddle
URL https://paddle-inference-lib.bj.bcebos.com/2.2.2/cxx_c/Linux/CPU/gcc8.2_avx_mkl/paddle_inference.tgz
URL_HASH SHA256=7c6399e778c6554a929b5a39ba2175e702e115145e8fa690d2af974101d98873
PREFIX
${
paddle_PREFIX_DIR
}
SOURCE_DIR
${
paddle_SOURCE_DIR
}
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
""
)
set
(
PADDLE_LIB
${
fc_patch
}
/paddle-lib
)
include_directories
(
"
${
PADDLE_LIB
}
/paddle/include"
)
set
(
PADDLE_LIB_THIRD_PARTY_PATH
"
${
PADDLE_LIB
}
/third_party/install/"
)
include_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
protobuf/include"
)
include_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
xxhash/include"
)
include_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
cryptopp/include"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
protobuf/lib"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
xxhash/lib"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
cryptopp/lib"
)
link_directories
(
"
${
PADDLE_LIB
}
/paddle/lib"
)
link_directories
(
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
mklml/lib"
)
##paddle with mkl
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp"
)
set
(
MATH_LIB_PATH
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
mklml"
)
include_directories
(
"
${
MATH_LIB_PATH
}
/include"
)
set
(
MATH_LIB
${
MATH_LIB_PATH
}
/lib/libmklml_intel
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
MATH_LIB_PATH
}
/lib/libiomp5
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
)
set
(
MKLDNN_PATH
"
${
PADDLE_LIB_THIRD_PARTY_PATH
}
mkldnn"
)
include_directories
(
"
${
MKLDNN_PATH
}
/include"
)
set
(
MKLDNN_LIB
${
MKLDNN_PATH
}
/lib/libmkldnn.so.0
)
set
(
EXTERNAL_LIB
"-lrt -ldl -lpthread"
)
# global vars
set
(
DEPS
${
PADDLE_LIB
}
/paddle/lib/libpaddle_inference
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
CACHE FORCE
"DEPS"
)
set
(
DEPS
${
DEPS
}
${
MATH_LIB
}
${
MKLDNN_LIB
}
glog gflags protobuf xxhash cryptopp
${
EXTERNAL_LIB
}
CACHE FORCE
"DEPS"
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录