Fix infer (#98)

* fix esmm

* single infer -> infer

* fix increment folder repeated
Co-authored-by: Ntangwei <tangwei12@baidu.com>

models/contentunderstanding/readme.md

@@ -86,7 +86,7 @@ python -m paddlerec.run -m ./config.yaml # 自定义修改超参后，指定配
 # 修改对应模型的config.yaml, workspace配置为当前目录的绝对路径
 # 修改对应模型的config.yaml，mode配置infer_runner
 # 示例: mode: train_runner -> mode: infer_runner
-# infer_runner中 class配置为 class: single_infer
+# infer_runner中 class配置为 class: infer
 # 修改phase阶段为infer的配置，参照config注释
 
 # 修改完config.yaml后 执行:
@@ -106,7 +106,7 @@ python -m paddlerec.run -m ./config.yaml # 自定义修改超参后，指定配
 # 修改对应模型的config.yaml, workspace配置为当前目录的绝对路径
 # 修改对应模型的config.yaml，mode配置infer_runner
 # 示例: mode: train_runner -> mode: infer_runner
-# infer_runner中 class配置为 class: single_infer
+# infer_runner中 class配置为 class: infer
 # 修改phase阶段为infer的配置，参照config注释
 
 # 修改完config.yaml后 执行:

models/demo/movie_recommand/rank/config.yaml

@@ -64,8 +64,7 @@ runner:
   device: cpu
 
 - name: runner_infer
-  epochs: 1
-  class: single_infer
+  class: infer
   print_interval: 10000
   init_model_path: "increment/9" # load model path
 

models/demo/movie_recommand/recall/config.yaml

@@ -64,8 +64,7 @@ runner:
   device: cpu
 
 - name: runner_infer
-  epochs: 1
-  class: single_infer
+  class: infer
   print_interval: 10000
   init_model_path: "increment/9" # load model path
 

models/match/dssm/config.yaml

@@ -56,9 +56,7 @@ runner:
   init_model_path: "" # load model path
   print_interval: 2
 - name: infer_runner
-  class: single_infer
-  # num of epochs
-  epochs: 1
+  class: infer
   # device to run training or infer
   device: cpu
   print_interval: 1

models/match/multiview-simnet/config.yaml

@@ -63,9 +63,7 @@ runner:
   init_model_path: "" # load model path
   print_interval: 1
 - name: infer_runner
-  class: single_infer
-  # num of epochs
-  epochs: 1
+  class: infer
   # device to run training or infer
   device: cpu
   print_interval: 1

models/match/readme.md

@@ -43,7 +43,7 @@ python -m paddlerec.run -m paddlerec.models.match.multiview-simnet # multiview-s
 # 修改对应模型的config.yaml, workspace配置为当前目录的绝对路径
 # 修改对应模型的config.yaml，mode配置infer_runner
 # 示例: mode: train_runner -> mode: infer_runner
-# infer_runner中 class配置为 class: single_infer
+# infer_runner中 class配置为 class: infer
 # 修改phase阶段为infer的配置，参照config注释
 
 # 修改完config.yaml后 执行:

models/multitask/esmm/config.yaml

@@ -16,21 +16,21 @@
 workspace: "paddlerec.models.multitask.esmm"
 
 dataset:
-- name: dataset_train
-  batch_size: 1
-  type: QueueDataset
-  data_path: "{workspace}/data/train"
-  data_converter: "{workspace}/esmm_reader.py"
-- name: dataset_infer
-  batch_size: 1
-  type: QueueDataset
-  data_path: "{workspace}/data/test"
-  data_converter: "{workspace}/esmm_reader.py"
+  - name: dataset_train
+    batch_size: 1
+    type: QueueDataset
+    data_path: "{workspace}/data/train"
+    data_converter: "{workspace}/esmm_reader.py"
+  - name: dataset_infer
+    batch_size: 1
+    type: QueueDataset
+    data_path: "{workspace}/data/test"
+    data_converter: "{workspace}/esmm_reader.py"
 
 hyper_parameters:
   vocab_size: 10000
   embed_size: 128
-  optimizer: 
+  optimizer:
     class: adam
     learning_rate: 0.001
     strategy: async
@@ -39,30 +39,29 @@ hyper_parameters:
 mode: [train_runner, infer_runner]
 
 runner:
-- name: train_runner
-  class: train
-  device: cpu
-  epochs: 3
-  save_checkpoint_interval: 2
-  save_inference_interval: 4
-  save_checkpoint_path: "increment"
-  save_inference_path: "inference"
-  print_interval: 10
-  phases: [train]
-- name: infer_runner
-  class: infer
-  init_model_path: "increment/0"
-  device: cpu
-  epochs: 1
-  print_interval: 1
-  phases: [infer]
+  - name: train_runner
+    class: train
+    device: cpu
+    epochs: 3
+    save_checkpoint_interval: 2
+    save_inference_interval: 4
+    save_checkpoint_path: "increment"
+    save_inference_path: "inference"
+    print_interval: 10
+    phases: [train]
+  - name: infer_runner
+    class: infer
+    init_model_path: "increment/1"
+    device: cpu
+    print_interval: 1
+    phases: [infer]
 
 phase:
-- name: train
-  model: "{workspace}/model.py"
-  dataset_name: dataset_train
-  thread_num: 1
-- name: infer
-  model: "{workspace}/model.py"
-  dataset_name: dataset_infer
-  thread_num: 1
+  - name: train
+    model: "{workspace}/model.py"
+    dataset_name: dataset_train
+    thread_num: 1
+  - name: infer
+    model: "{workspace}/model.py"
+    dataset_name: dataset_infer
+    thread_num: 1

models/multitask/mmoe/config.yaml

@@ -52,10 +52,9 @@ runner:
   save_inference_path: "inference"
   print_interval: 10
 - name: infer_runner
-  class: single_infer
+  class: infer
   init_model_path: "increment/0"
   device: cpu
-  epochs: 3
 
 phase:
 - name: train

models/multitask/readme.md

@@ -77,7 +77,7 @@ python -m paddlerec.run -m ./config.yaml # 自定义修改超参后，指定配
 # 修改对应模型的config.yaml, workspace配置为当前目录的绝对路径
 # 修改对应模型的config.yaml，mode配置infer_runner
 # 示例: mode: train_runner -> mode: infer_runner
-# infer_runner中 class配置为 class: single_infer
+# infer_runner中 class配置为 class: infer
 # 修改phase阶段为infer的配置，参照config注释
 
 # 修改完config.yaml后 执行:

models/multitask/share-bottom/config.yaml

@@ -51,10 +51,9 @@ runner:
   save_inference_path: "inference"
   print_interval: 5
 - name: infer_runner
-  class: single_infer
+  class: infer
   init_model_path: "increment/0"
   device: cpu
-  epochs: 3
 
 phase:
 - name: train

models/rank/afm/config.yaml

@@ -59,8 +59,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/dcn/config.yaml

@@ -60,7 +60,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
+    class: infer
     epochs: 1
     device: cpu
     init_model_path: "increment/0"

models/rank/deep_crossing/config.yaml

@@ -58,8 +58,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/deepfm/config.yaml

@@ -58,8 +58,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/din/config.yaml

@@ -56,8 +56,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/ffm/config.yaml

@@ -57,8 +57,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/fgcnn/config.yaml

@@ -62,8 +62,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/fm/config.yaml

@@ -57,8 +57,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/fnn/config.yaml

@@ -68,8 +68,7 @@ runner:
     save_inference_path: "inference_fnn"
     print_interval: 1
   - name: infer_runner
-    trainer_class: single_infer
-    epochs: 1
+    trainer_class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/logistic_regression/config.yaml

@@ -56,8 +56,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/nfm/config.yaml

@@ -63,8 +63,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/pnn/config.yaml

@@ -60,8 +60,7 @@ runner:
     save_inference_path: "inference"
     print_interval: 1
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
     print_interval: 1

models/rank/readme.md

@@ -98,7 +98,7 @@ python -m paddlerec.run -m ./config.yaml
 ```
 # 修改对应模型的config.yaml，mode配置infer_runner
 # 示例: mode: runner1 -> mode: infer_runner
-# infer_runner中 class配置为 class: single_infer
+# infer_runner中 class配置为 class: infer
 # 如果训练阶段和预测阶段的模型输入一致，phase不需要改动，复用train的即可
 
 # 修改完config.yaml后 执行:

models/rank/wide_deep/config.yaml

@@ -54,8 +54,7 @@ runner:
     save_checkpoint_path: "increment"
     save_inference_path: "inference"
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
 

models/rank/xdeepfm/config.yaml

@@ -55,8 +55,7 @@ runner:
     save_checkpoint_path: "increment"
     save_inference_path: "inference"
   - name: infer_runner
-    class: single_infer
-    epochs: 1
+    class: infer
     device: cpu
     init_model_path: "increment/0"
 

models/recall/gnn/config.yaml

@@ -61,9 +61,7 @@ runner:
   init_model_path: "" # load model path
   print_interval: 1
 - name: infer_runner
-  class: single_infer
-  # num of epochs
-  epochs: 1
+  class: infer
   # device to run training or infer
   device: cpu
   print_interval: 1

models/recall/gru4rec/config.yaml

@@ -54,10 +54,9 @@ runner:
   save_inference_path: "inference"
   print_interval: 10
 - name: infer_runner
-  class: single_infer
+  class: infer
   init_model_path: "increment/0"
   device: cpu
-  epochs: 1
 
 phase:
 - name: train

models/recall/ncf/config.yaml

@@ -51,10 +51,9 @@ runner:
   save_inference_path: "inference"
   print_interval: 10
 - name: infer_runner
-  class: single_infer
+  class: infer
   init_model_path: "increment/0"
   device: cpu
-  epochs: 1
 
 phase:
 - name: train

models/recall/readme.md

@@ -95,7 +95,7 @@ python -m paddlerec.run -m ./config.yaml # 自定义修改超参后，指定配
 # 修改对应模型的config.yaml, workspace配置为当前目录的绝对路径
 # 修改对应模型的config.yaml，mode配置infer_runner
 # 示例: mode: train_runner -> mode: infer_runner
-# infer_runner中 class配置为 class: single_infer
+# infer_runner中 class配置为 class: infer
 # 修改phase阶段为infer的配置，参照config注释
 
 # 修改完config.yaml后 执行:

models/recall/ssr/config.yaml

@@ -50,10 +50,9 @@ runner:
   save_inference_path: "inference"
   print_interval: 10
 - name: infer_runner
-  class: single_infer
+  class: infer
   init_model_path: "increment/0"
   device: cpu
-  epochs: 1
 
 phase:
 - name: train

models/recall/word2vec/config.yaml

@@ -61,9 +61,7 @@ runner:
   init_model_path: "" # load model path
   print_interval: 1
 - name: infer_runner
-  class: single_infer
-  # num of epochs
-  epochs: 1
+  class: infer
   # device to run training or infer
   device: cpu
   init_model_path: "increment/0" # load model path

models/rerank/listwise/config.yaml

@@ -51,10 +51,9 @@ runner:
   save_checkpoint_path: "increment"
   save_inference_path: "inference"
 - name: infer_runner
-  class: single_infer
+  class: infer
   init_model_path: "increment/0"
   device: cpu
-  epochs: 3
 
 phase:
 - name: train

models/treebased/tdm/config.yaml

@@ -80,10 +80,8 @@ runner:
   print_interval: 10
 
 - name: runner2
-  class: single_infer
+  class: infer
   startup_class_path: "{workspace}/tdm_startup.py"
-  # num of epochs
-  epochs: 1
   # device to run training or infer
   device: cpu
   init_model_path: "increment/0" # load model path

tools/build_script.sh

@@ -49,7 +49,7 @@ function model_test() {
   
   root_dir=`pwd`
   all_model=$(find ${root_dir} -name config.yaml)
-  special_models=("demo" "pnn" "fgcnn" "esmm")
+  special_models=("demo" "pnn" "fgcnn" "gru4rec" "tagspace")
 
   for model in ${all_model}
   do