- fixes after third round of review

PaddlePaddle · Jun 7, 2021 · 9c30e39 · 9c30e39 · paddle-bot-old · Jun 8, 2021
1 parent 9f2b9e0
commit 9c30e39
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/paddle/fluid/inference/tests/api/CMakeLists.txt b/paddle/fluid/inference/tests/api/CMakeLists.txt
@@ -325,7 +325,7 @@ inference_analysis_api_test(test_analyzer_ocr ${OCR_INSTALL_DIR} analyzer_vis_te
 # densebox
 set(DENSEBOX_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/densebox")
 download_data_without_verify(${DENSEBOX_INSTALL_DIR} "densebox.tar.gz")
-inference_analysis_test(test_analyzer_detect_functional SRCS analyzer_detect_functional_tester.cc 
+inference_analysis_test(test_analyzer_detect_functional_mkldnn SRCS analyzer_detect_functional_mkldnn_tester.cc 
   EXTRA_DEPS ${INFERENCE_EXTRA_DEPS}
   ARGS --infer_model=${DENSEBOX_INSTALL_DIR}/model --infer_data=${DENSEBOX_INSTALL_DIR}/detect_input_50.txt 
        --infer_shape=${DENSEBOX_INSTALL_DIR}/shape_50.txt)

diff --git a/.../api/analyzer_detect_functional_tester.cc → ...alyzer_detect_functional_mkldnn_tester.cc b/.../api/analyzer_detect_functional_tester.cc → ...alyzer_detect_functional_mkldnn_tester.cc
@@ -33,7 +33,6 @@ struct Record {
 
 Record ProcessALine(const std::string &line, const std::string &shape_line) {
   VLOG(3) << "process a line";
-  std::vector<std::string> columns;
 
   Record record;
   std::vector<std::string> data_strs;
@@ -103,12 +102,12 @@ void validate_cache_onednn(int cache_capacity = 1) {
   lines.resize(num_samples);
   shape_lines.resize(num_samples);
 
-  // Let's remeber number of cached objects before
-  // exection and after every single execution
+  // Let's remember number of cached objects before
+  // execution and after every single execution
   std::vector<int> cache_filling;
   cache_filling.push_back(GetNumCachedObjects());
 
-  // compute sequenctilly prediction
+  // compute sequentially prediction
   for (int i = 0; i < num_samples; ++i) {
     std::getline(file, lines[i]);
     std::getline(infer_file, shape_lines[i]);

diff --git a/paddle/fluid/platform/device_context.h b/paddle/fluid/platform/device_context.h
@@ -748,8 +748,13 @@ class MKLDNNDeviceContext : public CPUDeviceContext {
   using ShapeBlob = umap_key_string_t<KeyBlob>;
   using BlobMap = umap_value_smart_t<int, ShapeBlob>;
 
-  using ExecMap = std::unordered_map<
-      void*, std::vector<std::pair<BlobPtr_t<KeyBlob>, KeyBlob::iterator>>>;
+  // Auxillary two-level structure (shape, executor) to easier control
+  // clearing cache objects related to specific executor
+
+  using ExecKey = void*;
+  using ExecMapCacheIterPair = std::pair<BlobPtr_t<KeyBlob>, KeyBlob::iterator>;
+  using ExecMap =
+      std::unordered_map<ExecKey, std::vector<ExecMapCacheIterPair>>;
   using ExecShape = std::unordered_map<std::string, std::shared_ptr<ExecMap>>;
 
   explicit MKLDNNDeviceContext(CPUPlace place);