提交 026d344f 编写于 作者: K kinghuin

support python3 test=develop

上级 abb963df
...@@ -136,7 +136,7 @@ Paddle在API中提供了自动加载数据的模块。数据模块为 `paddle.da ...@@ -136,7 +136,7 @@ Paddle在API中提供了自动加载数据的模块。数据模块为 `paddle.da
```python ```python
import paddle import paddle
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
...@@ -152,7 +152,7 @@ print movie_info.values()[0] ...@@ -152,7 +152,7 @@ print movie_info.values()[0]
```python ```python
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
<MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])> <MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])>
...@@ -163,7 +163,7 @@ print movie_info.values()[0] ...@@ -163,7 +163,7 @@ print movie_info.values()[0]
```python ```python
user_info = paddle.dataset.movielens.user_info() user_info = paddle.dataset.movielens.user_info()
print user_info.values()[0] print(list(user_info.values())[0])
``` ```
<UserInfo id(1), gender(F), age(1), job(10)> <UserInfo id(1), gender(F), age(1), job(10)>
...@@ -216,7 +216,7 @@ train_set_creator = paddle.dataset.movielens.train() ...@@ -216,7 +216,7 @@ train_set_creator = paddle.dataset.movielens.train()
train_sample = next(train_set_creator()) train_sample = next(train_set_creator())
uid = train_sample[0] uid = train_sample[0]
mov_id = train_sample[len(user_info[uid].value())] mov_id = train_sample[len(user_info[uid].value())]
print "User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]) print("User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]))
``` ```
User <UserInfo id(1), gender(F), age(1), job(10)> rates Movie <MovieInfo id(1193), title(One Flew Over the Cuckoo's Nest ), categories(['Drama'])> with Score [5.0] User <UserInfo id(1), gender(F), age(1), job(10)> rates Movie <MovieInfo id(1193), title(One Flew Over the Cuckoo's Nest ), categories(['Drama'])> with Score [5.0]
...@@ -533,13 +533,13 @@ train_loop() ...@@ -533,13 +533,13 @@ train_loop()
```python ```python
infer_movie_id = 783 infer_movie_id = 783
infer_movie_name = paddle.dataset.movielens.movie_info()[infer_movie_id].title infer_movie_name = paddle.dataset.movielens.movie_info()[infer_movie_id].title
user_id = fluid.create_lod_tensor([[np.int64(1)]], [[1]], place) user_id = fluid.create_lod_tensor([[1]], [[1]], place)
gender_id = fluid.create_lod_tensor([[np.int64(1)]], [[1]], place) gender_id = fluid.create_lod_tensor([[1]], [[1]], place)
age_id = fluid.create_lod_tensor([[np.int64(0)]], [[1]], place) age_id = fluid.create_lod_tensor([[0]], [[1]], place)
job_id = fluid.create_lod_tensor([[np.int64(10)]], [[1]], place) job_id = fluid.create_lod_tensor([[10]], [[1]], place)
movie_id = fluid.create_lod_tensor([[np.int64(783)]], [[1]], place) # Hunchback of Notre Dame movie_id = fluid.create_lod_tensor([[783]], [[1]], place) # Hunchback of Notre Dame
category_id = fluid.create_lod_tensor([np.array([10, 8, 9], dtype='int64')], [[3]], place) # Animation, Children's, Musical category_id = fluid.create_lod_tensor([[10, 8, 9]], [[3]], place) # Animation, Children's, Musical
movie_title = fluid.create_lod_tensor([np.array([1069, 4140, 2923, 710, 988], dtype='int64')], [[5]], movie_title = fluid.create_lod_tensor([[1069, 4140, 2923, 710, 988]], [[5]],
place) # 'hunchback','of','notre','dame','the' place) # 'hunchback','of','notre','dame','the'
``` ```
......
...@@ -122,7 +122,7 @@ Paddle provides modules for automatically loading data in the API. The data modu ...@@ -122,7 +122,7 @@ Paddle provides modules for automatically loading data in the API. The data modu
```python ```python
import paddle import paddle
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
...@@ -138,7 +138,7 @@ For example, one of the movie features is: ...@@ -138,7 +138,7 @@ For example, one of the movie features is:
```python ```python
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
<MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])> <MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])>
...@@ -149,7 +149,7 @@ This means that the movie id is 1, and the title is 《Toy Story》, which is di ...@@ -149,7 +149,7 @@ This means that the movie id is 1, and the title is 《Toy Story》, which is di
```python ```python
user_info = paddle.dataset.movielens.user_info() user_info = paddle.dataset.movielens.user_info()
print user_info.values()[0] print(list(user_info.values())[0])
``` ```
<UserInfo id(1), gender(F), age(1), job(10)> <UserInfo id(1), gender(F), age(1), job(10)>
...@@ -202,7 +202,7 @@ train_set_creator = paddle.dataset.movielens.train() ...@@ -202,7 +202,7 @@ train_set_creator = paddle.dataset.movielens.train()
train_sample = next(train_set_creator()) train_sample = next(train_set_creator())
uid = train_sample[0] uid = train_sample[0]
mov_id = train_sample[len(user_info[uid].value())] mov_id = train_sample[len(user_info[uid].value())]
print "User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]) print("User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]))
``` ```
```python ```python
......
...@@ -178,7 +178,7 @@ Paddle在API中提供了自动加载数据的模块。数据模块为 `paddle.da ...@@ -178,7 +178,7 @@ Paddle在API中提供了自动加载数据的模块。数据模块为 `paddle.da
```python ```python
import paddle import paddle
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
...@@ -194,7 +194,7 @@ print movie_info.values()[0] ...@@ -194,7 +194,7 @@ print movie_info.values()[0]
```python ```python
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
<MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])> <MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])>
...@@ -205,7 +205,7 @@ print movie_info.values()[0] ...@@ -205,7 +205,7 @@ print movie_info.values()[0]
```python ```python
user_info = paddle.dataset.movielens.user_info() user_info = paddle.dataset.movielens.user_info()
print user_info.values()[0] print(list(user_info.values())[0])
``` ```
<UserInfo id(1), gender(F), age(1), job(10)> <UserInfo id(1), gender(F), age(1), job(10)>
...@@ -258,7 +258,7 @@ train_set_creator = paddle.dataset.movielens.train() ...@@ -258,7 +258,7 @@ train_set_creator = paddle.dataset.movielens.train()
train_sample = next(train_set_creator()) train_sample = next(train_set_creator())
uid = train_sample[0] uid = train_sample[0]
mov_id = train_sample[len(user_info[uid].value())] mov_id = train_sample[len(user_info[uid].value())]
print "User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]) print("User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]))
``` ```
User <UserInfo id(1), gender(F), age(1), job(10)> rates Movie <MovieInfo id(1193), title(One Flew Over the Cuckoo's Nest ), categories(['Drama'])> with Score [5.0] User <UserInfo id(1), gender(F), age(1), job(10)> rates Movie <MovieInfo id(1193), title(One Flew Over the Cuckoo's Nest ), categories(['Drama'])> with Score [5.0]
...@@ -575,13 +575,13 @@ train_loop() ...@@ -575,13 +575,13 @@ train_loop()
```python ```python
infer_movie_id = 783 infer_movie_id = 783
infer_movie_name = paddle.dataset.movielens.movie_info()[infer_movie_id].title infer_movie_name = paddle.dataset.movielens.movie_info()[infer_movie_id].title
user_id = fluid.create_lod_tensor([[np.int64(1)]], [[1]], place) user_id = fluid.create_lod_tensor([[1]], [[1]], place)
gender_id = fluid.create_lod_tensor([[np.int64(1)]], [[1]], place) gender_id = fluid.create_lod_tensor([[1]], [[1]], place)
age_id = fluid.create_lod_tensor([[np.int64(0)]], [[1]], place) age_id = fluid.create_lod_tensor([[0]], [[1]], place)
job_id = fluid.create_lod_tensor([[np.int64(10)]], [[1]], place) job_id = fluid.create_lod_tensor([[10]], [[1]], place)
movie_id = fluid.create_lod_tensor([[np.int64(783)]], [[1]], place) # Hunchback of Notre Dame movie_id = fluid.create_lod_tensor([[783]], [[1]], place) # Hunchback of Notre Dame
category_id = fluid.create_lod_tensor([np.array([10, 8, 9], dtype='int64')], [[3]], place) # Animation, Children's, Musical category_id = fluid.create_lod_tensor([[10, 8, 9]], [[3]], place) # Animation, Children's, Musical
movie_title = fluid.create_lod_tensor([np.array([1069, 4140, 2923, 710, 988], dtype='int64')], [[5]], movie_title = fluid.create_lod_tensor([[1069, 4140, 2923, 710, 988]], [[5]],
place) # 'hunchback','of','notre','dame','the' place) # 'hunchback','of','notre','dame','the'
``` ```
......
...@@ -164,7 +164,7 @@ Paddle provides modules for automatically loading data in the API. The data modu ...@@ -164,7 +164,7 @@ Paddle provides modules for automatically loading data in the API. The data modu
```python ```python
import paddle import paddle
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
...@@ -180,7 +180,7 @@ For example, one of the movie features is: ...@@ -180,7 +180,7 @@ For example, one of the movie features is:
```python ```python
movie_info = paddle.dataset.movielens.movie_info() movie_info = paddle.dataset.movielens.movie_info()
print movie_info.values()[0] print(list(movie_info.values())[0])
``` ```
<MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])> <MovieInfo id(1), title(Toy Story ), categories(['Animation', "Children's", 'Comedy'])>
...@@ -191,7 +191,7 @@ This means that the movie id is 1, and the title is 《Toy Story》, which is di ...@@ -191,7 +191,7 @@ This means that the movie id is 1, and the title is 《Toy Story》, which is di
```python ```python
user_info = paddle.dataset.movielens.user_info() user_info = paddle.dataset.movielens.user_info()
print user_info.values()[0] print(list(user_info.values())[0])
``` ```
<UserInfo id(1), gender(F), age(1), job(10)> <UserInfo id(1), gender(F), age(1), job(10)>
...@@ -244,7 +244,7 @@ train_set_creator = paddle.dataset.movielens.train() ...@@ -244,7 +244,7 @@ train_set_creator = paddle.dataset.movielens.train()
train_sample = next(train_set_creator()) train_sample = next(train_set_creator())
uid = train_sample[0] uid = train_sample[0]
mov_id = train_sample[len(user_info[uid].value())] mov_id = train_sample[len(user_info[uid].value())]
print "User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]) print("User %s rates Movie %s with Score %s"%(user_info[uid], movie_info[mov_id], train_sample[-1]))
``` ```
```python ```python
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册