Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
f5e78a11
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f5e78a11
编写于
4月 26, 2022
作者:
P
pangyoki
提交者:
jzhang533
4月 27, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cherry-pick-PR42295, fix collections.Iterable in python3.10
上级
880c2a94
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
3 deletion
+14
-3
python/paddle/distribution/multinomial.py
python/paddle/distribution/multinomial.py
+5
-1
python/paddle/fluid/layers/nn.py
python/paddle/fluid/layers/nn.py
+4
-1
python/paddle/framework/io.py
python/paddle/framework/io.py
+5
-1
未找到文件。
python/paddle/distribution/multinomial.py
浏览文件 @
f5e78a11
...
...
@@ -16,6 +16,10 @@ import collections
import
paddle
from
paddle.distribution
import
categorical
,
distribution
try
:
from
collections.abc
import
Iterable
except
:
from
collections
import
Iterable
class
Multinomial
(
distribution
.
Distribution
):
...
...
@@ -138,7 +142,7 @@ class Multinomial(distribution.Distribution):
Args:
sample_shape (tuple, optional): [description]. Defaults to ().
"""
if
not
isinstance
(
shape
,
collections
.
Iterable
):
if
not
isinstance
(
shape
,
Iterable
):
raise
TypeError
(
'sample shape must be Iterable object.'
)
samples
=
self
.
_categorical
.
sample
([
self
.
total_count
,
]
+
list
(
shape
))
...
...
python/paddle/fluid/layers/nn.py
浏览文件 @
f5e78a11
...
...
@@ -6754,7 +6754,10 @@ def lod_append(x, level):
x = fluid.layers.data(name='x', shape=[6, 10], lod_level=1)
out = fluid.layers.lod_append(x, [1,1,1,1,1,1])
"""
from collections import Iterable
try:
from collections.abc import Iterable
except:
from collections import Iterable
if x is None:
raise ValueError("Input(x) can't be None.")
if (not isinstance(level, Iterable)) and (not isinstance(level, Variable)):
...
...
python/paddle/framework/io.py
浏览文件 @
f5e78a11
...
...
@@ -34,6 +34,10 @@ from paddle.fluid.framework import Variable, _varbase_creator, _dygraph_tracer,
from
paddle.fluid.dygraph.jit
import
_SaveLoadConfig
from
paddle.fluid.dygraph.io
import
_construct_program_holders
,
_construct_params_and_buffers
from
paddle.fluid.dygraph.io
import
INFER_MODEL_SUFFIX
,
INFER_PARAMS_SUFFIX
,
INFER_PARAMS_INFO_SUFFIX
try
:
from
collections.abc
import
Iterable
except
:
from
collections
import
Iterable
__all__
=
[]
...
...
@@ -424,7 +428,7 @@ def _parse_every_object(obj, condition_func, convert_func):
elif
type
(
obj
)
==
set
:
return
set
(
_parse_every_object
(
list
(
obj
),
condition_func
,
convert_func
))
else
:
if
isinstance
(
obj
,
collections
.
Iterable
)
and
not
isinstance
(
if
isinstance
(
obj
,
Iterable
)
and
not
isinstance
(
obj
,
(
str
,
np
.
ndarray
,
core
.
VarBase
,
core
.
eager
.
Tensor
,
core
.
LoDTensor
)):
raise
NotImplementedError
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录