From ce20dfa236a0bf874d8580a7861b7a85dffdf74c Mon Sep 17 00:00:00 2001
From: tensor-tang <tangjian03@baidu.com>
Date: Fri, 25 May 2018 15:17:06 +0800
Subject: [PATCH] enable more choices

---
 .../tests/book/test_inference_nlp.cc          | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/paddle/fluid/inference/tests/book/test_inference_nlp.cc b/paddle/fluid/inference/tests/book/test_inference_nlp.cc
index 27bdd5528ef..c942b43f174 100644
--- a/paddle/fluid/inference/tests/book/test_inference_nlp.cc
+++ b/paddle/fluid/inference/tests/book/test_inference_nlp.cc
@@ -19,6 +19,10 @@ limitations under the License. */
 #include "paddle/fluid/inference/tests/test_helper.h"
 
 DEFINE_string(dirname, "", "Directory of the inference model.");
+DEFINE_int32(repeat, 100, "Running the inference program repeat times");
+DEFINE_bool(use_mkldnn, false, "Use MKLDNN to run inference");
+DEFINE_bool(prepare_vars, true, "Prepare variables before executor");
+DEFINE_bool(prepare_context, true, "Prepare Context before executor");
 
 TEST(inference, understand_sentiment) {
   if (FLAGS_dirname.empty()) {
@@ -61,10 +65,29 @@ TEST(inference, understand_sentiment) {
   std::vector<paddle::framework::LoDTensor*> cpu_fetchs1;
   cpu_fetchs1.push_back(&output1);
 
-  int repeat = 100;
   // Run inference on CPU
-  TestInference<paddle::platform::CPUPlace, true, true>(dirname, cpu_feeds,
-                                                        cpu_fetchs1, repeat);
+  const bool model_combined = false;
+  if (FLAGS_prepare_vars) {
+    if (FLAGS_prepare_context) {
+      TestInference<paddle::platform::CPUPlace, false, true>(
+          dirname, cpu_feeds, cpu_fetchs1, FLAGS_repeat, model_combined,
+          FLAGS_use_mkldnn);
+    } else {
+      TestInference<paddle::platform::CPUPlace, false, false>(
+          dirname, cpu_feeds, cpu_fetchs1, FLAGS_repeat, model_combined,
+          FLAGS_use_mkldnn);
+    }
+  } else {
+    if (FLAGS_prepare_context) {
+      TestInference<paddle::platform::CPUPlace, true, true>(
+          dirname, cpu_feeds, cpu_fetchs1, FLAGS_repeat, model_combined,
+          FLAGS_use_mkldnn);
+    } else {
+      TestInference<paddle::platform::CPUPlace, true, false>(
+          dirname, cpu_feeds, cpu_fetchs1, FLAGS_repeat, model_combined,
+          FLAGS_use_mkldnn);
+    }
+  }
   LOG(INFO) << output1.lod();
   LOG(INFO) << output1.dims();
 
-- 
GitLab