New descriptor hierarchy (openvinotoolkit#20)

* New desc hierarchy started + conv updated * cleanup * cpplint * fix * cleanup * started reimplement via oneDnnDesc * small fixes * fixes + conv passed * moved desc to separate folder * fixes * oneDnn desc compare fix * review fixes * caching * code cleanup * clean up memory interface * getPaddedElementsCount added * review fixes * rename mkldnn_desc -> onednn_desc * applied comments for main PR * applied comments for new_desc_hierarchy * applied comments after second review * applied comments after third review * rename applyUndefinedOffset -> cloneWithUndefStridesAndOffset * applied comments fourth review * getPaddedElementsCount restore for blk desc * small fixes * restore unit test * applied comments fifth review * simple getPaddedElementsCount
mandrono · Sep 1, 2021 · 0808e7d · 0808e7d
1 parent 97336cc
commit 0808e7d
Show file tree

Hide file tree

Showing 105 changed files with 3,905 additions and 2,759 deletions.
diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
@@ -16,9 +16,104 @@ if (ENABLE_CPU_DEBUG_CAPS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCPU_DEBUG_CAPS")
 endif()
 
-file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h
-                          ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
+## TODO
+set(LAYERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_bin_conv_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_concat_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_conv_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_convert_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_strided_slice_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_deconv_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_def_conv_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_eltwise_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_fullyconnected_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_matmul_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_generic_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_input_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_lrn_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_memory_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_pad_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_transpose_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_pooling_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_fake_quantize_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_reorder_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_reshape_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_rnn.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_roi_align_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_roi_pooling_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_psroi_pooling_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_softmax_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_split_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_tensoriterator_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_tile_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_mvn_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_normalize_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_scatter_update_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_interpolate_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_reduce_node.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_reference_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_depth_to_space_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_space_to_depth_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_batch_to_space_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_space_to_batch_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_broadcast_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_embedding_bag_sum_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_embedding_bag_offset_sum_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_embedding_bag_packed_sum_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_embedding_segments_sum_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_gather_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_gather_elements_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_gather_nd_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_one_hot_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_region_yolo_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_select_node.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/mkldnn_roll_node.cpp
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/list.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/ctc_greedy_decoder.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/ctc_greedy_decoder_seq_len.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/ctc_loss.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/detectionoutput.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/detectionoutput_onnx.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/extract_image_patches.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/gather_tree.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/grn.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/non_max_suppression.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/log_softmax.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/math.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/priorgridgenerator_onnx.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/proposal_onnx.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/range.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/reorg_yolo.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/reverse_sequence.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/roifeatureextractor_onnx.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/shuffle_channels.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/bucketize.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/topkrois_onnx.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/common/softmax.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/topk.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/proposal.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/proposal_imp.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nodes/cum_sum.cpp
+)
+
+file(GLOB SOURCES
+        ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/mkldnn/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/utils/rt_info/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/nodes/common/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/emitters/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ngraph_transformations/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ngraph_transformations/op/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/memory_desc/*.cpp
+        ${LAYERS}
+        ${OS_SPECIFIC_SRC}
+)
+
+# file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+# file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h
+#                           ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
 
 addVersionDefines(mkldnn_plugin.cpp CI_BUILD_NUMBER)
 

diff --git a/inference-engine/src/mkldnn_plugin/cpu_memory_desc_utils.cpp b/inference-engine/src/mkldnn_plugin/cpu_memory_desc_utils.cpp