Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
c076202f
MegEngine
项目概览
MegEngine 天元
/
MegEngine
接近 2 年 前同步成功
通知
414
Star
4708
Fork
583
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MegEngine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
c076202f
编写于
9月 18, 2020
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(whl/macos): set for osx compat version to 10.14
GitOrigin-RevId: 5dea6a6c6551e1d3479c5e324d74ab1d1e05f261
上级
00de4cd9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
3 deletion
+7
-3
imperative/src/impl/interpreter_impl.cpp
imperative/src/impl/interpreter_impl.cpp
+1
-0
imperative/src/test/helper.cpp
imperative/src/test/helper.cpp
+1
-0
scripts/whl/macos/macos_build_whl.sh
scripts/whl/macos/macos_build_whl.sh
+5
-3
未找到文件。
imperative/src/impl/interpreter_impl.cpp
浏览文件 @
c076202f
...
...
@@ -187,6 +187,7 @@ void ChannelImpl::produce_tensor(TensorInfo* dest, TensorPtr ptr) {
}
void
ChannelImpl
::
process_one_task
(
Command
&
cmd
)
{
//TODO: remove std::visit for support osx 10.12
std
::
visit
([
this
](
auto
&
cmd
)
{
using
T
=
std
::
remove_reference_t
<
decltype
(
cmd
)
>
;
try
{
...
...
imperative/src/test/helper.cpp
浏览文件 @
c076202f
...
...
@@ -107,6 +107,7 @@ void OprChecker::run(std::vector<InputSpec> inp_keys) {
auto
graph
=
ComputingGraph
::
make
();
graph
->
options
().
graph_opt_level
=
0
;
for
(
size_t
i
=
0
;
i
<
nr_inps
;
++
i
)
{
//TODO: remove std::visit for support osx 10.12
host_inp
[
i
]
=
std
::
visit
([
&
gen
](
auto
&&
arg
)
->
HostTensorND
{
using
T
=
std
::
decay_t
<
decltype
(
arg
)
>
;
if
constexpr
(
std
::
is_same_v
<
TensorShape
,
T
>
)
{
...
...
scripts/whl/macos/macos_build_whl.sh
浏览文件 @
c076202f
...
...
@@ -112,6 +112,10 @@ function do_build() {
export
EXTRA_CMAKE_ARGS
=
"-DCMAKE_PREFIX_PATH=
${
PYTHON_DIR
}
-DPYTHON_LIBRARY=
${
PYTHON_LIBRARY
}
-DPYTHON_INCLUDE_DIR=
${
PYTHON_INCLUDE_DIR
}
"
#config build type to RelWithDebInfo to enable MGB_ENABLE_DEBUG_UTIL etc
export
EXTRA_CMAKE_ARGS
=
"
${
EXTRA_CMAKE_ARGS
}
-DCMAKE_BUILD_TYPE=RelWithDebInfo "
#we use std::visit in src, so set osx version minimum to 10.14, but 10.14 have objdump
#issue, so we now config to 10.15, whl name to 10.14
#TODO: can set to 10.12 after remove use std::visit
export
EXTRA_CMAKE_ARGS
=
"
${
EXTRA_CMAKE_ARGS
}
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 "
#call build and install
#FIXME: cmake do not triger update python config, after
...
...
@@ -164,9 +168,7 @@ function do_build() {
cd
${
BUILD_DIR
}
/staging/dist/
org_whl_name
=
`
ls
Meg
*
.whl
`
index
=
`
awk
-v
a
=
"
${
org_whl_name
}
"
-v
b
=
"-macosx"
'BEGIN{print index(a,b)}'
`
#compat for osx version from 10.5(Leopard)
#FIXME: same no need at -macosx-version-min=10.5 for build so
compat_whl_name
=
`
echo
${
org_whl_name
}
|cut
-b
-
$index
`
macosx_10_5_x86_64.whl
compat_whl_name
=
`
echo
${
org_whl_name
}
|cut
-b
-
$index
`
macosx_10_14_x86_64.whl
echo
"org whl name:
${
org_whl_name
}
"
echo
"comapt whl name:
${
compat_whl_name
}
"
cp
${
BUILD_DIR
}
/staging/dist/Meg
*
.whl
${
MACOS_WHL_HOME
}
/
${
compat_whl_name
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录