update

Author: jiweibo

paddle/fluid/framework/ir/graph_viz_pass.cc

@@ -62,10 +62,14 @@ void GraphVizPass::ApplyImpl(ir::Graph* graph) const {
  }
  }
  }
+ const std::string& optim_cache_dir = Get<std::string>("optim_cache_dir");
  std::string program_bytes = program_desc.Proto()->SerializeAsString();
  // rename from "17_ir_fc_fuse_pass.dot" to "fc_fuse_pass.pdmodel"
  program_path =
  graph_viz_path.substr(found1 + 4, found2 - found1 - 4) + ".pdmodel";
+ if (!optim_cache_dir.empty()) {
+ program_path = optim_cache_dir + "/" + program_path;
+ }
  std::ofstream file(program_path.c_str(), std::ios::binary);
  file.write(program_bytes.c_str(), program_bytes.size());
  file.close();

paddle/fluid/inference/analysis/ir_pass_manager.cc

@@ -56,10 +56,18 @@ void IRPassManager::CreatePasses(Argument *argument,
  auto pass = framework::ir::PassRegistry::Instance().Get(pass_name);
 
  if (pass_name == "graph_viz_pass") {
- std::string dot_file_path = std::to_string(pass_num) + "_ir_" +
- (pre_pass.empty() ? "origin" : pre_pass) +
- ".dot";
+ std::string optim_cache_dir = argument->optim_cache_dir();
+ std::string dot_file_path;
+ if (optim_cache_dir.empty()) {
+ dot_file_path = std::to_string(pass_num) + "_ir_" +
+ (pre_pass.empty() ? "origin" : pre_pass) + ".dot";
+ } else {
+ dot_file_path = optim_cache_dir + "/" + std::to_string(pass_num) +
+ "_ir_" + (pre_pass.empty() ? "origin" : pre_pass) +
+ ".dot";
+ }
  pass->Set("graph_viz_path", new std::string(std::move(dot_file_path)));
+ pass->Set("optim_cache_dir", new std::string(std::move(optim_cache_dir)));
  pass_num++;
  } else if (pass_name == "mkldnn_placement_pass") {
  pass->Set("mkldnn_enabled_op_types",

paddle/scripts/paddle_build.sh

@@ -2404,6 +2404,8 @@ function trt_convert_test() {
  if [ "$result_num" != "0" ];then
  exit 11
  fi
+}
+
 function build_pr_and_develop() {
  cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
  mkdir ${PADDLE_ROOT}/build/pr_whl && cp ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/pr_whl

python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_conv2d.py

@@ -15,6 +15,7 @@
 from trt_layer_auto_scan_test import TrtLayerAutoScanTest, SkipReasons
 from program_config import TensorConfig, ProgramConfig
 import numpy as np
+import unittest
 import paddle.inference as paddle_infer
 from functools import partial
 from typing import Optional, List, Callable, Dict, Any, Set

python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_conv2d_transpose.py

@@ -15,6 +15,7 @@
 from trt_layer_auto_scan_test import TrtLayerAutoScanTest, SkipReasons
 from program_config import TensorConfig, ProgramConfig
 import numpy as np
+import unittest
 import paddle.inference as paddle_infer
 from functools import partial
 from typing import Optional, List, Callable, Dict, Any, Set

python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_depthwise_conv2d.py

@@ -18,6 +18,7 @@
 import paddle.inference as paddle_infer
 from functools import partial
 from typing import Optional, List, Callable, Dict, Any, Set
+import unittest
 
 
 class TrtConvertDepthwiseConv2dTest(TrtLayerAutoScanTest):

python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_depthwise_conv2d_transpose.py

@@ -18,6 +18,7 @@
 import paddle.inference as paddle_infer
 from functools import partial
 from typing import Optional, List, Callable, Dict, Any, Set
+import unittest
 
 
 class TrtConvertDepthwiseConv2dTransposeTest(TrtLayerAutoScanTest):

python/paddle/fluid/tests/unittests/ir/inference/trt_layer_auto_scan_test.py

@@ -122,7 +122,8 @@ def assert_tensors_near(self,
  "Output has diff between GPU and TensorRT. ")
 
  def assert_op_size(self, trt_engine_num, paddle_op_num):
- last_passed_program = 'transpose_flatten_concat_fuse_pass.pdmodel'
+ last_passed_program = os.path.join(
+ self.trt_cache_dir, 'transpose_flatten_concat_fuse_pass.pdmodel')
  model_bytes = paddle.static.load_from_file(last_passed_program)
  pg = paddle.static.deserialize_program(model_bytes)
  main_block = pg.desc.block(0)