Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
cc89120a
P
Paddle
项目概览
OPTHREE
/
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,发现更多精彩内容 >>
未验证
提交
cc89120a
编写于
2月 28, 2021
作者:
Z
Zhou Wei
提交者:
GitHub
2月 28, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Custom OP]add MSVC compile check on Windows (#31265)
上级
af9066e8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
62 addition
and
69 deletion
+62
-69
python/paddle/fluid/tests/custom_op/CMakeLists.txt
python/paddle/fluid/tests/custom_op/CMakeLists.txt
+2
-3
python/paddle/fluid/tests/custom_op/test_check_abi.py
python/paddle/fluid/tests/custom_op/test_check_abi.py
+30
-49
python/paddle/utils/cpp_extension/extension_utils.py
python/paddle/utils/cpp_extension/extension_utils.py
+30
-17
未找到文件。
python/paddle/fluid/tests/custom_op/CMakeLists.txt
浏览文件 @
cc89120a
...
...
@@ -23,15 +23,14 @@ set_tests_properties(test_multi_out_jit PROPERTIES TIMEOUT 120)
py_test
(
test_custom_attrs_jit SRCS test_custom_attrs_jit.py
)
set_tests_properties
(
test_custom_attrs_jit PROPERTIES TIMEOUT 120
)
py_test
(
test_check_abi SRCS test_check_abi.py
)
cc_test
(
test_check_error SRCS test_check_error.cc DEPS gtest
)
if
(
NOT LINUX
)
return
()
endif
()
# TODO(zhouwei): support test_check_abi and abi check on Windows
py_test
(
test_check_abi SRCS test_check_abi.py
)
# Old custom OP only support Linux, only run on Linux
py_test
(
test_custom_op SRCS test_custom_op.py
)
py_test
(
test_jit_load SRCS test_jit_load.py
)
...
...
python/paddle/fluid/tests/custom_op/test_check_abi.py
浏览文件 @
cc89120a
...
...
@@ -22,10 +22,11 @@ import paddle.utils.cpp_extension.extension_utils as utils
class
TestABIBase
(
unittest
.
TestCase
):
def
test_environ
(
self
):
compiler
=
'gcc'
for
flag
in
[
'1'
,
'True'
,
'true'
]:
os
.
environ
[
'PADDLE_SKIP_CHECK_ABI'
]
=
flag
self
.
assertTrue
(
utils
.
check_abi_compatibility
(
compiler
))
compiler_list
=
[
'gcc'
,
'cl'
]
for
compiler
in
compiler_list
:
for
flag
in
[
'1'
,
'True'
,
'true'
]:
os
.
environ
[
'PADDLE_SKIP_CHECK_ABI'
]
=
flag
self
.
assertTrue
(
utils
.
check_abi_compatibility
(
compiler
))
def
del_environ
(
self
):
key
=
'PADDLE_SKIP_CHECK_ABI'
...
...
@@ -33,43 +34,49 @@ class TestABIBase(unittest.TestCase):
del
os
.
environ
[
key
]
class
TestCheck
Linux
(
TestABIBase
):
class
TestCheck
Compiler
(
TestABIBase
):
def
test_expected_compiler
(
self
):
if
utils
.
OS_NAME
.
startswith
(
'linux'
):
gt
=
[
'gcc'
,
'g++'
,
'gnu-c++'
,
'gnu-cc'
]
self
.
assertListEqual
(
utils
.
_expected_compiler_current_platform
(),
gt
)
elif
utils
.
IS_WINDOWS
:
gt
=
[
'cl'
]
elif
utils
.
OS_NAME
.
startswith
(
'darwin'
):
gt
=
[
'clang'
,
'clang++'
]
self
.
assertListEqual
(
utils
.
_expected_compiler_current_platform
(),
gt
)
def
test_
gcc
_version
(
self
):
def
test_
compiler
_version
(
self
):
# clear environ
self
.
del_environ
()
compiler
=
'g++'
if
utils
.
OS_NAME
.
startswith
(
'linux'
):
# all CI gcc version > 5.4.0
self
.
assertTrue
(
utils
.
check_abi_compatibility
(
compiler
,
verbose
=
True
))
compiler
=
'g++'
elif
utils
.
IS_WINDOWS
:
compiler
=
'cl'
# Linux: all CI gcc version > 5.4.0
# Windows: all CI MSVC version > 19.00.24215
# Mac: clang has no version limitation, always return true
self
.
assertTrue
(
utils
.
check_abi_compatibility
(
compiler
,
verbose
=
True
))
def
test_wrong_compiler_warning
(
self
):
# clear environ
self
.
del_environ
()
compiler
=
'nvcc'
# fake wrong compiler
if
utils
.
OS_NAME
.
startswith
(
'linux'
):
with
warnings
.
catch_warnings
(
record
=
True
)
as
error
:
flag
=
utils
.
check_abi_compatibility
(
compiler
,
verbose
=
True
)
# check return False
self
.
assertFalse
(
flag
)
# check Compiler Compatibility WARNING
self
.
assertTrue
(
len
(
error
)
==
1
)
self
.
assertTrue
(
"Compiler Compatibility WARNING"
in
str
(
error
[
0
].
message
))
with
warnings
.
catch_warnings
(
record
=
True
)
as
error
:
flag
=
utils
.
check_abi_compatibility
(
compiler
,
verbose
=
True
)
# check return False
self
.
assertFalse
(
flag
)
# check Compiler Compatibility WARNING
self
.
assertTrue
(
len
(
error
)
==
1
)
self
.
assertTrue
(
"Compiler Compatibility WARNING"
in
str
(
error
[
0
].
message
))
def
test_exception
(
self
):
# clear environ
self
.
del_environ
()
compiler
=
'python'
# fake command
if
utils
.
OS_NAME
.
startswith
(
'linux'
):
# to skip _expected_compiler_current_platform
def
fake
():
return
[
compiler
]
...
...
@@ -89,32 +96,6 @@ class TestCheckLinux(TestABIBase):
utils
.
_expected_compiler_current_platform
=
raw_func
class
TestCheckMacOs
(
TestABIBase
):
def
test_expected_compiler
(
self
):
if
utils
.
OS_NAME
.
startswith
(
'darwin'
):
gt
=
[
'clang'
,
'clang++'
]
self
.
assertListEqual
(
utils
.
_expected_compiler_current_platform
(),
gt
)
def
test_gcc_version
(
self
):
# clear environ
self
.
del_environ
()
if
utils
.
OS_NAME
.
startswith
(
'darwin'
):
# clang has no version limitation.
self
.
assertTrue
(
utils
.
check_abi_compatibility
())
class
TestCheckWindows
(
TestABIBase
):
def
test_gcc_version
(
self
):
# clear environ
self
.
del_environ
()
if
utils
.
IS_WINDOWS
:
# we skip windows now
self
.
assertTrue
(
utils
.
check_abi_compatibility
())
class
TestJITCompilerException
(
unittest
.
TestCase
):
def
test_exception
(
self
):
with
self
.
assertRaisesRegexp
(
RuntimeError
,
...
...
python/paddle/utils/cpp_extension/extension_utils.py
浏览文件 @
cc89120a
...
...
@@ -51,6 +51,7 @@ MSVC_LINK_FLAGS = ['/MACHINE:X64', 'paddle_custom_op.lib']
COMMON_NVCC_FLAGS
=
[
'-DPADDLE_WITH_CUDA'
,
'-DEIGEN_USE_GPU'
,
'-O3'
]
GCC_MINI_VERSION
=
(
5
,
4
,
0
)
MSVC_MINI_VERSION
=
(
19
,
0
,
24215
)
# Give warning if using wrong compiler
WRONG_COMPILER_WARNING
=
'''
*************************************
...
...
@@ -64,7 +65,7 @@ built Paddle for this platform, which is {paddle_compiler} on {platform}. Please
use {paddle_compiler} to compile your custom op. Or you may compile Paddle from
source using {user_compiler}, and then also use it compile your custom op.
See https://www.paddlepaddle.org.cn/
install/quick?docurl=/documentation/docs/zh/2.0/install/compile/linux-compil
e.html
See https://www.paddlepaddle.org.cn/
documentation/docs/zh/install/compile/fromsourc
e.html
for help with compiling Paddle from source.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
...
...
@@ -877,13 +878,12 @@ def check_abi_compatibility(compiler, verbose=False):
Check whether GCC version on user local machine is compatible with Paddle in
site-packages.
"""
# TODO(Aurelius84): After we support windows, remove IS_WINDOWS in following code.
if
os
.
environ
.
get
(
'PADDLE_SKIP_CHECK_ABI'
)
in
[
'True'
,
'true'
,
'1'
]
or
IS_WINDOWS
:
if
os
.
environ
.
get
(
'PADDLE_SKIP_CHECK_ABI'
)
in
[
'True'
,
'true'
,
'1'
]:
return
True
which
=
'where'
if
IS_WINDOWS
else
'which'
cmd_out
=
subprocess
.
check_output
(
[
'which'
,
compiler
],
stderr
=
subprocess
.
STDOUT
)
[
which
,
compiler
],
stderr
=
subprocess
.
STDOUT
)
compiler_path
=
os
.
path
.
realpath
(
cmd_out
.
decode
()
if
six
.
PY3
else
cmd_out
).
strip
()
# step 1. if not found any suitable compiler, raise error
...
...
@@ -896,32 +896,41 @@ def check_abi_compatibility(compiler, verbose=False):
platform
=
OS_NAME
))
return
False
version
=
(
0
,
0
,
0
)
# clang++ have no ABI compatibility problem
if
OS_NAME
.
startswith
(
'darwin'
):
return
True
try
:
if
OS_NAME
.
startswith
(
'linux'
):
mini_required_version
=
GCC_MINI_VERSION
version_info
=
subprocess
.
check_output
(
[
compiler
,
'-dumpfullversion'
,
'-dumpversion'
])
if
six
.
PY3
:
version_info
=
version_info
.
decode
()
version
=
version_info
.
strip
().
split
(
'.'
)
assert
len
(
version
)
==
3
# check version compatibility
if
tuple
(
map
(
int
,
version
))
>=
GCC_MINI_VERSION
:
return
True
else
:
warnings
.
warn
(
ABI_INCOMPATIBILITY_WARNING
.
format
(
user_compiler
=
compiler
,
version
=
version_info
.
strip
()))
elif
IS_WINDOWS
:
# TODO(zhouwei): support check abi compatibility on windows
warnings
.
warn
(
"We don't support Windows now."
)
mini_required_version
=
MSVC_MINI_VERSION
compiler_info
=
subprocess
.
check_output
(
compiler
,
stderr
=
subprocess
.
STDOUT
)
if
six
.
PY3
:
compiler_info
=
compiler_info
.
decode
()
match
=
re
.
search
(
r
'(\d+)\.(\d+)\.(\d+)'
,
compiler_info
.
strip
())
if
match
is
not
None
:
version
=
match
.
groups
()
except
Exception
:
# check compiler version failed
_
,
error
,
_
=
sys
.
exc_info
()
warnings
.
warn
(
'Failed to check compiler version for {}: {}'
.
format
(
compiler
,
error
))
return
False
# check version compatibility
assert
len
(
version
)
==
3
if
tuple
(
map
(
int
,
version
))
>=
mini_required_version
:
return
True
warnings
.
warn
(
ABI_INCOMPATIBILITY_WARNING
.
format
(
user_compiler
=
compiler
,
version
=
version
.
strip
()))
return
False
...
...
@@ -929,8 +938,12 @@ def _expected_compiler_current_platform():
"""
Returns supported compiler string on current platform
"""
expect_compilers
=
[
'clang'
,
'clang++'
]
if
OS_NAME
.
startswith
(
'darwin'
)
else
[
'gcc'
,
'g++'
,
'gnu-c++'
,
'gnu-cc'
]
if
OS_NAME
.
startswith
(
'darwin'
):
expect_compilers
=
[
'clang'
,
'clang++'
]
elif
OS_NAME
.
startswith
(
'linux'
):
expect_compilers
=
[
'gcc'
,
'g++'
,
'gnu-c++'
,
'gnu-cc'
]
elif
IS_WINDOWS
:
expect_compilers
=
[
'cl'
]
return
expect_compilers
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录