Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
6ff35e17
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 2 年 前同步成功
通知
2325
Star
20933
Fork
5424
代码
文件
提交
分支
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看板
未验证
提交
6ff35e17
编写于
5月 06, 2022
作者:
W
Weilong Wu
提交者:
GitHub
5月 06, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Eager] Enabled several ops test under eager mode (#42510)
上级
c043a21b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
54 addition
and
12 deletion
+54
-12
python/paddle/distributed/models/moe/utils.py
python/paddle/distributed/models/moe/utils.py
+19
-7
python/paddle/fluid/tests/unittests/test_assign_pos_op.py
python/paddle/fluid/tests/unittests/test_assign_pos_op.py
+7
-1
python/paddle/fluid/tests/unittests/test_limit_by_capacity_op.py
...paddle/fluid/tests/unittests/test_limit_by_capacity_op.py
+7
-1
python/paddle/fluid/tests/unittests/test_number_count_op.py
python/paddle/fluid/tests/unittests/test_number_count_op.py
+7
-1
python/paddle/fluid/tests/unittests/test_prune_gate_by_capacity_op.py
...e/fluid/tests/unittests/test_prune_gate_by_capacity_op.py
+7
-1
python/paddle/fluid/tests/unittests/test_random_routing_op.py
...on/paddle/fluid/tests/unittests/test_random_routing_op.py
+7
-1
未找到文件。
python/paddle/distributed/models/moe/utils.py
浏览文件 @
6ff35e17
...
@@ -14,8 +14,9 @@
...
@@ -14,8 +14,9 @@
from
paddle.fluid
import
core
from
paddle.fluid
import
core
from
paddle.fluid.layer_helper
import
LayerHelper
from
paddle.fluid.layer_helper
import
LayerHelper
from
paddle.fluid.framework
import
_non_static_mode
from
paddle.fluid.framework
import
_non_static_mode
,
_in_legacy_dygraph
,
in_dygraph_mode
from
paddle.fluid.data_feeder
import
check_variable_and_dtype
from
paddle.fluid.data_feeder
import
check_variable_and_dtype
from
paddle
import
_C_ops
def
_number_count
(
numbers
,
upper_range
):
def
_number_count
(
numbers
,
upper_range
):
...
@@ -40,7 +41,9 @@ def _number_count(numbers, upper_range):
...
@@ -40,7 +41,9 @@ def _number_count(numbers, upper_range):
number_count = paddle.distributed.utils.number_count(numbers, upper_range)
number_count = paddle.distributed.utils.number_count(numbers, upper_range)
print(number_count) # the result: [2, 0, 2, 0, 0, 0]
print(number_count) # the result: [2, 0, 2, 0, 0, 0]
"""
"""
if
_non_static_mode
():
if
in_dygraph_mode
():
return
_C_ops
.
number_count
(
numbers
,
'upper_range'
,
upper_range
)
elif
_in_legacy_dygraph
():
return
core
.
ops
.
number_count
(
numbers
,
'upper_range'
,
upper_range
)
return
core
.
ops
.
number_count
(
numbers
,
'upper_range'
,
upper_range
)
else
:
else
:
op_type
=
'number_count'
op_type
=
'number_count'
...
@@ -86,7 +89,9 @@ def _assign_pos(x, cum_count):
...
@@ -86,7 +89,9 @@ def _assign_pos(x, cum_count):
pos = paddle.distributed.utils.assign_pos(x=numbers, cum_count=num_cum)
pos = paddle.distributed.utils.assign_pos(x=numbers, cum_count=num_cum)
print(pos) # the result: (2, 0, 3, 1)
print(pos) # the result: (2, 0, 3, 1)
"""
"""
if
_non_static_mode
():
if
in_dygraph_mode
():
return
_C_ops
.
assign_pos
(
x
,
cum_count
,
cum_count
[
-
1
])
elif
_in_legacy_dygraph
():
return
core
.
ops
.
assign_pos
(
x
,
cum_count
,
cum_count
[
-
1
])
return
core
.
ops
.
assign_pos
(
x
,
cum_count
,
cum_count
[
-
1
])
else
:
else
:
op_type
=
'assign_pos'
op_type
=
'assign_pos'
...
@@ -120,7 +125,9 @@ def _random_routing(topk_idx, topk_value, prob, topk=2):
...
@@ -120,7 +125,9 @@ def _random_routing(topk_idx, topk_value, prob, topk=2):
prob: random prob, shape=(topk_idx.shape[0],)
prob: random prob, shape=(topk_idx.shape[0],)
"""
"""
if
topk
==
2
:
if
topk
==
2
:
if
_non_static_mode
():
if
in_dygraph_mode
():
return
_C_ops
.
random_routing
(
prob
,
topk_value
,
topk_idx
)
elif
_in_legacy_dygraph
():
return
core
.
ops
.
random_routing
(
prob
,
topk_value
,
topk_idx
)
return
core
.
ops
.
random_routing
(
prob
,
topk_value
,
topk_idx
)
else
:
else
:
raise
RuntimeError
(
"Not supporting static mode now"
)
raise
RuntimeError
(
"Not supporting static mode now"
)
...
@@ -149,7 +156,10 @@ def _limit_by_capacity(expert_count, capacity, n_worker):
...
@@ -149,7 +156,10 @@ def _limit_by_capacity(expert_count, capacity, n_worker):
out = paddle.distributed.utils.limit_by_capacity(expert_count, capacity, n_work)
out = paddle.distributed.utils.limit_by_capacity(expert_count, capacity, n_work)
print(out) # the result: [1, 2, 2, 4, 3, 3]
print(out) # the result: [1, 2, 2, 4, 3, 3]
"""
"""
if
_non_static_mode
():
if
in_dygraph_mode
():
return
_C_ops
.
limit_by_capacity
(
expert_count
,
capacity
,
'n_worker'
,
n_worker
)
elif
_in_legacy_dygraph
():
return
core
.
ops
.
limit_by_capacity
(
expert_count
,
capacity
,
'n_worker'
,
return
core
.
ops
.
limit_by_capacity
(
expert_count
,
capacity
,
'n_worker'
,
n_worker
)
n_worker
)
else
:
else
:
...
@@ -192,8 +202,10 @@ def _prune_gate_by_capacity(gate_idx, expert_count, n_expert, n_worker):
...
@@ -192,8 +202,10 @@ def _prune_gate_by_capacity(gate_idx, expert_count, n_expert, n_worker):
# Tensor(shape=[8], dtype=int32, place=CUDAPlace(0), stop_gradient=True,
# Tensor(shape=[8], dtype=int32, place=CUDAPlace(0), stop_gradient=True,
[1, 3, 3, 3, -1, 2, 1, 1])
[1, 3, 3, 3, -1, 2, 1, 1])
"""
"""
if
in_dygraph_mode
():
if
_non_static_mode
():
return
_C_ops
.
prune_gate_by_capacity
(
gate_idx
,
expert_count
,
"n_expert"
,
n_expert
,
"n_worker"
,
n_worker
)
elif
_in_legacy_dygraph
():
return
core
.
ops
.
prune_gate_by_capacity
(
return
core
.
ops
.
prune_gate_by_capacity
(
gate_idx
,
expert_count
,
"n_expert"
,
n_expert
,
"n_worker"
,
n_worker
)
gate_idx
,
expert_count
,
"n_expert"
,
n_expert
,
"n_worker"
,
n_worker
)
check_variable_and_dtype
(
gate_idx
,
'GateIdx'
,
[
'int32'
,
'int64'
],
check_variable_and_dtype
(
gate_idx
,
'GateIdx'
,
[
'int32'
,
'int64'
],
...
...
python/paddle/fluid/tests/unittests/test_assign_pos_op.py
浏览文件 @
6ff35e17
...
@@ -24,6 +24,7 @@ import paddle.fluid as fluid
...
@@ -24,6 +24,7 @@ import paddle.fluid as fluid
from
paddle.fluid
import
compiler
,
Program
,
program_guard
from
paddle.fluid
import
compiler
,
Program
,
program_guard
from
paddle.fluid.backward
import
append_backward
from
paddle.fluid.backward
import
append_backward
from
paddle.distributed.models.moe
import
utils
from
paddle.distributed.models.moe
import
utils
from
paddle.fluid.framework
import
_test_eager_guard
def
assign_pos
(
x
,
_cum_count
):
def
assign_pos
(
x
,
_cum_count
):
...
@@ -117,7 +118,7 @@ class TestAssignPosAPI(unittest.TestCase):
...
@@ -117,7 +118,7 @@ class TestAssignPosAPI(unittest.TestCase):
fetch_list
=
[
out
])
fetch_list
=
[
out
])
assert_allclose
(
res
[
0
],
self
.
out
,
self
.
cum_count
)
assert_allclose
(
res
[
0
],
self
.
out
,
self
.
cum_count
)
def
test
_api_dygraph
(
self
):
def
func
_api_dygraph
(
self
):
paddle
.
disable_static
()
paddle
.
disable_static
()
x
=
paddle
.
to_tensor
(
self
.
x
)
x
=
paddle
.
to_tensor
(
self
.
x
)
cum_count
=
paddle
.
to_tensor
(
self
.
cum_count
).
astype
(
x
.
dtype
)
cum_count
=
paddle
.
to_tensor
(
self
.
cum_count
).
astype
(
x
.
dtype
)
...
@@ -125,6 +126,11 @@ class TestAssignPosAPI(unittest.TestCase):
...
@@ -125,6 +126,11 @@ class TestAssignPosAPI(unittest.TestCase):
out
=
utils
.
_assign_pos
(
x
,
cum_count
)
out
=
utils
.
_assign_pos
(
x
,
cum_count
)
assert_allclose
(
out
.
numpy
(),
self
.
out
,
self
.
cum_count
)
assert_allclose
(
out
.
numpy
(),
self
.
out
,
self
.
cum_count
)
def
test_api_dygraph
(
self
):
with
_test_eager_guard
():
self
.
func_api_dygraph
()
self
.
func_api_dygraph
()
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
paddle
.
enable_static
()
paddle
.
enable_static
()
...
...
python/paddle/fluid/tests/unittests/test_limit_by_capacity_op.py
浏览文件 @
6ff35e17
...
@@ -17,6 +17,7 @@ import paddle
...
@@ -17,6 +17,7 @@ import paddle
import
numpy
as
np
import
numpy
as
np
from
paddle.distributed.models.moe
import
utils
from
paddle.distributed.models.moe
import
utils
from
paddle.fluid
import
core
from
paddle.fluid
import
core
from
paddle.fluid.framework
import
_test_eager_guard
def
limit_by_capacity
(
expert_count
,
_capacity
,
n_worker
):
def
limit_by_capacity
(
expert_count
,
_capacity
,
n_worker
):
...
@@ -77,7 +78,7 @@ class TestLimitByCapacityInt64API(unittest.TestCase):
...
@@ -77,7 +78,7 @@ class TestLimitByCapacityInt64API(unittest.TestCase):
assert
all_close
(
self
.
out
,
res
[
0
],
self
.
n_worker
)
assert
all_close
(
self
.
out
,
res
[
0
],
self
.
n_worker
)
def
test
_dygraph_api
(
self
):
def
func
_dygraph_api
(
self
):
paddle
.
disable_static
(
self
.
place
)
paddle
.
disable_static
(
self
.
place
)
capacity
=
paddle
.
to_tensor
(
self
.
capacity
)
capacity
=
paddle
.
to_tensor
(
self
.
capacity
)
expert_count_tensor
=
paddle
.
to_tensor
(
self
.
expert_count
)
expert_count_tensor
=
paddle
.
to_tensor
(
self
.
expert_count
)
...
@@ -85,6 +86,11 @@ class TestLimitByCapacityInt64API(unittest.TestCase):
...
@@ -85,6 +86,11 @@ class TestLimitByCapacityInt64API(unittest.TestCase):
self
.
n_worker
)
self
.
n_worker
)
assert
all_close
(
self
.
out
,
out
.
numpy
(),
self
.
n_worker
)
assert
all_close
(
self
.
out
,
out
.
numpy
(),
self
.
n_worker
)
def
test_dygraph_api
(
self
):
with
_test_eager_guard
():
self
.
func_dygraph_api
()
self
.
func_dygraph_api
()
@
unittest
.
skipIf
(
not
core
.
is_compiled_with_cuda
(),
@
unittest
.
skipIf
(
not
core
.
is_compiled_with_cuda
(),
"core is not compiled with CUDA"
)
"core is not compiled with CUDA"
)
...
...
python/paddle/fluid/tests/unittests/test_number_count_op.py
浏览文件 @
6ff35e17
...
@@ -24,6 +24,7 @@ import paddle.fluid as fluid
...
@@ -24,6 +24,7 @@ import paddle.fluid as fluid
from
paddle.fluid
import
compiler
,
Program
,
program_guard
from
paddle.fluid
import
compiler
,
Program
,
program_guard
from
paddle.fluid.backward
import
append_backward
from
paddle.fluid.backward
import
append_backward
from
paddle.distributed.models.moe
import
utils
from
paddle.distributed.models.moe
import
utils
from
paddle.fluid.framework
import
_test_eager_guard
def
count
(
x
,
upper_num
):
def
count
(
x
,
upper_num
):
...
@@ -68,12 +69,17 @@ class TestNumberCountAPI(unittest.TestCase):
...
@@ -68,12 +69,17 @@ class TestNumberCountAPI(unittest.TestCase):
res
=
exe
.
run
(
feed
=
{
'x'
:
self
.
x
},
fetch_list
=
[
out
])
res
=
exe
.
run
(
feed
=
{
'x'
:
self
.
x
},
fetch_list
=
[
out
])
assert
np
.
allclose
(
res
,
self
.
out
)
assert
np
.
allclose
(
res
,
self
.
out
)
def
test
_api_dygraph
(
self
):
def
func
_api_dygraph
(
self
):
paddle
.
disable_static
()
paddle
.
disable_static
()
x
=
paddle
.
to_tensor
(
self
.
x
)
x
=
paddle
.
to_tensor
(
self
.
x
)
out
=
utils
.
_number_count
(
x
,
self
.
upper_num
)
out
=
utils
.
_number_count
(
x
,
self
.
upper_num
)
assert
np
.
allclose
(
out
.
numpy
(),
self
.
out
)
assert
np
.
allclose
(
out
.
numpy
(),
self
.
out
)
def
test_api_dygraph
(
self
):
with
_test_eager_guard
():
self
.
func_api_dygraph
()
self
.
func_api_dygraph
()
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
paddle
.
enable_static
()
paddle
.
enable_static
()
...
...
python/paddle/fluid/tests/unittests/test_prune_gate_by_capacity_op.py
浏览文件 @
6ff35e17
...
@@ -17,6 +17,7 @@ import paddle
...
@@ -17,6 +17,7 @@ import paddle
import
numpy
as
np
import
numpy
as
np
from
paddle.distributed.models.moe
import
utils
from
paddle.distributed.models.moe
import
utils
from
paddle.fluid
import
core
from
paddle.fluid
import
core
from
paddle.fluid.framework
import
_test_eager_guard
def
count
(
x
,
upper_num
):
def
count
(
x
,
upper_num
):
...
@@ -102,7 +103,7 @@ class TestPruneGateByCapacityAPI1(unittest.TestCase):
...
@@ -102,7 +103,7 @@ class TestPruneGateByCapacityAPI1(unittest.TestCase):
fetch_list
=
out
)
fetch_list
=
out
)
assert_allclose
(
res
[
0
],
self
.
out
,
self
.
n_expert
)
assert_allclose
(
res
[
0
],
self
.
out
,
self
.
n_expert
)
def
test
_dygraph_api
(
self
):
def
func
_dygraph_api
(
self
):
paddle
.
disable_static
(
self
.
place
)
paddle
.
disable_static
(
self
.
place
)
gate_idx_tensor
=
paddle
.
to_tensor
(
self
.
gate_idx
)
gate_idx_tensor
=
paddle
.
to_tensor
(
self
.
gate_idx
)
expert_count_tensor
=
paddle
.
to_tensor
(
self
.
expert_count
)
expert_count_tensor
=
paddle
.
to_tensor
(
self
.
expert_count
)
...
@@ -110,6 +111,11 @@ class TestPruneGateByCapacityAPI1(unittest.TestCase):
...
@@ -110,6 +111,11 @@ class TestPruneGateByCapacityAPI1(unittest.TestCase):
gate_idx_tensor
,
expert_count_tensor
,
self
.
n_expert
,
self
.
n_worker
)
gate_idx_tensor
,
expert_count_tensor
,
self
.
n_expert
,
self
.
n_worker
)
assert_allclose
(
out
.
numpy
(),
self
.
out
,
self
.
n_expert
)
assert_allclose
(
out
.
numpy
(),
self
.
out
,
self
.
n_expert
)
def
test_dygraph_api
(
self
):
with
_test_eager_guard
():
self
.
func_dygraph_api
()
self
.
func_dygraph_api
()
@
unittest
.
skipIf
(
not
core
.
is_compiled_with_cuda
(),
@
unittest
.
skipIf
(
not
core
.
is_compiled_with_cuda
(),
"core is not compiled with CUDA"
)
"core is not compiled with CUDA"
)
...
...
python/paddle/fluid/tests/unittests/test_random_routing_op.py
浏览文件 @
6ff35e17
...
@@ -24,6 +24,7 @@ import paddle.fluid as fluid
...
@@ -24,6 +24,7 @@ import paddle.fluid as fluid
from
paddle.fluid
import
compiler
,
Program
,
program_guard
from
paddle.fluid
import
compiler
,
Program
,
program_guard
from
paddle.fluid.backward
import
append_backward
from
paddle.fluid.backward
import
append_backward
from
paddle.distributed.models.moe
import
utils
from
paddle.distributed.models.moe
import
utils
from
paddle.fluid.framework
import
_test_eager_guard
def
random_routing
(
topk_idx
,
topk_value
,
prob
,
topk
=
2
):
def
random_routing
(
topk_idx
,
topk_value
,
prob
,
topk
=
2
):
...
@@ -55,7 +56,7 @@ class TestNumberCountAPIFp32(unittest.TestCase):
...
@@ -55,7 +56,7 @@ class TestNumberCountAPIFp32(unittest.TestCase):
self
.
prob
).
astype
(
self
.
dtype
)
self
.
prob
).
astype
(
self
.
dtype
)
self
.
place
=
paddle
.
CUDAPlace
(
0
)
self
.
place
=
paddle
.
CUDAPlace
(
0
)
def
test
_api_dygraph
(
self
):
def
func
_api_dygraph
(
self
):
paddle
.
disable_static
()
paddle
.
disable_static
()
x
=
paddle
.
to_tensor
(
self
.
x
)
x
=
paddle
.
to_tensor
(
self
.
x
)
value
=
paddle
.
to_tensor
(
self
.
topk_value
)
value
=
paddle
.
to_tensor
(
self
.
topk_value
)
...
@@ -63,6 +64,11 @@ class TestNumberCountAPIFp32(unittest.TestCase):
...
@@ -63,6 +64,11 @@ class TestNumberCountAPIFp32(unittest.TestCase):
out
=
utils
.
_random_routing
(
x
,
value
,
prob
)
out
=
utils
.
_random_routing
(
x
,
value
,
prob
)
assert
np
.
allclose
(
out
.
numpy
(),
self
.
out
)
assert
np
.
allclose
(
out
.
numpy
(),
self
.
out
)
def
test_api_dygraph
(
self
):
with
_test_eager_guard
():
self
.
func_api_dygraph
()
self
.
func_api_dygraph
()
@
unittest
.
skipIf
(
not
core
.
is_compiled_with_cuda
(),
@
unittest
.
skipIf
(
not
core
.
is_compiled_with_cuda
(),
"core is not compiled with CUDA"
)
"core is not compiled with CUDA"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录