Skip to content
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.

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

Add xnn_define_concatenate for 5 inputs #5913

Merged
merged 1 commit into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,11 @@ IF(XNNPACK_BUILD_TESTS)
TARGET_LINK_LIBRARIES(concatenate4-test PRIVATE XNNPACK GTest::gtest GTest::gtest_main subgraph)
ADD_TEST(NAME concatenate4-test COMMAND concatenate4-test)

ADD_EXECUTABLE(concatenate5-test test/concatenate5.cc)
TARGET_INCLUDE_DIRECTORIES(concatenate5-test PRIVATE src test)
TARGET_LINK_LIBRARIES(concatenate5-test PRIVATE XNNPACK GTest::gtest GTest::gtest_main subgraph)
ADD_TEST(NAME concatenate5-test COMMAND concatenate5-test)

ADD_EXECUTABLE(convert-test test/convert.cc)
TARGET_INCLUDE_DIRECTORIES(convert-test PRIVATE src test)
TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK fp16 GTest::gtest GTest::gtest_main subgraph)
Expand Down
11 changes: 11 additions & 0 deletions include/xnnpack.h
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,17 @@ enum xnn_status xnn_define_concatenate4(
uint32_t output_id,
uint32_t flags);

enum xnn_status xnn_define_concatenate5(
xnn_subgraph_t subgraph,
size_t axis,
uint32_t input1_id,
uint32_t input2_id,
uint32_t input3_id,
uint32_t input4_id,
uint32_t input5_id,
uint32_t output_id,
uint32_t flags);

/// Define a Copy Node and add it to a Subgraph.
///
/// The Copy Node copies an input tensor to an output tensor.
Expand Down
9 changes: 5 additions & 4 deletions src/enums/node-type.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@


#if XNN_LOG_LEVEL > 0
static const uint16_t offset[55] = {
0, 8, 12, 17, 35, 54, 71, 93, 101, 107, 120, 133, 146, 154, 169, 174, 191, 209, 234, 241, 245, 257, 269, 281, 287,
303, 326, 352, 378, 400, 422, 432, 443, 458, 467, 476, 486, 493, 499, 504, 533, 541, 549, 567, 574, 586, 605, 625,
637, 652, 678, 691, 708, 717, 722
static const uint16_t offset[56] = {
0, 8, 12, 17, 35, 54, 71, 93, 101, 107, 120, 133, 146, 159, 167, 182, 187, 204, 222, 247, 254, 258, 270, 282, 294,
300, 316, 339, 365, 391, 413, 435, 445, 456, 471, 480, 489, 499, 506, 512, 517, 546, 554, 562, 580, 587, 599, 618,
638, 650, 665, 691, 704, 721, 730, 735
};

static const char data[] =
Expand All @@ -34,6 +34,7 @@ static const char data[] =
"Concatenate2\0"
"Concatenate3\0"
"Concatenate4\0"
"Concatenate5\0"
"Convert\0"
"Convolution 2D\0"
"Copy\0"
Expand Down
2 changes: 2 additions & 0 deletions src/enums/node-type.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
string: "Concatenate3"
- name: xnn_node_type_concatenate4
string: "Concatenate4"
- name: xnn_node_type_concatenate5
string: "Concatenate5"
- name: xnn_node_type_convert
string: "Convert"
- name: xnn_node_type_convolution_2d
Expand Down
Loading
Loading