From 1d2bd35e539fc7d7e197a848ed3880a3b517757a Mon Sep 17 00:00:00 2001
From: Shang Zhizhou <shangzhizhou@baidu.com>
Date: Tue, 23 Feb 2021 10:26:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20merge=20pr=20#31060=EF=BC=88update=20t?=
 =?UTF-8?q?rt=20int8=20calibrator=20to=20IEntropyCalibratorV2=EF=BC=89=20(?=
 =?UTF-8?q?#31121)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inference/tensorrt/trt_int8_calibrator.h  |  2 +-
 ...c_shape_ernie_serialize_deserialize_test.h | 19 +------------------
 .../tests/api/trt_split_converter_test.cc     |  3 +++
 .../inference/tests/api/trt_test_helper.h     | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/paddle/fluid/inference/tensorrt/trt_int8_calibrator.h b/paddle/fluid/inference/tensorrt/trt_int8_calibrator.h
index b4b7ee50dc3..15ae67fa10f 100644
--- a/paddle/fluid/inference/tensorrt/trt_int8_calibrator.h
+++ b/paddle/fluid/inference/tensorrt/trt_int8_calibrator.h
@@ -34,7 +34,7 @@ namespace tensorrt {
 
 class TensorRTEngine;
 
-struct TRTInt8Calibrator : public nvinfer1::IInt8EntropyCalibrator {
+struct TRTInt8Calibrator : public nvinfer1::IInt8EntropyCalibrator2 {
  public:
   TRTInt8Calibrator(const std::unordered_map<std::string, size_t>& buffers,
                     int batch_size, std::string engine_name,
diff --git a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h
index 9ada6f7bd46..3ab6a79381c 100644
--- a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h
+++ b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h
@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 #pragma once
-#include <dirent.h>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
@@ -27,22 +26,6 @@ limitations under the License. */
 namespace paddle {
 namespace inference {
 
-static int DeleteCache(std::string path) {
-  DIR* dir = opendir(path.c_str());
-  if (dir == NULL) return 0;
-  struct dirent* ptr;
-  while ((ptr = readdir(dir)) != NULL) {
-    if (std::strcmp(ptr->d_name, ".") == 0 ||
-        std::strcmp(ptr->d_name, "..") == 0) {
-      continue;
-    } else if (ptr->d_type == 8) {
-      std::string file_rm = path + "/" + ptr->d_name;
-      return remove(file_rm.c_str());
-    }
-  }
-  return 0;
-}
-
 static void run(const AnalysisConfig& config, std::vector<float>* out_data) {
   auto predictor = CreatePaddlePredictor(config);
   auto input_names = predictor->GetInputNames();
@@ -111,7 +94,7 @@ static void trt_ernie(bool with_fp16, std::vector<float> result) {
   // Delete serialization cache to perform serialization first rather than
   // deserialization.
   std::string opt_cache_dir = FLAGS_infer_model + "/_opt_cache";
-  DeleteCache(opt_cache_dir);
+  delete_cache_files(opt_cache_dir);
 
   SetConfig(&config, model_dir, true /* use_gpu */);
 
diff --git a/paddle/fluid/inference/tests/api/trt_split_converter_test.cc b/paddle/fluid/inference/tests/api/trt_split_converter_test.cc
index 7cf50f21948..54df4a6fb5e 100644
--- a/paddle/fluid/inference/tests/api/trt_split_converter_test.cc
+++ b/paddle/fluid/inference/tests/api/trt_split_converter_test.cc
@@ -23,6 +23,9 @@ namespace inference {
 
 TEST(TensorRT, split_converter) {
   std::string model_dir = FLAGS_infer_model + "/split_converter";
+  std::string opt_cache_dir = model_dir + "/_opt_cache";
+  delete_cache_files(opt_cache_dir);
+
   AnalysisConfig config;
   int batch_size = 4;
   config.EnableUseGpu(100, 0);
diff --git a/paddle/fluid/inference/tests/api/trt_test_helper.h b/paddle/fluid/inference/tests/api/trt_test_helper.h
index ee3ba63bb2c..1abde733581 100644
--- a/paddle/fluid/inference/tests/api/trt_test_helper.h
+++ b/paddle/fluid/inference/tests/api/trt_test_helper.h
@@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 #pragma once
+#include <dirent.h>
 #include <string>
 #include <vector>
 
@@ -134,5 +135,20 @@ void compare_continuous_input(std::string model_dir, bool use_tensorrt) {
   }
 }
 
+void delete_cache_files(std::string path) {
+  DIR* dir = opendir(path.c_str());
+  if (dir == NULL) return;
+  struct dirent* ptr;
+  while ((ptr = readdir(dir)) != NULL) {
+    if (std::strcmp(ptr->d_name, ".") == 0 ||
+        std::strcmp(ptr->d_name, "..") == 0) {
+      continue;
+    } else if (ptr->d_type == 8) {
+      std::string file_rm = path + "/" + ptr->d_name;
+      remove(file_rm.c_str());
+    }
+  }
+}
+
 }  // namespace inference
 }  // namespace paddle
-- 
GitLab