Skip to content

refactor for nhwc layout #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 23, 2023
Merged

refactor for nhwc layout #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4f4afe
refactor for nhwc layout
Jul 23, 2023
21be38f
Merge branch 'idf' into main
xiangweizeng Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 20 additions & 138 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,141 +4,23 @@ option(ENABLE_ESP32 "enable esp32 build" ON)
option(ENABLE_POSIX_PORTS "enable posix ports supported" OFF)
option(ENABLE_DEBUG_MEMORY "enable debug memory allocation" ON)

macro(cnet_add_operation class file)
# WITH_LAYER_xxx option
if(${ARGC} EQUAL 3)
option(WITH_LAYER_${class} "build with layer ${class}" ${ARGV2})
else()
option(WITH_LAYER_${class} "build with layer ${class}" ON)
endif()

message(STATUS "WITH_LAYER_${class} = ${WITH_LAYER_${class}}")
if(WITH_LAYER_${class})
list(APPEND OPERATION_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/c-network/src/operation/${file}.c")
endif()

# generate operation_declaration and operation_registry file
if(WITH_LAYER_${class})
set(operation_names "${operation_names}\t\"${class}\",\n")
set(operation_creators "${operation_creators}/// Creator for ${class}\nDEFINE_OPERATION_CREATOR(${class});\n\n")
set(operation_creator "${operation_creator}\t${class}_operation_creator, // ${class}\n")
else()
set(operation_names "${operation_names}\t\"\",\n")
set(operation_creator "${operation_creator}\t0/*${class}_operation_creator*/, // ${class}\n")
endif()

endmacro()

set(UTILS_SRCS
c-utils/src/allocator.c
c-utils/src/container_linked_list.c
c-utils/src/container_vector.c
c-utils/src/threadpool-pthreads.c
c-utils/src/option.c
c-utils/src/ncx-pool/ncx_slab.c
c-utils/src/memory_cached.c
)

set(TESTER_SRCS
c-tester/src/tester.c
c-tester/src/unity.c
)

set(BENCH_MARK_SRCS
c-benchmark/src/benchmark.c
)

set(TENSOR_SRCS
c-tensor/src/tensor.c
c-tensor/src/tensor_softmax.c
c-tensor/src/tensor_padding.c
c-tensor/src/tensor_cut_border.c
c-tensor/src/tensor_resize_bilinear.c
c-tensor/src/tensor_resize_bicubic.c
)

cnet_add_operation(convolution convolution ON)
cnet_add_operation(pooling pooling ON)
cnet_add_operation(padding padding ON)
cnet_add_operation(crop crop ON)
cnet_add_operation(inner_product inner_product ON)
cnet_add_operation(activation activation ON)
cnet_add_operation(batch_norm batch_norm ON)
cnet_add_operation(slice slice ON)
cnet_add_operation(concat concat ON)
cnet_add_operation(reshape reshape ON)
cnet_add_operation(sigmoid sigmoid ON)
cnet_add_operation(softmax softmax ON)
cnet_add_operation(permute permute ON)
cnet_add_operation(unary unary ON)
cnet_add_operation(binary binary ON)
cnet_add_operation(upsample upsample ON)
cnet_add_operation(prelu prelu ON)
cnet_add_operation(memory_data memory_data ON)
cnet_add_operation(shuffle_channel shuffle_channel ON)

set(NETWORK_SRCS
c-network/src/operation.c
c-network/src/network.c
c-network/src/operation_benchmark.c
c-network/src/quantize16.c
c-network/src/operation_registry.c
${OPERATION_SRCS}
)

set(NETEND_SRCS
c-netend/src/detection/object_box.c
c-netend/src/detection/mtcnn.c
c-netend/src/detection/retina_face.c
c-netend/src/detection/affine_matrix.c
c-netend/src/detection/yolov2.c
c-netend/src/detection/yolov3.c
c-netend/src/face/face_info.c
c-netend/src/face/arc_face.c
c-netend/src/face/mtcnn_face_detector.c
c-netend/src/lpr/plate_info.c
c-netend/src/lpr/lpr_recognizer.c
c-netend/src/lpr/lpc_recoginizer.c
c-netend/src/lpr/mtcnn_plate_detector.c
)

set(IMAGE_SRCS
c-image/src/imgproc.c
c-image/src/tensor_pixel.c
)

set(COMPONENT_SRCS
${UTILS_SRCS}
${TESTER_SRCS}
${BENCH_MARK_SRCS}
${TENSOR_SRCS}
${NETWORK_SRCS}
${NETEND_SRCS}
${IMAGE_SRCS}
)

set(COMPONENT_ADD_INCLUDEDIRS
c-utils/include
c-tester/include
c-benchmark/include
c-tensor/include
c-network/include
c-netend/include
c-image/include
)

set(COMPONENT_ADD_INCLUDEDIRS
c-utils/include
c-tester/include
c-benchmark/include
c-tensor/include
c-network/include
c-netend/include
c-image/include
)

register_component()
configure_file(c-network/src/operation_registry.c.in
${CMAKE_CURRENT_SOURCE_DIR}/c-network/src/operation_registry.c)
add_definitions(-DESP32)
add_definitions(-Wall -Wno-unused-function -Ofast)
add_definitions(-Wall -Wno-unused-function)
#add_definitions(-Wall -Wno-unused-function -Ofast)
set(CMAKE_C_STANDARD 99)

if(NOT DEFINED CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
endif()
message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE release CACHE STRING "Choose the type of build" FORCE)
endif()

add_subdirectory(c-utils)
add_subdirectory(c-benchmark)
add_subdirectory(c-tester)
add_subdirectory(c-tensor)
add_subdirectory(c-image)
add_subdirectory(c-network)
add_subdirectory(c-netend)
3 changes: 2 additions & 1 deletion c-image/include/tensor_pixel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ typedef enum pixel_type_t
PIXEL_RGBA2BGR = PIXEL_RGBA | (PIXEL_BGR << PIXEL_CONVERT_SHIFT),
PIXEL_RGBA2GRAY = PIXEL_RGBA | (PIXEL_GRAY << PIXEL_CONVERT_SHIFT),
} pixel_type_t;

/**
* mean norm operator
*/
Expand All @@ -47,7 +48,7 @@ FUNCTION_IRAM void tensor_substract_mean_normalize(tensor_t *tensor, const float
*/
FUNCTION_IRAM tensor_t tensor_from_pixels(const unsigned char* pixels, int type, int w, int h, allocator_t *allocator);
FUNCTION_IRAM tensor_t tensor_from_pixels_resize(const unsigned char* pixels, int type, int w, int h, int target_width, int target_height, allocator_t *allocator);
FUNCTION_IRAM tensor_t tensor_from_float16(const unsigned short *data, int size, allocator_t *allocator);// create tensor form float16 buffer
//FUNCTION_IRAM tensor_t tensor_from_float16(const unsigned short *data, int size, allocator_t *allocator);// create tensor form float16 buffer

/**
* tensor data to pixels data, tensor is nchw layout
Expand Down
Loading