diff --git a/paddle/fluid/inference/analysis/analyzer_tester.cc b/paddle/fluid/inference/analysis/analyzer_tester.cc
index eb0aeafb8f538e4b7ffe80db7eec9b764afc0f43..f90910ac0d0a897ef01d4ca2bd0bca575baf4c40 100644
--- a/paddle/fluid/inference/analysis/analyzer_tester.cc
+++ b/paddle/fluid/inference/analysis/analyzer_tester.cc
@@ -37,14 +37,10 @@ TEST(Analyzer, analysis_without_tensorrt) {
 TEST(Analyzer, analysis_with_tensorrt) {
   FLAGS_IA_enable_tensorrt_subgraph_engine = true;
   Argument argument;
-  int* minimum_subgraph_size = new int(0);
-  int* max_batch_size = new int(3);
-  int* workspace_size = new int(1 << 20);
-  std::string* precision_mode = new std::string("FP32");
-  argument.Set<int>("minimum_subgraph_size", minimum_subgraph_size);
-  argument.Set<int>("max_batch_size", max_batch_size);
-  argument.Set<int>("workspace_size", workspace_size);
-  argument.Set<std::string>("precision_mode", precision_mode);
+  argument.Set<int>("minimum_subgraph_size", new int(0));
+  argument.Set<int>("max_batch_size", new int(3));
+  argument.Set<int>("workspace_size", new int(1 << 20));
+  argument.Set<std::string>("precision_mode", new std::string("FP32"));
   argument.fluid_model_dir.reset(new std::string(FLAGS_inference_model_dir));
   Analyzer analyser;
   analyser.Run(&argument);
diff --git a/paddle/fluid/inference/analysis/data_flow_graph_to_fluid_pass.cc b/paddle/fluid/inference/analysis/data_flow_graph_to_fluid_pass.cc
index 9913439604f22dad56a46dd4e4ce9d564823feed..cb549f4b50cf56154a951d16b58b022dbad3e990 100644
--- a/paddle/fluid/inference/analysis/data_flow_graph_to_fluid_pass.cc
+++ b/paddle/fluid/inference/analysis/data_flow_graph_to_fluid_pass.cc
@@ -99,6 +99,7 @@ void DataFlowGraphToFluidPass::AddFluidOp(Node *node) {
 
 void CreateTrtEngineOp(Node *node, Argument *argument,
                        framework::proto::BlockDesc *block) {
+  PADDLE_ENFORCE(argument->main_dfg.get());
   const DataFlowGraph &graph = *(argument->main_dfg);
   static int counter{0};
   PADDLE_ENFORCE(node->IsFunctionBlock());
diff --git a/paddle/fluid/inference/analysis/subgraph_splitter_tester.cc b/paddle/fluid/inference/analysis/subgraph_splitter_tester.cc
index bf0b46e0d76bd54a696c1d99cb72b4d247c7298f..e1dc89fab5fb76d456b07c316ab1cabe6de23b26 100644
--- a/paddle/fluid/inference/analysis/subgraph_splitter_tester.cc
+++ b/paddle/fluid/inference/analysis/subgraph_splitter_tester.cc
@@ -67,8 +67,7 @@ TEST(SubGraphSplitter, Fuse) {
   auto desc = LoadProgramDesc(FLAGS_inference_model_dir + "/__model__");
   auto dfg = ProgramDescToDFG(desc);
   Argument argument;
-  int* minmum_subgraph_size = new int(3);
-  argument.Set<int>("minimum_subgraph_size", minmum_subgraph_size);
+  argument.Set<int>("minimum_subgraph_size", new int(3));
 
   size_t count0 = dfg.nodes.size();
 
diff --git a/paddle/fluid/inference/analysis/tensorrt_subgraph_pass_tester.cc b/paddle/fluid/inference/analysis/tensorrt_subgraph_pass_tester.cc
index 4d6492fc144a7295768fa120dce012229a374862..9748e24b06295a4e7c2995429e6588cd0f225fe6 100644
--- a/paddle/fluid/inference/analysis/tensorrt_subgraph_pass_tester.cc
+++ b/paddle/fluid/inference/analysis/tensorrt_subgraph_pass_tester.cc
@@ -36,14 +36,10 @@ TEST(TensorRTSubGraphPass, main) {
   };
 
   Argument argument(FLAGS_inference_model_dir);
-  int* minimum_subgraph_size = new int(0);
-  int* max_batch_size = new int(3);
-  int* workspace_size = new int(1 << 20);
-  std::string* precision_mode = new std::string("FP32");
-  argument.Set<int>("minimum_subgraph_size", minimum_subgraph_size);
-  argument.Set<int>("max_batch_size", max_batch_size);
-  argument.Set<int>("workspace_size", workspace_size);
-  argument.Set<std::string>("precision_mode", precision_mode);
+  argument.Set<int>("minimum_subgraph_size", new int(0));
+  argument.Set<int>("max_batch_size", new int(3));
+  argument.Set<int>("workspace_size", new int(1 << 20));
+  argument.Set<std::string>("precision_mode", new std::string("FP32"));
 
   DFG_GraphvizDrawPass::Config config{FLAGS_dot_dir, "origin"};
   DFG_GraphvizDrawPass::Config config1{FLAGS_dot_dir, "fusion"};
diff --git a/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc b/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc
index ce147eb5da77824930ed1a2eb609766b24ced598..2b9be77e9f8856c1c4c581847b70dbc285a576d6 100644
--- a/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc
+++ b/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc
@@ -90,14 +90,12 @@ class TensorRTSubgraphPredictor : public NativePaddlePredictor {
     // Analyze inference_program
     Argument argument;
 
-    int* minimum_subgraph_size = new int(config_.minimum_subgraph_size);
-    int* max_batch_size = new int(config_.max_batch_size);
-    int* workspace_size = new int(config_.workspace_size);
-    std::string* precision_mode = new std::string(config_.precision_mode);
-    argument.Set<int>("minimum_subgraph_size", minimum_subgraph_size);
-    argument.Set<int>("max_batch_size", max_batch_size);
-    argument.Set<int>("workspace_size", workspace_size);
-    argument.Set<std::string>("precision_mode", precision_mode);
+    argument.Set<int>("minimum_subgraph_size",
+                      new int(config_.minimum_subgraph_size));
+    argument.Set<int>("max_batch_size", new int(config_.max_batch_size));
+    argument.Set<int>("workspace_size", new int(config_.workspace_size));
+    argument.Set<std::string>("precision_mode",
+                              new std::string(config_.precision_mode));
 
     if (!config_.model_dir.empty()) {
       argument.fluid_model_dir.reset(new std::string(config_.model_dir));
diff --git a/paddle/fluid/inference/api/paddle_inference_api.h b/paddle/fluid/inference/api/paddle_inference_api.h
index bacb319e24b067cdd38618128825c34f11df3b2d..d0527d714acdcda047ad9d47ccd0e3a8083c771f 100644
--- a/paddle/fluid/inference/api/paddle_inference_api.h
+++ b/paddle/fluid/inference/api/paddle_inference_api.h
@@ -153,8 +153,7 @@ struct TensorRTConfig : public NativeConfig {
   //  We transform the Ops that can be converted into TRT layer in the model,
   //  and aggregate these Ops into subgraphs for TRT execution.
   //  We set this variable to control the minimum number of nodes in the
-  //  subgraph, 3 as
-  //  default value.
+  //  subgraph, 3 as default value.
   int minimum_subgraph_size = 3;
   // Reserved configuration
   // We just support "FP32" now, "FP16" and "INT8" will be supported.
diff --git a/paddle/fluid/operators/tensorrt_engine_op.cc b/paddle/fluid/operators/tensorrt_engine_op.cc
index b34fa55210ccc01af00222d9da611ddaa12db1f3..41a5786fe8c3295390144732221280e152d0a15a 100644
--- a/paddle/fluid/operators/tensorrt_engine_op.cc
+++ b/paddle/fluid/operators/tensorrt_engine_op.cc
@@ -33,7 +33,7 @@ class TensorRTEngineOpMaker : public framework::OpProtoAndCheckerMaker {
     AddAttr<std::string>("subgraph", "the subgraph.");
     AddAttr<std::string>("engine_uniq_key", "unique key for the TRT engine.");
     AddAttr<int>("max_batch_size", "the maximum batch size.");
-    AddAttr<int>("workspace_size", "the maximum batch size.");
+    AddAttr<int>("workspace_size", "the workspace size.");
     AddComment("TensorRT engine operator.");
   }
 };