Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
cb0a1e2f
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
cb0a1e2f
编写于
1月 09, 2017
作者:
G
gangliao
提交者:
GitHub
1月 09, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1098 from reyoung/feature/make_third_party_directory_configurable
Add THIRD_PARTY_PATH
上级
748229aa
f30c25fe
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
26 addition
and
22 deletion
+26
-22
CMakeLists.txt
CMakeLists.txt
+10
-0
cmake/external/glog.cmake
cmake/external/glog.cmake
+2
-2
cmake/external/gtest.cmake
cmake/external/gtest.cmake
+2
-2
cmake/external/openblas.cmake
cmake/external/openblas.cmake
+2
-2
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+2
-2
cmake/external/python.cmake
cmake/external/python.cmake
+2
-2
cmake/external/swig.cmake
cmake/external/swig.cmake
+2
-2
cmake/external/warpctc.cmake
cmake/external/warpctc.cmake
+2
-2
cmake/external/zlib.cmake
cmake/external/zlib.cmake
+2
-2
cmake/flags.cmake
cmake/flags.cmake
+0
-6
未找到文件。
CMakeLists.txt
浏览文件 @
cb0a1e2f
...
@@ -43,6 +43,16 @@ option(WITH_DOC "Compile PaddlePaddle with documentation" OFF)
...
@@ -43,6 +43,16 @@ option(WITH_DOC "Compile PaddlePaddle with documentation" OFF)
option
(
ON_COVERALLS
"Compile PaddlePaddle with code coverage"
OFF
)
option
(
ON_COVERALLS
"Compile PaddlePaddle with code coverage"
OFF
)
option
(
COVERALLS_UPLOAD
"Package code coverage data to coveralls"
OFF
)
option
(
COVERALLS_UPLOAD
"Package code coverage data to coveralls"
OFF
)
option
(
ON_TRAVIS
"Exclude special unit test on Travis CI"
OFF
)
option
(
ON_TRAVIS
"Exclude special unit test on Travis CI"
OFF
)
# CMAKE_BUILD_TYPE
if
(
NOT CMAKE_BUILD_TYPE
)
set
(
CMAKE_BUILD_TYPE
"RelWithDebInfo"
CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel"
FORCE
)
endif
()
set
(
THIRD_PARTY_PATH
"
${
PROJ_ROOT
}
/third_party"
CACHE STRING
"A path setting third party libraries download & build directories."
)
########################################################################################
########################################################################################
include
(
external/zlib
)
# download, build, install zlib
include
(
external/zlib
)
# download, build, install zlib
...
...
cmake/external/glog.cmake
浏览文件 @
cb0a1e2f
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
SET
(
GLOG_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/glog
)
SET
(
GLOG_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/glog
)
SET
(
GLOG_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/glog
)
SET
(
GLOG_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/glog
)
SET
(
GLOG_INCLUDE_DIR
"
${
GLOG_INSTALL_DIR
}
/include"
CACHE PATH
"glog include directory."
FORCE
)
SET
(
GLOG_INCLUDE_DIR
"
${
GLOG_INSTALL_DIR
}
/include"
CACHE PATH
"glog include directory."
FORCE
)
IF
(
WIN32
)
IF
(
WIN32
)
...
...
cmake/external/gtest.cmake
浏览文件 @
cb0a1e2f
...
@@ -16,8 +16,8 @@ IF(WITH_TESTING)
...
@@ -16,8 +16,8 @@ IF(WITH_TESTING)
ENABLE_TESTING
()
ENABLE_TESTING
()
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
SET
(
GTEST_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/gtest
)
SET
(
GTEST_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/gtest
)
SET
(
GTEST_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/gtest
)
SET
(
GTEST_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/gtest
)
SET
(
GTEST_INCLUDE_DIR
"
${
GTEST_INSTALL_DIR
}
/include"
CACHE PATH
"gtest include directory."
FORCE
)
SET
(
GTEST_INCLUDE_DIR
"
${
GTEST_INSTALL_DIR
}
/include"
CACHE PATH
"gtest include directory."
FORCE
)
INCLUDE_DIRECTORIES
(
${
GTEST_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
GTEST_INCLUDE_DIR
}
)
...
...
cmake/external/openblas.cmake
浏览文件 @
cb0a1e2f
...
@@ -18,8 +18,8 @@ IF(NOT ${CBLAS_FOUND})
...
@@ -18,8 +18,8 @@ IF(NOT ${CBLAS_FOUND})
MESSAGE
(
FATAL_ERROR
"Please install OpenBlas, MKL or ATLAS."
)
MESSAGE
(
FATAL_ERROR
"Please install OpenBlas, MKL or ATLAS."
)
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
SET
(
CBLAS_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/openblas
)
SET
(
CBLAS_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/openblas
)
SET
(
CBLAS_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/openblas
)
SET
(
CBLAS_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/openblas
)
SET
(
CBLAS_INC_DIR
"
${
CBLAS_INSTALL_DIR
}
/include"
CACHE PATH
"openblas include directory."
FORCE
)
SET
(
CBLAS_INC_DIR
"
${
CBLAS_INSTALL_DIR
}
/include"
CACHE PATH
"openblas include directory."
FORCE
)
IF
(
WIN32
)
IF
(
WIN32
)
...
...
cmake/external/protobuf.cmake
浏览文件 @
cb0a1e2f
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
SET
(
PROTOBUF_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/protobuf
)
SET
(
PROTOBUF_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/protobuf
)
SET
(
PROTOBUF_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/protobuf
)
SET
(
PROTOBUF_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/protobuf
)
SET
(
PROTOBUF_INCLUDE_DIR
"
${
PROTOBUF_INSTALL_DIR
}
/include"
CACHE PATH
"protobuf include directory."
FORCE
)
SET
(
PROTOBUF_INCLUDE_DIR
"
${
PROTOBUF_INSTALL_DIR
}
/include"
CACHE PATH
"protobuf include directory."
FORCE
)
INCLUDE_DIRECTORIES
(
${
PROTOBUF_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
PROTOBUF_INCLUDE_DIR
}
)
...
...
cmake/external/python.cmake
浏览文件 @
cb0a1e2f
...
@@ -28,8 +28,8 @@ IF(PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
...
@@ -28,8 +28,8 @@ IF(PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
FIND_PACKAGE
(
NumPy REQUIRED
)
FIND_PACKAGE
(
NumPy REQUIRED
)
ELSE
(
PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND
)
ELSE
(
PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND
)
##################################### PYTHON ########################################
##################################### PYTHON ########################################
SET
(
PYTHON_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/python
)
SET
(
PYTHON_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/python
)
SET
(
PYTHON_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/python
)
SET
(
PYTHON_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/python
)
SET
(
_python_DIR
${
PYTHON_INSTALL_DIR
}
)
SET
(
_python_DIR
${
PYTHON_INSTALL_DIR
}
)
IF
(
UNIX
)
IF
(
UNIX
)
...
...
cmake/external/swig.cmake
浏览文件 @
cb0a1e2f
...
@@ -18,8 +18,8 @@ IF(NOT SWIG_FOUND)
...
@@ -18,8 +18,8 @@ IF(NOT SWIG_FOUND)
# build swig as an external project
# build swig as an external project
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
SET
(
SWIG_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/swig
)
SET
(
SWIG_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/swig
)
SET
(
SWIG_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/swig
)
SET
(
SWIG_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/swig
)
SET
(
SWIG_TARGET_VERSION
"3.0.2"
)
SET
(
SWIG_TARGET_VERSION
"3.0.2"
)
SET
(
SWIG_DOWNLOAD_SRC_MD5
"62f9b0d010cef36a13a010dc530d0d41"
)
SET
(
SWIG_DOWNLOAD_SRC_MD5
"62f9b0d010cef36a13a010dc530d0d41"
)
SET
(
SWIG_DOWNLOAD_WIN_MD5
"3f18de4fc09ab9abb0d3be37c11fbc8f"
)
SET
(
SWIG_DOWNLOAD_WIN_MD5
"3f18de4fc09ab9abb0d3be37c11fbc8f"
)
...
...
cmake/external/warpctc.cmake
浏览文件 @
cb0a1e2f
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
SET
(
WARPCTC_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/warpctc
)
SET
(
WARPCTC_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/warpctc
)
SET
(
WARPCTC_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/warpctc
)
SET
(
WARPCTC_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/warpctc
)
SET
(
WARPCTC_INCLUDE_DIR
"
${
WARPCTC_INSTALL_DIR
}
/include"
CACHE PATH
"Warp-ctc Directory"
FORCE
)
SET
(
WARPCTC_INCLUDE_DIR
"
${
WARPCTC_INSTALL_DIR
}
/include"
CACHE PATH
"Warp-ctc Directory"
FORCE
)
INCLUDE_DIRECTORIES
(
${
WARPCTC_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
WARPCTC_INCLUDE_DIR
}
)
...
...
cmake/external/zlib.cmake
浏览文件 @
cb0a1e2f
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
SET
(
ZLIB_SOURCES_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/zlib
)
SET
(
ZLIB_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/zlib
)
SET
(
ZLIB_INSTALL_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party
/install/zlib
)
SET
(
ZLIB_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/zlib
)
SET
(
ZLIB_ROOT
${
ZLIB_INSTALL_DIR
}
CACHE FILEPATH
"zlib root directory."
FORCE
)
SET
(
ZLIB_ROOT
${
ZLIB_INSTALL_DIR
}
CACHE FILEPATH
"zlib root directory."
FORCE
)
SET
(
ZLIB_INCLUDE_DIR
"
${
ZLIB_INSTALL_DIR
}
/include"
CACHE PATH
"zlib include directory."
FORCE
)
SET
(
ZLIB_INCLUDE_DIR
"
${
ZLIB_INSTALL_DIR
}
/include"
CACHE PATH
"zlib include directory."
FORCE
)
...
...
cmake/flags.cmake
浏览文件 @
cb0a1e2f
...
@@ -3,12 +3,6 @@ include(CheckCXXCompilerFlag)
...
@@ -3,12 +3,6 @@ include(CheckCXXCompilerFlag)
include
(
CheckCCompilerFlag
)
include
(
CheckCCompilerFlag
)
include
(
CheckCXXSymbolExists
)
include
(
CheckCXXSymbolExists
)
if
(
NOT CMAKE_BUILD_TYPE
)
set
(
CMAKE_BUILD_TYPE
"RelWithDebInfo"
CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel"
FORCE
)
endif
()
function
(
CheckCompilerCXX11Flag
)
function
(
CheckCompilerCXX11Flag
)
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"GNU"
)
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"GNU"
)
if
(
${
CMAKE_CXX_COMPILER_VERSION
}
VERSION_LESS 4.8
)
if
(
${
CMAKE_CXX_COMPILER_VERSION
}
VERSION_LESS 4.8
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录