Skip to content

Nhwc layout #6

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 8 commits into from
Jul 25, 2023
Merged

Nhwc layout #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ab900b
Merge pull request #2 from xiangweizeng/main
xiangweizeng Jul 20, 2023
d93baf7
Update CMakeLists.txt
xiangweizeng Jul 20, 2023
e4f4afe
refactor for nhwc layout
Jul 23, 2023
7577e47
fix style for benchmark and face
Jul 23, 2023
4a2d6a8
Merge branch 'idf' of https://github.com/xiangweizeng/c-net into idf
Jul 23, 2023
21be38f
Merge branch 'idf' into main
xiangweizeng Jul 23, 2023
61429af
Merge pull request #3 from xiangweizeng/main
xiangweizeng Jul 23, 2023
f4d8260
Merge pull request #4 from xiangweizeng/idf
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
9 changes: 6 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@

cmake_minimum_required(VERSION 3.0)
project(c-net C)
option(ENABLE_STB_IMAGE "enable stb image" OFF)
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)

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)
Expand Down
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