From 827e0da614da489d506d07d96e6f27087da4292c Mon Sep 17 00:00:00 2001 From: Yelin Jeong Date: Thu, 29 Dec 2022 10:55:26 +0900 Subject: [PATCH] [transform] increase rank for tensor_transform This patch increases rank to 8 for tensor_transform. - change regex pattern - add test cases using transpose, dimchg Signed-off-by: Yelin Jeong --- gst/nnstreamer/elements/gsttensor_transform.c | 4 ++-- tests/transform_dimchg/runTest.sh | 1 + tests/transform_transpose/runTest.sh | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gst/nnstreamer/elements/gsttensor_transform.c b/gst/nnstreamer/elements/gsttensor_transform.c index 968f140..023412d 100644 --- a/gst/nnstreamer/elements/gsttensor_transform.c +++ b/gst/nnstreamer/elements/gsttensor_transform.c @@ -67,7 +67,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_tensor_transform_debug); #define GST_CAT_DEFAULT gst_tensor_transform_debug #define CAPS_STRING GST_TENSOR_CAP_DEFAULT ";" GST_TENSORS_CAP_MAKE ("{ static, flexible }") -#define REGEX_DIMCHG_OPTION "^([0-3]):([0-3])$" +#define REGEX_DIMCHG_OPTION "^([0-7]):([0-7])$" #define REGEX_TYPECAST_OPTION "(^[u]?int(8|16|32|64)$|^float(16|32|64)$)" #define REGEX_TRANSPOSE_OPTION "^(?:([0-2]):(?!.*\\1)){3}3$" #define REGEX_STAND_OPTION "^(default|dc-average)(:([u]?int(8|16|32|64)|float(16|32|64)))?(,per-channel:(true|false))?$" @@ -180,7 +180,7 @@ gst_tensor_transform_mode_get_type (void) static GEnumValue mode_types[] = { {GTT_DIMCHG, "Mode for changing tensor dimensions, " "option=FROM_DIM:TO_DIM (with a regex, " REGEX_DIMCHG_OPTION - ", where NNS_TENSOR_RANK_LIMIT is 4)", + ", where NNS_TENSOR_RANK_LIMIT is 8)", "dimchg"}, {GTT_TYPECAST, "Mode for casting type of tensor, " "option=" REGEX_TYPECAST_OPTION, "typecast"}, diff --git a/tests/transform_dimchg/runTest.sh b/tests/transform_dimchg/runTest.sh index 1ccd80f..0d2d9ae 100644 --- a/tests/transform_dimchg/runTest.sh +++ b/tests/transform_dimchg/runTest.sh @@ -26,6 +26,7 @@ if [ "$SKIPGEN" == "YES" ]; then else echo "Test Case Generation Started" python3 ../nnstreamer_converter/generateGoldenTestResult.py 8 + python3 ../nnstreamer_filter_pytorch/generateTest.py sopath=$1 fi convertBMP2PNG diff --git a/tests/transform_transpose/runTest.sh b/tests/transform_transpose/runTest.sh index 3a5e270..8ee0af4 100755 --- a/tests/transform_transpose/runTest.sh +++ b/tests/transform_transpose/runTest.sh @@ -68,6 +68,9 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} multifilesrc location=\"test01_%02d callCompareTest test01_00.dat.golden result06_00.log 6 "Compare 6" 1 0 +# transform_transpose now only support rank 4 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} multifilesrc location=\"test01_%02d.dat\" caps=\"application/octet-stream\" ! tensor_converter input-dim=10:50:3:1:10 input-type=float32 ! tensor_transform mode=transpose option=2:0:1:3:4 ! multifilesink location=\"./result07_%02d.log\" sync=true" 7_n 0 1 $PERFORMANCE + rm *.log *.bmp *.png *.golden *.raw *.dat report -- 2.7.4