Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
aed9a75b
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
未验证
提交
aed9a75b
编写于
4月 26, 2023
作者:
H
HongyuJia
提交者:
GitHub
4月 26, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Fix Patch Error] Fix patch error in cmake (#53321)
上级
37489df5
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
21 addition
and
10 deletion
+21
-10
cmake/external/eigen.cmake
cmake/external/eigen.cmake
+3
-2
cmake/external/gloo.cmake
cmake/external/gloo.cmake
+7
-4
cmake/external/gtest.cmake
cmake/external/gtest.cmake
+4
-2
cmake/external/pybind11.cmake
cmake/external/pybind11.cmake
+7
-2
未找到文件。
cmake/external/eigen.cmake
浏览文件 @
aed9a75b
...
...
@@ -51,9 +51,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
if
(
GCC_VERSION GREATER_EQUAL
"12.0"
)
file
(
TO_NATIVE_PATH
${
PADDLE_SOURCE_DIR
}
/patches/eigen/Complex.h.patch
complex_header
)
# See: [Why calling some `git` commands before `patch`?]
set
(
EIGEN_PATCH_COMMAND
patch -Nd
${
EIGEN_SOURCE_DIR
}
/Eigen/src/Core/arch/SSE/ <
${
complex_header
}
)
git checkout -- . && git checkout
${
EIGEN_TAG
}
&& patch -Nd
${
EIGEN_SOURCE_DIR
}
/Eigen/src/Core/arch/SSE/ <
${
complex_header
}
)
endif
()
endif
()
...
...
cmake/external/gloo.cmake
浏览文件 @
aed9a75b
...
...
@@ -37,8 +37,9 @@ if(WITH_GPU)
VERSION_GREATER 12.0
)
file
(
TO_NATIVE_PATH
${
PADDLE_SOURCE_DIR
}
/patches/gloo/device.cc.patch
native_dst
)
set
(
GLOO_PATCH_COMMAND patch -d
${
GLOO_SOURCE_DIR
}
/gloo/transport/tcp <
${
native_dst
}
)
set
(
GLOO_PATCH_COMMAND
git checkout -- . && git checkout
${
GLOO_TAG
}
&&patch -Nd
${
GLOO_SOURCE_DIR
}
/gloo/transport/tcp <
${
native_dst
}
)
endif
()
endif
()
...
...
@@ -54,9 +55,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
native_dst
)
file
(
TO_NATIVE_PATH
${
PADDLE_SOURCE_DIR
}
/patches/gloo/types.h.patch
types_header
)
# See: [Why calling some `git` commands before `patch`?]
set
(
GLOO_PATCH_COMMAND
patch -Nd
${
GLOO_SOURCE_DIR
}
/gloo/transport/tcp <
${
native_dst
}
&&
patch -Nd
${
GLOO_SOURCE_DIR
}
/gloo/ <
${
types_header
}
)
git checkout -- . && git checkout
${
GLOO_TAG
}
&& patch -Nd
${
GLOO_SOURCE_DIR
}
/gloo/transport/tcp <
${
native_dst
}
&& patch -Nd
${
GLOO_SOURCE_DIR
}
/gloo/ <
${
types_header
}
)
endif
()
endif
()
include_directories
(
${
GLOO_INCLUDE_DIR
}
)
...
...
cmake/external/gtest.cmake
浏览文件 @
aed9a75b
...
...
@@ -66,8 +66,10 @@ endif()
if
(
NOT WIN32 AND
${
CMAKE_CXX_COMPILER_VERSION
}
VERSION_GREATER 12.0
)
file
(
TO_NATIVE_PATH
${
PADDLE_SOURCE_DIR
}
/patches/gtest/gtest-death-test.cc.patch native_src
)
set
(
GTEST_PATCH_COMMAND patch -Nd
${
GTEST_SOURCE_DIR
}
/googletest/src <
${
native_src
}
)
# See: [Why calling some `git` commands before `patch`?]
set
(
GTEST_PATCH_COMMAND
git checkout -- . && git checkout
${
GTEST_TAG
}
&& patch -Nd
${
GTEST_SOURCE_DIR
}
/googletest/src <
${
native_src
}
)
endif
()
if
(
WIN32
)
ExternalProject_Add
(
...
...
cmake/external/pybind11.cmake
浏览文件 @
aed9a75b
...
...
@@ -25,8 +25,13 @@ set(PYBIND_PATCH_COMMAND "")
if
(
NOT WIN32
)
file
(
TO_NATIVE_PATH
${
PADDLE_SOURCE_DIR
}
/patches/pybind/cast.h.patch
native_dst
)
set
(
PYBIND_PATCH_COMMAND patch -d
${
PYBIND_INCLUDE_DIR
}
/pybind11 <
${
native_dst
}
)
# Note: [Why calling some `git` commands before `patch`?]
# Paddle's CI uses cache to accelarate the make process. However, error might raise when patch codes in two scenarios:
# 1. Patch to the wrong version: the tag version of CI's cache falls behind PYBIND_TAG, use `git checkout ${PYBIND_TAG}` to solve this.
# 2. Patch twice: the tag version of cache == PYBIND_TAG, but patch has already applied to cache.
set
(
PYBIND_PATCH_COMMAND
git checkout -- . && git checkout
${
PYBIND_TAG
}
&& patch -Nd
${
PYBIND_INCLUDE_DIR
}
/pybind11 <
${
native_dst
}
)
endif
()
ExternalProject_Add
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录