Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
e939236e
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看板
未验证
提交
e939236e
编写于
6月 01, 2021
作者:
Z
Zhou Wei
提交者:
GitHub
6月 01, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix duplicate download when incremental compilation (#33230)
上级
17c6d399
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
3 deletion
+12
-3
cmake/external/boost.cmake
cmake/external/boost.cmake
+1
-0
cmake/external/mkldnn.cmake
cmake/external/mkldnn.cmake
+1
-1
cmake/external/mklml.cmake
cmake/external/mklml.cmake
+3
-0
cmake/third_party.cmake
cmake/third_party.cmake
+7
-2
未找到文件。
cmake/external/boost.cmake
浏览文件 @
e939236e
...
@@ -46,6 +46,7 @@ ExternalProject_Add(
...
@@ -46,6 +46,7 @@ ExternalProject_Add(
${
BOOST_PROJECT
}
${
BOOST_PROJECT
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
"
${
BOOST_DOWNLOAD_CMD
}
"
"
${
BOOST_DOWNLOAD_CMD
}
"
URL_MD5 f891e8c2c9424f0565f0129ad9ab4aff
PREFIX
${
BOOST_PREFIX_DIR
}
PREFIX
${
BOOST_PREFIX_DIR
}
DOWNLOAD_DIR
${
BOOST_SOURCE_DIR
}
DOWNLOAD_DIR
${
BOOST_SOURCE_DIR
}
SOURCE_DIR
${
BOOST_SOURCE_DIR
}
SOURCE_DIR
${
BOOST_SOURCE_DIR
}
...
...
cmake/external/mkldnn.cmake
浏览文件 @
e939236e
...
@@ -110,7 +110,7 @@ if(WIN32)
...
@@ -110,7 +110,7 @@ if(WIN32)
add_custom_command
(
TARGET
${
MKLDNN_PROJECT
}
POST_BUILD VERBATIM
add_custom_command
(
TARGET
${
MKLDNN_PROJECT
}
POST_BUILD VERBATIM
COMMAND echo EXPORTS >>
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.def
)
COMMAND echo EXPORTS >>
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.def
)
add_custom_command
(
TARGET
${
MKLDNN_PROJECT
}
POST_BUILD VERBATIM
add_custom_command
(
TARGET
${
MKLDNN_PROJECT
}
POST_BUILD VERBATIM
COMMAND echo off &&
(
for /f
"skip=19 tokens=4"
%A
in
(
${
MKLDNN_INSTALL_DIR
}
/bin/exports.txt
)
do echo %A >>
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.def
)
&& echo on
)
COMMAND echo off &&
(
for /f
"skip=19 tokens=4"
%A
in
(
${
MKLDNN_INSTALL_DIR
}
/bin/exports.txt
)
do echo %A >>
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.def
)
&& echo on
)
add_custom_command
(
TARGET
${
MKLDNN_PROJECT
}
POST_BUILD VERBATIM
add_custom_command
(
TARGET
${
MKLDNN_PROJECT
}
POST_BUILD VERBATIM
COMMAND lib /def:
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.def /out:
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.lib /machine:x64
)
COMMAND lib /def:
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.def /out:
${
MKLDNN_INSTALL_DIR
}
/bin/mkldnn.lib /machine:x64
)
else
(
WIN32
)
else
(
WIN32
)
...
...
cmake/external/mklml.cmake
浏览文件 @
e939236e
...
@@ -24,6 +24,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${MKLML_ROOT}/lib")
...
@@ -24,6 +24,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${MKLML_ROOT}/lib")
IF
(
WIN32
)
IF
(
WIN32
)
SET
(
MKLML_VER
"mklml_win_2019.0.5.20190502"
CACHE STRING
""
FORCE
)
SET
(
MKLML_VER
"mklml_win_2019.0.5.20190502"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL
"https://paddlepaddledeps.bj.bcebos.com/
${
MKLML_VER
}
.zip"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL
"https://paddlepaddledeps.bj.bcebos.com/
${
MKLML_VER
}
.zip"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL_MD5 ff8c5237570f03eea37377ccfc95a08a
)
SET
(
MKLML_LIB
${
MKLML_LIB_DIR
}
/mklml.lib
)
SET
(
MKLML_LIB
${
MKLML_LIB_DIR
}
/mklml.lib
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5md.lib
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5md.lib
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/mklml.dll
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/mklml.dll
)
...
@@ -33,6 +34,7 @@ ELSE()
...
@@ -33,6 +34,7 @@ ELSE()
# Now enable csrmm function in mklml library temporarily, it will be updated as offical version later.
# Now enable csrmm function in mklml library temporarily, it will be updated as offical version later.
SET
(
MKLML_VER
"csrmm_mklml_lnx_2019.0.5"
CACHE STRING
""
FORCE
)
SET
(
MKLML_VER
"csrmm_mklml_lnx_2019.0.5"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL
"http://paddlepaddledeps.bj.bcebos.com/
${
MKLML_VER
}
.tgz"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL
"http://paddlepaddledeps.bj.bcebos.com/
${
MKLML_VER
}
.tgz"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL_MD5 bc6a7faea6a2a9ad31752386f3ae87da
)
SET
(
MKLML_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
SET
(
MKLML_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5.so
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5.so
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
...
@@ -52,6 +54,7 @@ ExternalProject_Add(
...
@@ -52,6 +54,7 @@ ExternalProject_Add(
${
MKLML_PROJECT
}
${
MKLML_PROJECT
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
"
${
MKLML_DOWNLOAD_CMD
}
"
"
${
MKLML_DOWNLOAD_CMD
}
"
URL_MD5
${
MKLML_URL_MD5
}
PREFIX
${
MKLML_PREFIX_DIR
}
PREFIX
${
MKLML_PREFIX_DIR
}
DOWNLOAD_DIR
${
MKLML_SOURCE_DIR
}
DOWNLOAD_DIR
${
MKLML_SOURCE_DIR
}
SOURCE_DIR
${
MKLML_SOURCE_DIR
}
SOURCE_DIR
${
MKLML_SOURCE_DIR
}
...
...
cmake/third_party.cmake
浏览文件 @
e939236e
...
@@ -108,13 +108,18 @@ ENDMACRO()
...
@@ -108,13 +108,18 @@ ENDMACRO()
# 2. NAME: The name of file, that determin the dirname
# 2. NAME: The name of file, that determin the dirname
#
#
FUNCTION
(
file_download_and_uncompress URL NAME
)
FUNCTION
(
file_download_and_uncompress URL NAME
)
MESSAGE
(
STATUS
"Download dependence[
${
NAME
}
] from
${
URL
}
"
)
set
(
options
""
)
set
(
oneValueArgs MD5
)
set
(
multiValueArgs
""
)
cmake_parse_arguments
(
URL
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
MESSAGE
(
STATUS
"Download dependence[
${
NAME
}
] from
${
URL
}
, MD5:
${
URL_MD5
}
"
)
SET
(
${
NAME
}
_INCLUDE_DIR
${
THIRD_PARTY_PATH
}
/
${
NAME
}
/data PARENT_SCOPE
)
SET
(
${
NAME
}
_INCLUDE_DIR
${
THIRD_PARTY_PATH
}
/
${
NAME
}
/data PARENT_SCOPE
)
ExternalProject_Add
(
ExternalProject_Add
(
download_
${
NAME
}
download_
${
NAME
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
PREFIX
${
THIRD_PARTY_PATH
}
/
${
NAME
}
PREFIX
${
THIRD_PARTY_PATH
}
/
${
NAME
}
URL
${
URL
}
URL
${
URL
}
URL_MD5
${
URL_MD5
}
TIMEOUT 120
TIMEOUT 120
DOWNLOAD_DIR
${
THIRD_PARTY_PATH
}
/
${
NAME
}
/data/
DOWNLOAD_DIR
${
THIRD_PARTY_PATH
}
/
${
NAME
}
/data/
SOURCE_DIR
${
THIRD_PARTY_PATH
}
/
${
NAME
}
/data/
SOURCE_DIR
${
THIRD_PARTY_PATH
}
/
${
NAME
}
/data/
...
@@ -244,7 +249,7 @@ if(WITH_GPU)
...
@@ -244,7 +249,7 @@ if(WITH_GPU)
list
(
APPEND third_party_deps extern_cub
)
list
(
APPEND third_party_deps extern_cub
)
endif
()
endif
()
set
(
URL
"https://paddlepaddledeps.bj.bcebos.com/externalErrorMsg.tar.gz"
CACHE STRING
""
FORCE
)
set
(
URL
"https://paddlepaddledeps.bj.bcebos.com/externalErrorMsg.tar.gz"
CACHE STRING
""
FORCE
)
file_download_and_uncompress
(
${
URL
}
"externalError"
)
# download file externalErrorMsg.tar.gz
file_download_and_uncompress
(
${
URL
}
"externalError"
MD5 c0749523ebb536eb7382487d645d9cd4
)
# download file externalErrorMsg.tar.gz
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
# copy externalErrorMsg.pb for unittest 'enforce_test'
# copy externalErrorMsg.pb for unittest 'enforce_test'
set
(
SRC_DIR
${
THIRD_PARTY_PATH
}
/externalError/data
)
set
(
SRC_DIR
${
THIRD_PARTY_PATH
}
/externalError/data
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录