From a42517fdce2591ee1a71aae44b1cd996bd12bf53 Mon Sep 17 00:00:00 2001 From: Sven Date: Tue, 11 May 2021 09:46:46 +0800 Subject: [PATCH] Align directory name to namespace for layout inference (#38) Signed-off-by: xiang.zhang --- BUILD | 10 +++++----- .../tim/{layout_infer => transform}/layout_inference.h | 0 src/tim/CMakeLists.txt | 8 ++++---- .../{layout_infer => transform}/layout_infer_context.h | 2 +- .../{layout_infer => transform}/layout_inference.cc | 2 +- .../layout_inference_test.cc | 8 ++++---- .../ops/activation_layout_inference.h | 4 ++-- .../ops/concat_layout_inferene.h | 4 ++-- .../ops/conv2d_layout_inference.h | 4 ++-- .../ops/elementwise_layout_inference.h | 4 ++-- .../ops/op_layout_inference.cc | 2 +- .../ops/op_layout_inference.h | 2 +- .../ops/pool2d_layout_inference.h | 4 ++-- .../ops/reduce_layout_inference.h | 4 ++-- .../ops/reshape_layout_inference.h | 4 ++-- .../ops/simple_ops_layout_inference.h | 4 ++-- .../ops/softmax_layout_inference.h | 4 ++-- .../ops/squeeze_layout_inference.h | 4 ++-- .../ops/stack_layout_inference.h | 4 ++-- src/tim/{layout_infer => transform}/permute_vector.h | 0 20 files changed, 39 insertions(+), 39 deletions(-) rename include/tim/{layout_infer => transform}/layout_inference.h (100%) rename src/tim/{layout_infer => transform}/layout_infer_context.h (97%) rename src/tim/{layout_infer => transform}/layout_inference.cc (99%) rename src/tim/{layout_infer => transform}/layout_inference_test.cc (92%) rename src/tim/{layout_infer => transform}/ops/activation_layout_inference.h (97%) rename src/tim/{layout_infer => transform}/ops/concat_layout_inferene.h (95%) rename src/tim/{layout_infer => transform}/ops/conv2d_layout_inference.h (97%) rename src/tim/{layout_infer => transform}/ops/elementwise_layout_inference.h (97%) rename src/tim/{layout_infer => transform}/ops/op_layout_inference.cc (99%) rename src/tim/{layout_infer => transform}/ops/op_layout_inference.h (98%) rename src/tim/{layout_infer => transform}/ops/pool2d_layout_inference.h (96%) rename src/tim/{layout_infer => transform}/ops/reduce_layout_inference.h (97%) rename src/tim/{layout_infer => transform}/ops/reshape_layout_inference.h (96%) rename src/tim/{layout_infer => transform}/ops/simple_ops_layout_inference.h (96%) rename src/tim/{layout_infer => transform}/ops/softmax_layout_inference.h (96%) rename src/tim/{layout_infer => transform}/ops/squeeze_layout_inference.h (96%) rename src/tim/{layout_infer => transform}/ops/stack_layout_inference.h (95%) rename src/tim/{layout_infer => transform}/permute_vector.h (100%) diff --git a/BUILD b/BUILD index de72db8..882991b 100644 --- a/BUILD +++ b/BUILD @@ -16,7 +16,7 @@ cc_library( "include/tim/vx/operation.h", "include/tim/vx/tensor.h", "include/tim/vx/types.h", - "include/tim/layout_infer/layout_inference.h" + "include/tim/transform/layout_inference.h" ] + glob([ "include/tim/vx/ops/*.h" ]), @@ -31,12 +31,12 @@ cc_library( "src/tim/vx/tensor_private.h", "src/tim/vx/type_utils.h", "src/tim/vx/type_utils.cc", - "src/tim/layout_infer/layout_inference.cc", - "src/tim/layout_infer/permute_vector.h", - "src/tim/layout_infer/layout_infer_context.h", + "src/tim/transform/layout_inference.cc", + "src/tim/transform/permute_vector.h", + "src/tim/transform/layout_infer_context.h", ] + glob([ "src/tim/vx/ops/*.cc" - ]) + glob(["src/tim/layout_infer/ops/*.*"]), + ]) + glob(["src/tim/transform/ops/*.*"]), deps = [ "//src/tim/vx/internal:ovxlibimpl", ], diff --git a/include/tim/layout_infer/layout_inference.h b/include/tim/transform/layout_inference.h similarity index 100% rename from include/tim/layout_infer/layout_inference.h rename to include/tim/transform/layout_inference.h diff --git a/src/tim/CMakeLists.txt b/src/tim/CMakeLists.txt index 25eb74d..ef95fd0 100644 --- a/src/tim/CMakeLists.txt +++ b/src/tim/CMakeLists.txt @@ -23,14 +23,14 @@ include_directories(${PROJECT_SOURCE_DIR}/src/tim/vx/internal/include) if(ENABLE_LAYOUT_INFER) include_directories(${PROJECT_SOURCE_DIR}/) - aux_source_directory(./layout_infer LAYOUT_INFER_FRAMEWORK_SRCS) - aux_source_directory(./layout_infer/ops LAYOUT_INFER_OP_SRCS) + aux_source_directory(./transform LAYOUT_INFER_FRAMEWORK_SRCS) + aux_source_directory(./transform/ops LAYOUT_INFER_OP_SRCS) list(APPEND SRC ${LAYOUT_INFER_FRAMEWORK_SRCS} ${LAYOUT_INFER_OP_SRCS} ) - list(REMOVE_ITEM SRC ./layout_infer/layout_inference_test.cc) + list(REMOVE_ITEM SRC ./transform/layout_inference_test.cc) endif() add_library(${TARGET_NAME} SHARED ${SRC}) @@ -47,5 +47,5 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}-static install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/tim/vx DESTINATION ${CMAKE_BINARY_DIR}/install/include/tim/) if(ENABLE_LAYOUT_INFER) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/tim/layout_infer DESTINATION ${CMAKE_BINARY_DIR}/install/include/tim/) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/tim/transform DESTINATION ${CMAKE_BINARY_DIR}/install/include/tim/) endif() \ No newline at end of file diff --git a/src/tim/layout_infer/layout_infer_context.h b/src/tim/transform/layout_infer_context.h similarity index 97% rename from src/tim/layout_infer/layout_infer_context.h rename to src/tim/transform/layout_infer_context.h index fe17b5d..c85b0eb 100644 --- a/src/tim/layout_infer/layout_infer_context.h +++ b/src/tim/transform/layout_infer_context.h @@ -1,7 +1,7 @@ #ifndef TIM_VX_LAYOUT_INFER_CONTEXT_H_ #define TIM_VX_LAYOUT_INFER_CONTEXT_H_ #include "permute_vector.h" -#include "tim/layout_infer/layout_inference.h" +#include "tim/transform/layout_inference.h" namespace tim { namespace transform { diff --git a/src/tim/layout_infer/layout_inference.cc b/src/tim/transform/layout_inference.cc similarity index 99% rename from src/tim/layout_infer/layout_inference.cc rename to src/tim/transform/layout_inference.cc index eaee2e7..3d17bd8 100644 --- a/src/tim/layout_infer/layout_inference.cc +++ b/src/tim/transform/layout_inference.cc @@ -24,7 +24,7 @@ #include "permute_vector.h" #include "layout_infer_context.h" -#include "tim/layout_infer/layout_inference.h" +#include "tim/transform/layout_inference.h" #include "ops/conv2d_layout_inference.h" #include "ops/reduce_layout_inference.h" #include "ops/elementwise_layout_inference.h" diff --git a/src/tim/layout_infer/layout_inference_test.cc b/src/tim/transform/layout_inference_test.cc similarity index 92% rename from src/tim/layout_infer/layout_inference_test.cc rename to src/tim/transform/layout_inference_test.cc index 0deb82e..9852233 100644 --- a/src/tim/layout_infer/layout_inference_test.cc +++ b/src/tim/transform/layout_inference_test.cc @@ -1,7 +1,7 @@ #include "tim/vx/context.h" #include "tim/vx/graph.h" #include "tim/vx/ops/conv2d.h" -#include "tim/layout_infer/layout_inference.h" +#include "tim/transform/layout_inference.h" #include "gtest/gtest.h" @@ -38,9 +38,9 @@ TEST(LayoutInference, simple_conv2d) { std::array({0, 0, 0, 0}), 0, tim::vx::DataLayout::CWHN); (*conv2d).BindInputs({input, kernel, bias}).BindOutput(output); // Do layout inference - auto layout_infer = tim::transform::LayoutInference(src_graph, ctx); - auto infer_graph = layout_infer.first; - auto graph_io_map = layout_infer.second; + auto transform = tim::transform::LayoutInference(src_graph, ctx); + auto infer_graph = transform.first; + auto graph_io_map = transform.second; infer_graph->Compile(); std::vector input_data = {1.0f, 1.0f, 1.0f, 1.0f, 0.5f, 1.0f, 1.0f, 1.0f, 1.0f}; auto infer_input = graph_io_map[src_graph->InputsTensor()[0]]; diff --git a/src/tim/layout_infer/ops/activation_layout_inference.h b/src/tim/transform/ops/activation_layout_inference.h similarity index 97% rename from src/tim/layout_infer/ops/activation_layout_inference.h rename to src/tim/transform/ops/activation_layout_inference.h index b1fdef6..1b56d77 100644 --- a/src/tim/layout_infer/ops/activation_layout_inference.h +++ b/src/tim/transform/ops/activation_layout_inference.h @@ -26,8 +26,8 @@ #include "tim/vx/ops/activations.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" namespace tim { diff --git a/src/tim/layout_infer/ops/concat_layout_inferene.h b/src/tim/transform/ops/concat_layout_inferene.h similarity index 95% rename from src/tim/layout_infer/ops/concat_layout_inferene.h rename to src/tim/transform/ops/concat_layout_inferene.h index 778257a..bdc73b1 100644 --- a/src/tim/layout_infer/ops/concat_layout_inferene.h +++ b/src/tim/transform/ops/concat_layout_inferene.h @@ -26,8 +26,8 @@ #include "tim/vx/ops/concat.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" namespace tim { diff --git a/src/tim/layout_infer/ops/conv2d_layout_inference.h b/src/tim/transform/ops/conv2d_layout_inference.h similarity index 97% rename from src/tim/layout_infer/ops/conv2d_layout_inference.h rename to src/tim/transform/ops/conv2d_layout_inference.h index 6583eb7..fb0a0f2 100644 --- a/src/tim/layout_infer/ops/conv2d_layout_inference.h +++ b/src/tim/transform/ops/conv2d_layout_inference.h @@ -27,8 +27,8 @@ #include "tim/vx/ops/conv2d.h" #include "src/tim/vx/operation_private.h" -#include "src/tim/layout_infer/permute_vector.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" namespace tim { namespace transform { diff --git a/src/tim/layout_infer/ops/elementwise_layout_inference.h b/src/tim/transform/ops/elementwise_layout_inference.h similarity index 97% rename from src/tim/layout_infer/ops/elementwise_layout_inference.h rename to src/tim/transform/ops/elementwise_layout_inference.h index 069aa0f..bc8fbff 100644 --- a/src/tim/layout_infer/ops/elementwise_layout_inference.h +++ b/src/tim/transform/ops/elementwise_layout_inference.h @@ -26,8 +26,8 @@ #include "tim/vx/ops/elementwise.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" namespace tim { diff --git a/src/tim/layout_infer/ops/op_layout_inference.cc b/src/tim/transform/ops/op_layout_inference.cc similarity index 99% rename from src/tim/layout_infer/ops/op_layout_inference.cc rename to src/tim/transform/ops/op_layout_inference.cc index 7cb9eb5..cc5a755 100644 --- a/src/tim/layout_infer/ops/op_layout_inference.cc +++ b/src/tim/transform/ops/op_layout_inference.cc @@ -23,7 +23,7 @@ *****************************************************************************/ #include "op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" #include "tim/vx/ops/transpose.h" #include "src/tim/vx/type_utils.h" diff --git a/src/tim/layout_infer/ops/op_layout_inference.h b/src/tim/transform/ops/op_layout_inference.h similarity index 98% rename from src/tim/layout_infer/ops/op_layout_inference.h rename to src/tim/transform/ops/op_layout_inference.h index 99aea85..e86e1a7 100644 --- a/src/tim/layout_infer/ops/op_layout_inference.h +++ b/src/tim/transform/ops/op_layout_inference.h @@ -27,7 +27,7 @@ #include #include "../layout_infer_context.h" -#include "tim/layout_infer/layout_inference.h" +#include "tim/transform/layout_inference.h" #include "tim/vx/types.h" namespace tim { diff --git a/src/tim/layout_infer/ops/pool2d_layout_inference.h b/src/tim/transform/ops/pool2d_layout_inference.h similarity index 96% rename from src/tim/layout_infer/ops/pool2d_layout_inference.h rename to src/tim/transform/ops/pool2d_layout_inference.h index eeb534d..f41e0eb 100644 --- a/src/tim/layout_infer/ops/pool2d_layout_inference.h +++ b/src/tim/transform/ops/pool2d_layout_inference.h @@ -24,8 +24,8 @@ #ifndef TIM_LAYOUT_INFER_POOL2D_LAYOUT_INFERENCE_H_ #define TIM_LAYOUT_INFER_POOL2D_LAYOUT_INFERENCE_H_ -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" #include "tim/vx/ops/pool2d.h" diff --git a/src/tim/layout_infer/ops/reduce_layout_inference.h b/src/tim/transform/ops/reduce_layout_inference.h similarity index 97% rename from src/tim/layout_infer/ops/reduce_layout_inference.h rename to src/tim/transform/ops/reduce_layout_inference.h index 56cd514..c6cf4c4 100644 --- a/src/tim/layout_infer/ops/reduce_layout_inference.h +++ b/src/tim/transform/ops/reduce_layout_inference.h @@ -28,8 +28,8 @@ #include -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" namespace tim { diff --git a/src/tim/layout_infer/ops/reshape_layout_inference.h b/src/tim/transform/ops/reshape_layout_inference.h similarity index 96% rename from src/tim/layout_infer/ops/reshape_layout_inference.h rename to src/tim/transform/ops/reshape_layout_inference.h index 7954e36..743e4a2 100644 --- a/src/tim/layout_infer/ops/reshape_layout_inference.h +++ b/src/tim/transform/ops/reshape_layout_inference.h @@ -26,8 +26,8 @@ #include "tim/vx/ops/reshape.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" namespace tim { diff --git a/src/tim/layout_infer/ops/simple_ops_layout_inference.h b/src/tim/transform/ops/simple_ops_layout_inference.h similarity index 96% rename from src/tim/layout_infer/ops/simple_ops_layout_inference.h rename to src/tim/transform/ops/simple_ops_layout_inference.h index 20b295a..e8d2545 100644 --- a/src/tim/layout_infer/ops/simple_ops_layout_inference.h +++ b/src/tim/transform/ops/simple_ops_layout_inference.h @@ -26,8 +26,8 @@ #include "tim/vx/ops/simple_operations.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" namespace tim { diff --git a/src/tim/layout_infer/ops/softmax_layout_inference.h b/src/tim/transform/ops/softmax_layout_inference.h similarity index 96% rename from src/tim/layout_infer/ops/softmax_layout_inference.h rename to src/tim/transform/ops/softmax_layout_inference.h index 630f100..8557985 100644 --- a/src/tim/layout_infer/ops/softmax_layout_inference.h +++ b/src/tim/transform/ops/softmax_layout_inference.h @@ -27,8 +27,8 @@ #include "tim/vx/ops/softmax.h" #include "src/tim/vx/operation_private.h" -#include "src/tim/layout_infer/permute_vector.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" namespace tim { namespace transform { diff --git a/src/tim/layout_infer/ops/squeeze_layout_inference.h b/src/tim/transform/ops/squeeze_layout_inference.h similarity index 96% rename from src/tim/layout_infer/ops/squeeze_layout_inference.h rename to src/tim/transform/ops/squeeze_layout_inference.h index 7bf1443..0e33725 100644 --- a/src/tim/layout_infer/ops/squeeze_layout_inference.h +++ b/src/tim/transform/ops/squeeze_layout_inference.h @@ -26,8 +26,8 @@ #include "tim/vx/ops/squeeze.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" -#include "src/tim/layout_infer/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" #include "src/tim/vx/operation_private.h" namespace tim { diff --git a/src/tim/layout_infer/ops/stack_layout_inference.h b/src/tim/transform/ops/stack_layout_inference.h similarity index 95% rename from src/tim/layout_infer/ops/stack_layout_inference.h rename to src/tim/transform/ops/stack_layout_inference.h index 8707ffb..4637649 100644 --- a/src/tim/layout_infer/ops/stack_layout_inference.h +++ b/src/tim/transform/ops/stack_layout_inference.h @@ -27,8 +27,8 @@ #include "tim/vx/ops/stack.h" #include "src/tim/vx/operation_private.h" -#include "src/tim/layout_infer/permute_vector.h" -#include "src/tim/layout_infer/ops/op_layout_inference.h" +#include "src/tim/transform/permute_vector.h" +#include "src/tim/transform/ops/op_layout_inference.h" namespace tim { namespace transform { diff --git a/src/tim/layout_infer/permute_vector.h b/src/tim/transform/permute_vector.h similarity index 100% rename from src/tim/layout_infer/permute_vector.h rename to src/tim/transform/permute_vector.h