colin
/
TIM-VX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align directory name to namespace for layout inference (#38) 

Signed-off-by: xiang.zhang <xiang.zhang@verisilicon.com>
This commit is contained in:
Sven 2021-05-11 09:46:46 +08:00 committed by GitHub
parent 22d423714f
commit a42517fdce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BUILD
View File

@ -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",
],

0
include/tim/layout_infer/layout_inference.h → include/tim/transform/layout_inference.h
View File

8
src/tim/CMakeLists.txt
View File

@ -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()

2
src/tim/layout_infer/layout_infer_context.h → src/tim/transform/layout_infer_context.h
View File

@ -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 {

2
src/tim/layout_infer/layout_inference.cc → src/tim/transform/layout_inference.cc
View File

@ -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"

8
src/tim/layout_infer/layout_inference_test.cc → src/tim/transform/layout_inference_test.cc
View File

@ -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<uint32_t, 4>({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<float> 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]];

4
src/tim/layout_infer/ops/activation_layout_inference.h → src/tim/transform/ops/activation_layout_inference.h
View File

@ -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 {

4
src/tim/layout_infer/ops/concat_layout_inferene.h → src/tim/transform/ops/concat_layout_inferene.h
View File

@ -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 {

4
src/tim/layout_infer/ops/conv2d_layout_inference.h → src/tim/transform/ops/conv2d_layout_inference.h
View File

@ -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 {

4
src/tim/layout_infer/ops/elementwise_layout_inference.h → src/tim/transform/ops/elementwise_layout_inference.h
View File

@ -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 {

2
src/tim/layout_infer/ops/op_layout_inference.cc → src/tim/transform/ops/op_layout_inference.cc
View File

@ -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"

2
src/tim/layout_infer/ops/op_layout_inference.h → src/tim/transform/ops/op_layout_inference.h
View File

@ -27,7 +27,7 @@
#include <memory>
#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 {

4
src/tim/layout_infer/ops/pool2d_layout_inference.h → src/tim/transform/ops/pool2d_layout_inference.h
View File

@ -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"

4
src/tim/layout_infer/ops/reduce_layout_inference.h → src/tim/transform/ops/reduce_layout_inference.h
View File

@ -28,8 +28,8 @@
#include <set>
#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 {

4
src/tim/layout_infer/ops/reshape_layout_inference.h → src/tim/transform/ops/reshape_layout_inference.h
View File

@ -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 {

4
src/tim/layout_infer/ops/simple_ops_layout_inference.h → src/tim/transform/ops/simple_ops_layout_inference.h
View File

@ -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 {

4
src/tim/layout_infer/ops/softmax_layout_inference.h → src/tim/transform/ops/softmax_layout_inference.h
View File

@ -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 {

4
src/tim/layout_infer/ops/squeeze_layout_inference.h → src/tim/transform/ops/squeeze_layout_inference.h
View File

@ -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 {

4
src/tim/layout_infer/ops/stack_layout_inference.h → src/tim/transform/ops/stack_layout_inference.h
View File

@ -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 {

0
src/tim/layout_infer/permute_vector.h → src/tim/transform/permute_vector.h
View File