Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
66c18f60
MegEngine
项目概览
MegEngine 天元
/
MegEngine
1 年多 前同步成功
通知
403
Star
4705
Fork
582
代码
文件
提交
分支
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看板
提交
66c18f60
编写于
8月 10, 2021
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(ci): fix bazel compile error in new macos
GitOrigin-RevId: d22cc87fec9d136c41ffb4a34bcb678875ab040e
上级
a88ecf47
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
26 deletion
+25
-26
dnn/src/arm_common/conv_bias/fp32/channel_wise_nchw44_kern.cpp
...rc/arm_common/conv_bias/fp32/channel_wise_nchw44_kern.cpp
+12
-24
scripts/whl/macos/macos_whl_env_prepare.sh
scripts/whl/macos/macos_whl_env_prepare.sh
+13
-2
未找到文件。
dnn/src/arm_common/conv_bias/fp32/channel_wise_nchw44_kern.cpp
浏览文件 @
66c18f60
...
@@ -303,10 +303,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride1_2x2(
...
@@ -303,10 +303,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride1_2x2(
float32x4_t
kernel
[
4
];
float32x4_t
kernel
[
4
];
load_vec
<
4
>
(
kernel
,
filter
);
load_vec
<
4
>
(
kernel
,
filter
);
Op
op
;
Op
op
;
float32x4_t
init
;
float32x4_t
init
=
vdupq_n_f32
(
0.
f
);
if
(
bias_mode
==
BiasMode
::
NO_BIAS
)
{
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vdupq_n_f32
(
0.
f
);
}
else
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vld1q_f32
(
bias
);
init
=
vld1q_f32
(
bias
);
}
}
size_t
oh_start
=
PH
;
size_t
oh_start
=
PH
;
...
@@ -418,10 +416,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride1_3x3(
...
@@ -418,10 +416,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride1_3x3(
float32x4_t
kernel
[
9
];
float32x4_t
kernel
[
9
];
load_vec
<
9
>
(
kernel
,
filter
);
load_vec
<
9
>
(
kernel
,
filter
);
Op
op
;
Op
op
;
float32x4_t
init
;
float32x4_t
init
=
vdupq_n_f32
(
0.
f
);
if
(
bias_mode
==
BiasMode
::
NO_BIAS
)
{
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vdupq_n_f32
(
0.
f
);
}
else
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vld1q_f32
(
bias
);
init
=
vld1q_f32
(
bias
);
}
}
size_t
oh_start
=
PH
;
size_t
oh_start
=
PH
;
...
@@ -562,10 +558,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride1_5x5(
...
@@ -562,10 +558,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride1_5x5(
const
size_t
IH
,
const
size_t
IW
,
const
size_t
OH
,
const
size_t
OW
,
const
size_t
IH
,
const
size_t
IW
,
const
size_t
OH
,
const
size_t
OW
,
const
size_t
PH
,
const
size_t
PW
)
{
const
size_t
PH
,
const
size_t
PW
)
{
Op
op
;
Op
op
;
float32x4_t
init
;
float32x4_t
init
=
vdupq_n_f32
(
0.
f
);
if
(
bias_mode
==
BiasMode
::
NO_BIAS
)
{
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vdupq_n_f32
(
0.
f
);
}
else
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vld1q_f32
(
bias
);
init
=
vld1q_f32
(
bias
);
}
}
size_t
oh_start
=
PH
;
size_t
oh_start
=
PH
;
...
@@ -723,10 +717,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride2_2x2(
...
@@ -723,10 +717,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride2_2x2(
float32x4_t
kernel
[
4
];
float32x4_t
kernel
[
4
];
load_vec
<
4
>
(
kernel
,
filter
);
load_vec
<
4
>
(
kernel
,
filter
);
Op
op
;
Op
op
;
float32x4_t
init
;
float32x4_t
init
=
vdupq_n_f32
(
0.
f
);
if
(
bias_mode
==
BiasMode
::
NO_BIAS
)
{
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vdupq_n_f32
(
0.
f
);
}
else
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vld1q_f32
(
bias
);
init
=
vld1q_f32
(
bias
);
}
}
size_t
oh_start
=
(
PH
+
1
)
/
2
;
size_t
oh_start
=
(
PH
+
1
)
/
2
;
...
@@ -789,10 +781,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride2_3x3(
...
@@ -789,10 +781,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride2_3x3(
float32x4_t
kernel
[
9
];
float32x4_t
kernel
[
9
];
load_vec
<
9
>
(
kernel
,
filter
);
load_vec
<
9
>
(
kernel
,
filter
);
Op
op
;
Op
op
;
float32x4_t
init
;
float32x4_t
init
=
vdupq_n_f32
(
0.
f
);
if
(
bias_mode
==
BiasMode
::
NO_BIAS
)
{
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vdupq_n_f32
(
0.
f
);
}
else
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vld1q_f32
(
bias
);
init
=
vld1q_f32
(
bias
);
}
}
size_t
oh_start
=
(
PH
+
1
)
/
2
;
size_t
oh_start
=
(
PH
+
1
)
/
2
;
...
@@ -914,10 +904,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride2_5x5(
...
@@ -914,10 +904,8 @@ void channel_wise_nchw44_float::do_conv_kern_stride2_5x5(
const
size_t
IH
,
const
size_t
IW
,
const
size_t
OH
,
const
size_t
OW
,
const
size_t
IH
,
const
size_t
IW
,
const
size_t
OH
,
const
size_t
OW
,
const
size_t
PH
,
const
size_t
PW
)
{
const
size_t
PH
,
const
size_t
PW
)
{
Op
op
;
Op
op
;
float32x4_t
init
;
float32x4_t
init
=
vdupq_n_f32
(
0.
f
);
if
(
bias_mode
==
BiasMode
::
NO_BIAS
)
{
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vdupq_n_f32
(
0.
f
);
}
else
if
(
bias_mode
==
BiasMode
::
BROADCAST_CHANNEL_BIAS
)
{
init
=
vld1q_f32
(
bias
);
init
=
vld1q_f32
(
bias
);
}
}
constexpr
size_t
stride
=
2
;
constexpr
size_t
stride
=
2
;
...
...
scripts/whl/macos/macos_whl_env_prepare.sh
浏览文件 @
66c18f60
...
@@ -20,7 +20,7 @@ function try_install_brew() {
...
@@ -20,7 +20,7 @@ function try_install_brew() {
}
}
function
install_brew_package
()
{
function
install_brew_package
()
{
BREW_PACKAGE
=
"openssl readline sqlite3 xz gdbm zlib pyenv wget swig coreutils llvm git-lfs ninja"
BREW_PACKAGE
=
"openssl readline sqlite3 xz gdbm zlib pyenv wget swig coreutils llvm git-lfs ninja
bzip2
"
for
pak
in
${
BREW_PACKAGE
}
for
pak
in
${
BREW_PACKAGE
}
do
do
echo
"###### do command: brew install
${
pak
}
"
echo
"###### do command: brew install
${
pak
}
"
...
@@ -55,8 +55,19 @@ function install_python_package() {
...
@@ -55,8 +55,19 @@ function install_python_package() {
if
[
-e
/Users/
${
USER
}
/.pyenv/versions/
${
pak
}
]
;
then
if
[
-e
/Users/
${
USER
}
/.pyenv/versions/
${
pak
}
]
;
then
echo
"FOUND install /Users/
${
USER
}
/.pyenv/versions/
${
pak
}
strip it..."
echo
"FOUND install /Users/
${
USER
}
/.pyenv/versions/
${
pak
}
strip it..."
else
else
env
PYTHON_CONFIGURE_OPTS
=
"--enable-shared"
pyenv
install
${
pak
}
os_ver
=
$(
sw_vers
-productVersion
|
awk
'{print int($0)}'
)
if
[
$a
-lt
11
]
;
then
env
PYTHON_CONFIGURE_OPTS
=
"--enable-shared"
pyenv
install
${
pak
}
else
PYTHON_CONFIGURE_OPTS
=
"--enable-shared"
\
CFLAGS
=
"-I
$(
brew
--prefix
openssl
)
/include -I
$(
brew
--prefix
bzip2
)
/include
\
-I
$(
brew
--prefix
readline
)
/include -I
$(
xcrun
--show-sdk-path
)
/usr/include"
\
LDFLAGS
=
"-L
$(
brew
--prefix
openssl
)
/lib -L
$(
brew
--prefix
readline
)
/lib -L
$(
brew
--prefix
zlib
)
/lib -L
$(
brew
--prefix
bzip2
)
/lib"
\
pyenv
install
--patch
${
pak
}
< <
(
curl
-sSL
https://github.com/python/cpython/commit/8ea6353.patch
\?
full_index
\=
1
)
fi
fi
fi
echo
"###### do command: /Users/
${
USER
}
/.pyenv/versions/
${
pak
}
/bin/python3 -m pip install --upgrade pip"
/Users/
${
USER
}
/.pyenv/versions/
${
pak
}
/bin/python3
-m
pip
install
--upgrade
pip
echo
"###### do command: /Users/
$USER
/.pyenv/versions/
${
pak
}
/bin/python3 -m pip install -r
${
SRC_DIR
}
/imperative/python/requires.txt"
echo
"###### do command: /Users/
$USER
/.pyenv/versions/
${
pak
}
/bin/python3 -m pip install -r
${
SRC_DIR
}
/imperative/python/requires.txt"
/Users/
$USER
/.pyenv/versions/
${
pak
}
/bin/python3
-m
pip
install
-r
${
SRC_DIR
}
/imperative/python/requires.txt
/Users/
$USER
/.pyenv/versions/
${
pak
}
/bin/python3
-m
pip
install
-r
${
SRC_DIR
}
/imperative/python/requires.txt
done
done
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录