Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
csdn_franckjun
Paddle
提交
aee08578
P
Paddle
项目概览
csdn_franckjun
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aee08578
编写于
12月 28, 2016
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean Travis ci and fix bug
上级
2ffb6dbb
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
30 addition
and
77 deletion
+30
-77
.gitmodules
.gitmodules
+0
-3
.pre-commit-config.yaml
.pre-commit-config.yaml
+2
-2
.travis.yml
.travis.yml
+0
-6
CMakeLists.txt
CMakeLists.txt
+0
-1
cmake/external/gflags.cmake
cmake/external/gflags.cmake
+1
-0
cmake/external/glog.cmake
cmake/external/glog.cmake
+1
-0
cmake/external/gtest.cmake
cmake/external/gtest.cmake
+1
-0
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+13
-10
cmake/external/warpctc.cmake
cmake/external/warpctc.cmake
+1
-0
paddle/api/paddle_api_config.py.in
paddle/api/paddle_api_config.py.in
+5
-5
paddle/api/paddle_ld_flags.py
paddle/api/paddle_ld_flags.py
+3
-3
paddle/cuda/CMakeLists.txt
paddle/cuda/CMakeLists.txt
+1
-1
paddle/gserver/tests/CMakeLists.txt
paddle/gserver/tests/CMakeLists.txt
+1
-1
paddle/scripts/travis/before_install.linux.sh
paddle/scripts/travis/before_install.linux.sh
+0
-18
paddle/scripts/travis/before_install.osx.sh
paddle/scripts/travis/before_install.osx.sh
+1
-7
paddle/scripts/travis/build_submodules.sh
paddle/scripts/travis/build_submodules.sh
+0
-20
未找到文件。
.gitmodules
已删除
100644 → 0
浏览文件 @
2ffb6dbb
[submodule "warp-ctc"]
path = warp-ctc
url = https://github.com/baidu-research/warp-ctc.git
.pre-commit-config.yaml
浏览文件 @
aee08578
...
...
@@ -2,7 +2,7 @@
sha
:
c25201a00e6b0514370501050cf2a8538ac12270
hooks
:
-
id
:
remove-crlf
files
:
(?!.*
warp-ctc
)^.*$
files
:
(?!.*
third_party
)^.*$
-
repo
:
https://github.com/reyoung/mirrors-yapf.git
sha
:
v0.13.2
hooks
:
...
...
@@ -15,7 +15,7 @@
-
id
:
check-merge-conflict
-
id
:
check-symlinks
-
id
:
detect-private-key
files
:
(?!.*
warp-ctc
)^.*$
files
:
(?!.*
third_party
)^.*$
-
id
:
end-of-file-fixer
-
repo
:
https://github.com/PaddlePaddle/clang-format-pre-commit-hook.git
sha
:
28c0ea8a67a3e2dbbf4822ef44e85b63a0080a29
...
...
.travis.yml
浏览文件 @
aee08578
...
...
@@ -24,16 +24,11 @@ addons:
-
wget
-
git
-
build-essential
-
libatlas-base-dev
-
python
-
python-pip
-
python2.7-dev
-
m4
-
python-numpy
-
python-wheel
-
libgoogle-glog-dev
-
libgflags-dev
-
libgtest-dev
-
curl
-
lcov
-
graphviz
...
...
@@ -53,7 +48,6 @@ before_install:
fi
fi
fi
-
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo paddle/scripts/travis/before_install.linux.sh; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then paddle/scripts/travis/before_install.osx.sh; fi
-
if [[ "$JOB" == "PRE_COMMIT" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
-
pip install wheel protobuf sphinx recommonmark virtualenv numpy sphinx_rtd_theme pre-commit requests==2.9.2 LinkChecker
...
...
CMakeLists.txt
浏览文件 @
aee08578
...
...
@@ -65,7 +65,6 @@ set(EXTERNAL_LIBS
${
GLOG_LIBRARIES
}
${
CBLAS_LIBRARIES
}
${
PROTOBUF_LIBRARIES
}
${
WARPCTC_LIBRARIES
}
${
ZLIB_LIBRARIES
}
)
...
...
cmake/external/gflags.cmake
浏览文件 @
aee08578
...
...
@@ -22,6 +22,7 @@ ExternalProject_Add(
GIT_REPOSITORY
"https://github.com/gflags/gflags.git"
PREFIX
${
GFLAGS_SOURCES_DIR
}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
GFLAGS_INSTALL_DIR
}
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON
CMAKE_ARGS -DBUILD_TESTING=OFF
LOG_DOWNLOAD =ON
UPDATE_COMMAND
""
...
...
cmake/external/glog.cmake
浏览文件 @
aee08578
...
...
@@ -22,6 +22,7 @@ ExternalProject_Add(
GIT_REPOSITORY
"https://github.com/google/glog.git"
PREFIX
${
GLOG_SOURCES_DIR
}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
GLOG_INSTALL_DIR
}
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON
CMAKE_ARGS -DWITH_GFLAGS=OFF
CMAKE_ARGS -DBUILD_TESTING=OFF
LOG_DOWNLOAD =ON
...
...
cmake/external/gtest.cmake
浏览文件 @
aee08578
...
...
@@ -23,6 +23,7 @@ ExternalProject_Add(
GIT_TAG
"release-1.8.0"
PREFIX
${
GTEST_SOURCES_DIR
}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
${
GTEST_INSTALL_DIR
}
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON
CMAKE_ARGS -DBUILD_GMOCK=ON
CMAKE_ARGS -Dgtest_disable_pthreads=ON
CMAKE_ARGS -Dgtest_force_shared_crt=ON
...
...
cmake/external/protobuf.cmake
浏览文件 @
aee08578
...
...
@@ -36,22 +36,25 @@ SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_INSTALL_DIR}/include" CACHE PATH "protobuf
INCLUDE_DIRECTORIES
(
${
PROTOBUF_INCLUDE_DIR
}
)
IF
(
WIN32
)
SET
(
PROTOBUF_LIBRARIES
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotobuf-lite.lib"
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotobuf.lib"
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotoc.lib"
CACHE FILEPATH
"protobuf libraries."
FORCE
)
SET
(
PROTOBUF_LITE_LIBRARY
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotobuf-lite.lib"
CACHE FILEPATH
"protobuf lite library."
FORCE
)
SET
(
PROTOBUF_LIBRARY
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotobuf.lib"
CACHE FILEPATH
"protobuf library."
FORCE
)
SET
(
PROTOBUF_PROTOC_LIBRARY
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotoc.lib"
CACHE FILEPATH
"protoc library."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc.exe"
CACHE FILEPATH
"protobuf executable."
FORCE
)
ELSE
(
WIN32
)
FIND_PATH
(
PROTOBUF_LIBS_DIR libprotoc.a
PATHS
${
PROTOBUF_INSTALL_DIR
}
/lib64
${
PROTOBUF_INSTALL_DIR
}
/lib
${
PROTOBUF_INSTALL_DIR
}
/lib64
NO_DEFAULT_PATH
)
SET
(
PROTOBUF_LIBRARIES
"
${
PROTOBUF_LIBS_DIR
}
/libprotobuf-lite.a"
"
${
PROTOBUF_LIBS_DIR
}
/libprotobuf.a"
"
${
PROTOBUF_LIBS_DIR
}
/libprotoc.a"
CACHE FILEPATH
"protobuf libraries."
FORCE
)
SET
(
PROTOBUF_LITE_LIBRARY
"
${
PROTOBUF_LIBS_DIR
}
/libprotobuf-lite.a"
CACHE FILEPATH
"protobuf lite library."
FORCE
)
SET
(
PROTOBUF_LIBRARY
"
${
PROTOBUF_LIBS_DIR
}
/libprotobuf.a"
CACHE FILEPATH
"protobuf library."
FORCE
)
SET
(
PROTOBUF_PROTOC_LIBRARY
"
${
PROTOBUF_LIBS_DIR
}
/libprotoc.a"
CACHE FILEPATH
"protoc library."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc"
CACHE FILEPATH
"protobuf executable."
FORCE
)
ENDIF
(
WIN32
)
...
...
cmake/external/warpctc.cmake
浏览文件 @
aee08578
...
...
@@ -36,6 +36,7 @@ ExternalProject_Add(
SET
(
WARPCTC_INCLUDE_DIR
"
${
WARPCTC_INSTALL_DIR
}
/include"
CACHE PATH
"Warp-ctc Directory"
FORCE
)
INCLUDE_DIRECTORIES
(
${
WARPCTC_INCLUDE_DIR
}
)
SET
(
WARPCTC_LIB_DIR
"
${
WARPCTC_INSTALL_DIR
}
/lib"
CACHE PATH
"Warp-ctc Library Directory"
FORCE
)
IF
(
WIN32
)
SET
(
WARPCTC_LIBRARIES
"
${
WARPCTC_INSTALL_DIR
}
/lib/warpctc.dll"
CACHE FILEPATH
"Warp-ctc Library"
FORCE
)
...
...
paddle/api/paddle_api_config.py.in
浏览文件 @
aee08578
PADDLE_BUILD_DIR="@CMAKE_CURRENT_BINARY_DIR@/../"
WITH_GPU="@WITH_GPU@"
PROTOBUF_LIB="@PROTOBUF_LIBRARY@"
ZLIB_LIB="@ZLIB_LIBRARIES@"
PROTOBUF_LIB
RARY
="@PROTOBUF_LIBRARY@"
ZLIB_LIB
RARIES
="@ZLIB_LIBRARIES@"
CMAKE_THREAD_LIB="@CMAKE_THREAD_LIBS_INIT@"
CMAKE_DL_LIBS="@CMAKE_DL_LIBS@"
WITH_PYTHON="@WITH_PYTHON@"
PYTHON_LIBRARIES="@PYTHON_LIBRARIES@"
LIBGLOG_LIBRARY="@LIBGLOG_LIBRARY
@"
GLOG_LIBRARIES="@GLOG_LIBRARIES
@"
GFLAGS_LIBRARIES="@GFLAGS_LIBRARIES@"
GFLAGS_LOCATION="@GFLAGS_LOCATION@"
CBLAS_LIBRARIES="@CBLAS_LIBS@"
CBLAS_LIBRARIES="@CBLAS_LIB
RARIE
S@"
CUDA_LIBRARIES="@CUDA_
LIBRARIES
@"
CUDA_LIBRARIES="@CUDA_
cudart_shared_LIBRARY
@"
WITH_COVERALLS="@ON_COVERALLS@"
paddle/api/paddle_ld_flags.py
浏览文件 @
aee08578
...
...
@@ -40,14 +40,14 @@ try:
self
.
paddle_build_dir
=
PADDLE_BUILD_DIR
self
.
paddle_build_dir
=
os
.
path
.
abspath
(
self
.
paddle_build_dir
)
self
.
with_gpu
=
PaddleLDFlag
.
cmake_bool
(
WITH_GPU
)
self
.
protolib
=
PROTOBUF_LIB
self
.
zlib
=
ZLIB_LIB
self
.
protolib
=
PROTOBUF_LIB
RARY
self
.
zlib
=
ZLIB_LIB
RARIES
self
.
thread
=
CMAKE_THREAD_LIB
self
.
dl_libs
=
CMAKE_DL_LIBS
self
.
with_python
=
PaddleLDFlag
.
cmake_bool
(
WITH_PYTHON
)
self
.
python_libs
=
PYTHON_LIBRARIES
self
.
glog_libs
=
LIBGLOG_LIBRARY
self
.
glog_libs
=
GLOG_LIBRARIES
self
.
with_coverage
=
PaddleLDFlag
.
cmake_bool
(
WITH_COVERALLS
)
self
.
gflags_libs
=
GFLAGS_LIBRARIES
...
...
paddle/cuda/CMakeLists.txt
浏览文件 @
aee08578
...
...
@@ -88,7 +88,7 @@ else()
${
CUDA_CXX_SOURCES
}
)
endif
()
add_dependencies
(
paddle_cuda
${
external_project_dependencies
}
)
add_dependencies
(
paddle_cuda
warpctc
)
add_style_check_target
(
paddle_cuda
${
CUDA_SOURCES
}
...
...
paddle/gserver/tests/CMakeLists.txt
浏览文件 @
aee08578
...
...
@@ -92,7 +92,7 @@ if(NOT WITH_DOUBLE)
TestUtil.cpp
)
add_test
(
NAME test_WarpCTCLayer
COMMAND
${
CMAKE_CURRENT_BINARY_DIR
}
/test_WarpCTCLayer --warpctc_dir=
${
PROJ_ROOT
}
/warp-ctc/build
COMMAND
${
CMAKE_CURRENT_BINARY_DIR
}
/test_WarpCTCLayer --warpctc_dir=
${
WARPCTC_LIB_DIR
}
WORKING_DIRECTORY
${
PROJ_ROOT
}
/paddle
)
endif
()
...
...
paddle/scripts/travis/before_install.linux.sh
已删除
100755 → 0
浏览文件 @
2ffb6dbb
#!/bin/bash
set
-e
pip
install
protobuf
cd
/tmp
wget https://github.com/google/protobuf/archive/v3.0.2.tar.gz
-O
protobuf.tar.gz
tar
xf protobuf.tar.gz
cd
protobuf
*
./autogen.sh
./configure
--prefix
=
/usr/
make
-j
2
install
cd
..
rm
-rf
protobuf
*
pushd
/usr/src/gtest
cmake
.
make
sudo cp
*
.a /usr/lib
popd
paddle/scripts/travis/before_install.osx.sh
浏览文件 @
aee08578
...
...
@@ -3,10 +3,4 @@ brew update
brew tap homebrew/science
brew
install
python
sudo
pip
install
--upgrade
protobuf
brew
install
cmake python glog gflags openblas wget md5sha1sum protobuf
wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz
-O
gtest.tar.gz
tar
xf gtest.tar.gz
cd
googletest-release-1.8.0/
cmake
.
make
install
brew
install
cmake python wget md5sha1sum
paddle/scripts/travis/build_submodules.sh
已删除
100755 → 0
浏览文件 @
2ffb6dbb
#!/bin/bash
set
-e
WORK_DIR
=
$PWD
PROJ_ROOT
=
$(
git rev-parse
--show-cdup
)
SUBMODULES
=
$(
grep
path
${
PROJ_ROOT
}
.gitmodules |
sed
's/^.*path = //'
)
for
module
in
$SUBMODULES
do
case
$module
in
"warp-ctc"
)
if
[
-d
${
PROJ_ROOT
}
warp-ctc/build
]
;
then
rm
-rf
${
PROJ_ROOT
}
warp-ctc/build
fi
mkdir
${
PROJ_ROOT
}
warp-ctc/build
cd
${
PROJ_ROOT
}
warp-ctc/build
cmake ..
;
make
;;
esac
done
cd
$WORK_DIR
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录