Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
1d9cb932
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1d9cb932
编写于
8月 27, 2018
作者:
Q
Qiyang Min
提交者:
GitHub
8月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12989 from velconia/fix_last_of_py3
Fix random diff between python2 and python3
上级
320451d6
312f3b86
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
26 deletion
+26
-26
python/paddle/dataset/movielens.py
python/paddle/dataset/movielens.py
+3
-2
python/paddle/fluid/layers/nn.py
python/paddle/fluid/layers/nn.py
+21
-21
python/paddle/fluid/transpiler/distribute_transpiler.py
python/paddle/fluid/transpiler/distribute_transpiler.py
+2
-3
未找到文件。
python/paddle/dataset/movielens.py
浏览文件 @
1d9cb932
...
@@ -24,6 +24,7 @@ set and test set into paddle reader creators.
...
@@ -24,6 +24,7 @@ set and test set into paddle reader creators.
from
__future__
import
print_function
from
__future__
import
print_function
import
numpy
as
np
import
zipfile
import
zipfile
import
paddle.dataset.common
import
paddle.dataset.common
import
re
import
re
...
@@ -150,12 +151,12 @@ def __initialize_meta_info__():
...
@@ -150,12 +151,12 @@ def __initialize_meta_info__():
def
__reader__
(
rand_seed
=
0
,
test_ratio
=
0.1
,
is_test
=
False
):
def
__reader__
(
rand_seed
=
0
,
test_ratio
=
0.1
,
is_test
=
False
):
fn
=
__initialize_meta_info__
()
fn
=
__initialize_meta_info__
()
rand
=
random
.
Random
(
x
=
rand_seed
)
np
.
random
.
seed
(
rand_seed
)
with
zipfile
.
ZipFile
(
file
=
fn
)
as
package
:
with
zipfile
.
ZipFile
(
file
=
fn
)
as
package
:
with
package
.
open
(
'ml-1m/ratings.dat'
)
as
rating
:
with
package
.
open
(
'ml-1m/ratings.dat'
)
as
rating
:
for
line
in
rating
:
for
line
in
rating
:
line
=
cpt
.
to_text
(
line
,
encoding
=
'latin'
)
line
=
cpt
.
to_text
(
line
,
encoding
=
'latin'
)
if
(
rand
.
random
()
<
test_ratio
)
==
is_test
:
if
(
np
.
random
.
random
()
<
test_ratio
)
==
is_test
:
uid
,
mov_id
,
rating
,
_
=
line
.
strip
().
split
(
"::"
)
uid
,
mov_id
,
rating
,
_
=
line
.
strip
().
split
(
"::"
)
uid
=
int
(
uid
)
uid
=
int
(
uid
)
mov_id
=
int
(
mov_id
)
mov_id
=
int
(
mov_id
)
...
...
python/paddle/fluid/layers/nn.py
浏览文件 @
1d9cb932
...
@@ -17,6 +17,7 @@ All layers just related to the neural network.
...
@@ -17,6 +17,7 @@ All layers just related to the neural network.
from
__future__
import
print_function
from
__future__
import
print_function
import
numpy
as
np
from
..layer_helper
import
LayerHelper
from
..layer_helper
import
LayerHelper
from
..initializer
import
Normal
,
Constant
from
..initializer
import
Normal
,
Constant
from
..framework
import
Variable
from
..framework
import
Variable
...
@@ -24,7 +25,6 @@ from ..param_attr import ParamAttr
...
@@ -24,7 +25,6 @@ from ..param_attr import ParamAttr
from
.layer_function_generator
import
autodoc
,
templatedoc
from
.layer_function_generator
import
autodoc
,
templatedoc
from
.tensor
import
concat
from
.tensor
import
concat
from
.
import
utils
from
.
import
utils
import
random
from
..
import
unique_name
from
..
import
unique_name
from
functools
import
reduce
from
functools
import
reduce
...
@@ -5102,7 +5102,7 @@ def random_crop(x, shape, seed=None):
...
@@ -5102,7 +5102,7 @@ def random_crop(x, shape, seed=None):
dtype
=
x
.
dtype
dtype
=
x
.
dtype
out
=
helper
.
create_tmp_variable
(
dtype
)
out
=
helper
.
create_tmp_variable
(
dtype
)
if
seed
is
None
:
if
seed
is
None
:
seed
=
random
.
randint
(
-
65536
,
65535
)
seed
=
np
.
random
.
randint
(
-
65536
,
65536
)
op_attrs
=
{
"shape"
:
shape
}
op_attrs
=
{
"shape"
:
shape
}
if
isinstance
(
seed
,
int
):
if
isinstance
(
seed
,
int
):
op_attrs
[
"startup_seed"
]
=
seed
op_attrs
[
"startup_seed"
]
=
seed
...
...
python/paddle/fluid/transpiler/distribute_transpiler.py
浏览文件 @
1d9cb932
...
@@ -31,7 +31,6 @@ Steps to transpile pserver:
...
@@ -31,7 +31,6 @@ Steps to transpile pserver:
"""
"""
import
math
import
math
import
random
import
numpy
as
np
import
numpy
as
np
import
collections
import
collections
import
six
import
six
...
@@ -239,8 +238,8 @@ class DistributeTranspiler(object):
...
@@ -239,8 +238,8 @@ class DistributeTranspiler(object):
grad_var_mapping_items
=
list
(
six
.
iteritems
(
self
.
grad_var_mapping
))
grad_var_mapping_items
=
list
(
six
.
iteritems
(
self
.
grad_var_mapping
))
if
not
self
.
config
.
slice_var_up
:
if
not
self
.
config
.
slice_var_up
:
random
.
seed
(
self
.
origin_program
.
random_seed
)
np
.
random
.
seed
(
self
.
origin_program
.
random_seed
)
random
.
shuffle
(
grad_var_mapping_items
)
np
.
random
.
shuffle
(
grad_var_mapping_items
)
grad_name_to_send_dummy_out
=
dict
()
grad_name_to_send_dummy_out
=
dict
()
for
grad_varname
,
splited_vars
in
grad_var_mapping_items
:
for
grad_varname
,
splited_vars
in
grad_var_mapping_items
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录