Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
7f06bb94
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看板
提交
7f06bb94
编写于
5月 12, 2021
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor(mge/functional): remove dependence to trace in functional implementations
GitOrigin-RevId: 0b18479fccd551a9ab2902ae5f086176e6c58d0a
上级
dac2b9e7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
9 deletion
+6
-9
imperative/python/megengine/functional/elemwise.py
imperative/python/megengine/functional/elemwise.py
+2
-3
imperative/python/megengine/functional/vision.py
imperative/python/megengine/functional/vision.py
+4
-6
未找到文件。
imperative/python/megengine/functional/elemwise.py
浏览文件 @
7f06bb94
...
@@ -16,7 +16,6 @@ from ..core.tensor import utils
...
@@ -16,7 +16,6 @@ from ..core.tensor import utils
from
..core.tensor.array_method
import
_elwise_apply
from
..core.tensor.array_method
import
_elwise_apply
from
..core.tensor.utils
import
astype
from
..core.tensor.utils
import
astype
from
..device
import
get_default_device
from
..device
import
get_default_device
from
..jit.tracing
import
is_tracing
from
..tensor
import
Tensor
from
..tensor
import
Tensor
from
..utils.deprecation
import
deprecated_func
from
..utils.deprecation
import
deprecated_func
...
@@ -560,8 +559,8 @@ def clip(x: Tensor, lower=None, upper=None) -> Tensor:
...
@@ -560,8 +559,8 @@ def clip(x: Tensor, lower=None, upper=None) -> Tensor:
),
"At least one of 'lower' or 'upper' must not be None"
),
"At least one of 'lower' or 'upper' must not be None"
if
lower
is
not
None
:
if
lower
is
not
None
:
if
upper
is
not
None
:
if
upper
is
not
None
:
if
not
is_tracing
():
# FIXME: following assertion won't work during trace if upper and lower are Tensors
assert
lower
<=
upper
,
"clip lower bound is bigger that upper bound"
#
assert lower <= upper, "clip lower bound is bigger that upper bound"
return
minimum
(
maximum
(
x
,
lower
),
upper
)
return
minimum
(
maximum
(
x
,
lower
),
upper
)
else
:
else
:
return
maximum
(
x
,
lower
)
return
maximum
(
x
,
lower
)
...
...
imperative/python/megengine/functional/vision.py
浏览文件 @
7f06bb94
...
@@ -12,7 +12,6 @@ from ..core._imperative_rt.core2 import apply
...
@@ -12,7 +12,6 @@ from ..core._imperative_rt.core2 import apply
from
..core.ops
import
builtin
from
..core.ops
import
builtin
from
..core.tensor
import
megbrain_graph
,
utils
from
..core.tensor
import
megbrain_graph
,
utils
from
..core.tensor.utils
import
astensor1d
from
..core.tensor.utils
import
astensor1d
from
..jit.tracing
import
is_tracing
from
..tensor
import
Tensor
from
..tensor
import
Tensor
from
.elemwise
import
floor
from
.elemwise
import
floor
from
.math
import
argsort
from
.math
import
argsort
...
@@ -226,6 +225,10 @@ def nms(
...
@@ -226,6 +225,10 @@ def nms(
otherwise it required to be specified; if it is not specified, all boxes are kept.
otherwise it required to be specified; if it is not specified, all boxes are kept.
:return: indices of the elements that have been kept by NMS, sorted by scores.
:return: indices of the elements that have been kept by NMS, sorted by scores.
.. note::
max_output should be specified and should have valid positive value under tracing
Examples:
Examples:
.. testcode::
.. testcode::
...
@@ -263,11 +266,6 @@ def nms(
...
@@ -263,11 +266,6 @@ def nms(
sorted_idx
=
argsort
(
scores
,
descending
=
True
)
sorted_idx
=
argsort
(
scores
,
descending
=
True
)
boxes
=
boxes
[
sorted_idx
]
boxes
=
boxes
[
sorted_idx
]
if
is_tracing
():
assert
(
max_output
is
not
None
and
max_output
>
0
),
"max_output should be specified under tracing"
if
max_output
is
None
:
if
max_output
is
None
:
max_output
=
boxes
.
shape
[
0
]
max_output
=
boxes
.
shape
[
0
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录