Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
243cae59
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2292
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
243cae59
编写于
2月 10, 2023
作者:
R
risemeup1
提交者:
GitHub
2月 10, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix ninja error while using python>=3.9 (#48867)
上级
42a75145
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
32 deletion
+6
-32
setup.py
setup.py
+6
-32
未找到文件。
setup.py
浏览文件 @
243cae59
...
...
@@ -22,7 +22,6 @@ import re
import
shutil
import
subprocess
import
sys
import
sysconfig
from
contextlib
import
contextmanager
from
distutils.spawn
import
find_executable
from
subprocess
import
CalledProcessError
...
...
@@ -43,6 +42,12 @@ else:
print
(
"export PY_VERSION = %s"
%
platform
.
python_version
())
python_version
=
platform
.
python_version
()
os
.
environ
[
"PY_VERSION"
]
=
python_version
else
:
if
os
.
getenv
(
"PY_VERSION"
)
!=
platform
.
python_version
()[:
3
]:
raise
RuntimeError
(
"You set PY_VERSION=%s, but your current python environment is %s, you should keep them consistent!"
%
(
os
.
getenv
(
"PY_VERSION"
),
platform
.
python_version
()[:
3
])
)
# check cmake
CMAKE
=
find_executable
(
'cmake3'
)
or
find_executable
(
'cmake'
)
...
...
@@ -50,27 +55,6 @@ assert (
CMAKE
),
'The "cmake" executable is not found. Please check if Cmake is installed.'
# CMAKE: full path to python library
if
platform
.
system
()
==
"Windows"
:
cmake_python_library
=
"{}/libs/python{}.lib"
.
format
(
sysconfig
.
get_config_var
(
"prefix"
),
sysconfig
.
get_config_var
(
"VERSION"
)
)
# Fix virtualenv builds
if
not
os
.
path
.
exists
(
cmake_python_library
):
cmake_python_library
=
"{}/libs/python{}.lib"
.
format
(
sys
.
base_prefix
,
sysconfig
.
get_config_var
(
"VERSION"
)
)
else
:
cmake_python_library
=
"{}/{}"
.
format
(
sysconfig
.
get_config_var
(
"LIBDIR"
),
sysconfig
.
get_config_var
(
"INSTSONAME"
),
)
if
not
os
.
path
.
exists
(
cmake_python_library
):
libname
=
sysconfig
.
get_config_var
(
"INSTSONAME"
)
libdir
=
sysconfig
.
get_config_var
(
'LIBDIR'
)
+
(
sysconfig
.
get_config_var
(
"multiarchsubdir"
)
or
""
)
cmake_python_library
=
os
.
path
.
join
(
libdir
,
libname
)
TOP_DIR
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
))
...
...
@@ -642,16 +626,6 @@ def options_process(args, build_options):
for
key
,
value
in
sorted
(
build_options
.
items
()):
if
value
is
not
None
:
args
.
append
(
"-D{}={}"
.
format
(
key
,
value
))
if
'PYTHON_EXECUTABLE:FILEPATH'
not
in
build_options
.
keys
():
args
.
append
(
"-D{}={}"
.
format
(
'PYTHON_EXECUTABLE'
,
sys
.
executable
))
if
'PYTHON_INCLUDE_DIR:PATH'
not
in
build_options
.
keys
():
args
.
append
(
'-D{}={}'
.
format
(
'PYTHON_INCLUDE_DIR'
,
sysconfig
.
get_path
(
"include"
)
)
)
if
'PYTHON_LIBRARY:FILEPATH'
not
in
build_options
.
keys
():
args
.
append
(
'-D{}={}'
.
format
(
'PYTHON_LIBRARY'
,
cmake_python_library
))
def
get_cmake_generator
():
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录