Skip to content

[NNPA] Update configurations for test cases of backend test for dynamic dimensions #2831

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 10 commits into from
Jun 12, 2024
Merged

[NNPA] Update configurations for test cases of backend test for dynamic dimensions #2831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0cbd8b0
Enable some of test cases for dynamic dimension for NNPA.
imaihal May 21, 2024
37381db
Merge branch 'main' into backendtest_dynamic
imaihal May 23, 2024
0f392ec
Move comments of each line to `==LIM==`
imaihal May 23, 2024
73350bb
Update condiftion for rewriting ConvTranspose op
imaihal May 27, 2024
efd5ee3
Update condition for rwriting Convtranspose op
imaihal May 30, 2024
b514446
Merge branch 'main' into backendtest_dynamic
imaihal Jun 11, 2024
60e51ea
Remove NO_DYNAMIC_SHAPE_TEST in ConvTranspose op.
imaihal Jun 11, 2024
d999426
Use dimAnalysis in legality check.
imaihal Jun 12, 2024
ec65ac6
Clean up config for dynamic backend tests.
imaihal Jun 12, 2024
b703fcf
Merge branch 'main' into backendtest_dynamic
imaihal Jun 12, 2024
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
14 changes: 5 additions & 9 deletions src/Accelerators/NNPA/Conversion/ONNXToZHigh/ONNXLegalityCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ bool isValidElementTypeAndRank(Operation *op, Value val, bool donotCheckRank) {

/// Common legality check for pooling ops.
template <typename POOLOP, typename POOLOPAdaptor, typename POOLOPShapeHelper>
bool checkLegalityPoolOpsCommon(POOLOP op, Value Y) {
bool checkLegalityPoolOpsCommon(
POOLOP op, Value Y, const DimAnalysis *dimAnalysis) {
POOLOPShapeHelper shapeHelper(op.getOperation(), {});
shapeHelper.computeShapeAndAssertOnFailure();
Value X = op.getX();
Expand Down Expand Up @@ -151,12 +152,7 @@ bool checkLegalityPoolOpsCommon(POOLOP op, Value Y) {
// Check "MaxPool2D/AvgPool2D Parameter Restrictions". These restrictions are
// described in "zDNN API Reference". Input tensor N(batchNum) and C(Channel)
// dimensions must always match the output tensor's respective dimensions.
// When unknown dimensions are included, the restrictions are not checked and
// error messages are generated at runtime in zDNN if it doesn't meet.
// if ((inputType.hasStaticShape() && outputType.hasStaticShape()) &&
// (shapeInput[0] != shapeOutput[0] || shapeInput[1] != shapeOutput[1]))
// {
if (shapeInput[0] != shapeOutput[0] || shapeInput[1] != shapeOutput[1]) {
if (!dimAnalysis->sameDim(X, 0, Y, 0) || !dimAnalysis->sameDim(X, 1, Y, 1)) {
std::string message =
"Batch dimension in input tensor (" + std::to_string(shapeInput[0]) +
") and in output tensor (" + std::to_string(shapeOutput[0]) +
Expand Down Expand Up @@ -1137,7 +1133,7 @@ bool isSuitableForZDNN<ONNXMaxPoolSingleOutOp>(

if (!checkLegalityPoolOpsCommon<ONNXMaxPoolSingleOutOp,
ONNXMaxPoolSingleOutOpAdaptor, ONNXMaxPoolSingleOutOpShapeHelper>(
op, op.getO_Y()))
op, op.getO_Y(), dimAnalysis))
return false;

// dilations not supported. Only default one is accepted.
Expand Down Expand Up @@ -1171,7 +1167,7 @@ bool isSuitableForZDNN<ONNXAveragePoolOp>(
") must be default one (0).");

return checkLegalityPoolOpsCommon<ONNXAveragePoolOp, ONNXAveragePoolOpAdaptor,
ONNXAveragePoolOpShapeHelper>(op, op.getY());
ONNXAveragePoolOpShapeHelper>(op, op.getY(), dimAnalysis);
}

/// Check if input, output, kernel, strides, and paddingType for each axis meet
Expand Down
2 changes: 1 addition & 1 deletion src/Dialect/ONNX/Transforms/Decompose.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ bool hasStaticSpatialDims(Value v) {
// so we're left with D1 x D2 ... x Dn.
ArrayRef<int64_t> Ds = NxCxDs.drop_front(2);
// These must all be static for decomposition to work.
return !llvm::any_of(Ds, ShapedType::isDynamic);
return llvm::none_of(Ds, ShapedType::isDynamic);
}

bool shouldDecomposeConvTransposeOp(Value convTransposeResult) {
Expand Down
48 changes: 24 additions & 24 deletions test/accelerators/NNPA/backend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,23 +118,23 @@ set(NNPA_TEST_LIST
# ==LIM== - `auto_pad` must be `NOTSET`, `VALID`, and `SAME_UPPER`. If `NOTSET` is used, `pads` must be set so that the padding valid type or same upper.<br>- `ceil_mode` must be default value(0) <br>- Input and output tensors must be 4D tensors (N x C x H x W).<br>- `kernel_shape` must be static.<br>- `count_include_pad` must be default value(0).<br>- `ceil_mode` must be default value(0).
# test_averagepool_1d_default_cpu
# test_averagepool_2d_ceil_cpu
test_averagepool_2d_default_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_averagepool_2d_default_cpu,zdnn_avgpool2d
# test_averagepool_2d_pads_count_include_pad_cpu
# test_averagepool_2d_pads_cpu
# test_averagepool_2d_precomputed_pads_count_include_pad_cpu
test_averagepool_2d_precomputed_pads_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_averagepool_2d_precomputed_same_upper_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_averagepool_2d_precomputed_strides_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_averagepool_2d_precomputed_same_upper_cpu,zdnn_avgpool2d
test_averagepool_2d_precomputed_strides_cpu,zdnn_avgpool2d
# test_averagepool_2d_same_lower_cpu
test_averagepool_2d_same_upper_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_averagepool_2d_strides_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_averagepool_2d_same_upper_cpu,zdnn_avgpool2d
test_averagepool_2d_strides_cpu,zdnn_avgpool2d
# test_averagepool_3d_default_cpu

# ==OP== BatchNormalization
# ==MIN== 6
# ==LIM== Input and output tensor must be 4D(N x C x H x W).
test_batchnorm_epsilon_cpu,zdnn_mul_ext,NO_DYNAMIC_SHAPE_TEST
test_batchnorm_example_cpu,zdnn_mul_ext,NO_DYNAMIC_SHAPE_TEST
test_batchnorm_epsilon_cpu,zdnn_mul_ext,"0:0=a,1=b,2=c,3=d|1:0=b|2:0=b|3:0=b|4:0=b"
test_batchnorm_example_cpu,zdnn_mul_ext,"0:0=a,1=b,2=c,3=d|1:0=b|2:0=b|3:0=b|4:0=b"

# ==OP== Conv
# ==MIN== 1
Expand All @@ -149,16 +149,16 @@ set(NNPA_TEST_LIST
# ==OP== ConvTranspose
# ==MIN== 1
# ==LIM== - 1D and 3D not supported because Conv1D and Conv3D not supported in zDNN. non-default `dilations` not supported because dilated convolution not supported in zDNN.
# Disable backend tests for ConvTranspose, because they do not work on CPU.
# Spatial dims must be static.
# test_convtranspose_1d_cpu,zdnn_conv1d
# test_convtranspose_3d_cpu
test_convtranspose_autopad_same_cpu,zdnn_conv2d,NO_DYNAMIC_SHAPE_TEST # not work on CPU
test_convtranspose_cpu,zdnn_conv2d,NO_DYNAMIC_SHAPE_TEST # not work on CPU
test_convtranspose_autopad_same_cpu,zdnn_conv2d
test_convtranspose_cpu,zdnn_conv2d
# test_convtranspose_dilations_cpu,zdnn_conv2d
test_convtranspose_kernel_shape_cpu,zdnn_conv2d,NO_DYNAMIC_SHAPE_TEST # not work on CPU
test_convtranspose_output_shape_cpu,zdnn_conv2d,NO_DYNAMIC_SHAPE_TEST # not work on CPU
test_convtranspose_pad_cpu,zdnn_conv2d,NO_DYNAMIC_SHAPE_TEST # not work on CPU
test_convtranspose_pads_cpu,zdnn_conv2d,NO_DYNAMIC_SHAPE_TEST # not work on CPU
test_convtranspose_kernel_shape_cpu,zdnn_conv2d
test_convtranspose_output_shape_cpu,zdnn_conv2d
test_convtranspose_pad_cpu,zdnn_conv2d
test_convtranspose_pads_cpu,zdnn_conv2d

# ==OP== Div
# ==MIN== 6
Expand Down Expand Up @@ -222,7 +222,7 @@ set(NNPA_TEST_LIST
# test_logsoftmax_axis_0_cpu
# test_logsoftmax_axis_1_cpu
# test_logsoftmax_axis_2_cpu,zdnn_log_ext
test_logsoftmax_example_1_cpu,zdnn_softmax_ext,NO_DYNAMIC_SHAPE_TEST
test_logsoftmax_example_1_cpu,zdnn_softmax_ext
# test_logsoftmax_default_axis_cpu
# test_logsoftmax_negative_axis_cpu,zdnn_log_ext
# test_logsoftmax_large_number_cpu # accuracy error in test_logsoftmax_large_number_cpu
Expand All @@ -248,7 +248,7 @@ set(NNPA_TEST_LIST
#test_max_one_input_cpu
test_max_two_inputs_cpu,zdnn_max_ext,"0:0=a|1:0=a"
# test_max_float16_cpu
test_max_float32_cpu,zdnn_max_ext,NO_DYNAMIC_SHAPE_TEST
test_max_float32_cpu,zdnn_max_ext,"0:0=a|1:0=a"
# test_max_float64_cpu
# test_max_int8_cpu
# test_max_int16_cpu
Expand All @@ -264,15 +264,15 @@ set(NNPA_TEST_LIST
# ==LIM== - `auto_pad` must be `NOTSET`, `VALID`, and `SAME_UPPER`. If `NOTSET` is used, `pads` must be set so that the padding valid type or same upper.<br>- `ceil_mode` must be default value(0) <br>- Input and output tensors must be 4D tensors(N x C x H x W).<br>- `kernel_shape` must be static.<br>- `ceil_mode` must be default value(0).<br>- `dilations` must be default value(1).
# test_maxpool_1d_default_cpu
# test_maxpool_2d_ceil_cpu
test_maxpool_2d_default_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_maxpool_2d_default_cpu,zdnn_maxpool2d
# test_maxpool_2d_dilations_cpu
# test_maxpool_2d_pads_cpu
# test_maxpool_2d_precomputed_pads_cpu
test_maxpool_2d_precomputed_same_upper_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_maxpool_2d_precomputed_strides_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_maxpool_2d_precomputed_pads_cpu,zdnn_maxpool2d,NO_DYNAMIC_SHAPE_TEST
test_maxpool_2d_precomputed_same_upper_cpu,zdnn_maxpool2d
test_maxpool_2d_precomputed_strides_cpu,zdnn_maxpool2d
# test_maxpool_2d_same_lower_cpu
test_maxpool_2d_same_upper_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_maxpool_2d_strides_cpu,zdnn_avgpool2d,NO_DYNAMIC_SHAPE_TEST
test_maxpool_2d_same_upper_cpu,zdnn_maxpool2d
test_maxpool_2d_strides_cpu,zdnn_maxpool2d
# test_maxpool_3d_default_cpu

# ==OP== Min
Expand All @@ -282,7 +282,7 @@ set(NNPA_TEST_LIST
# test_min_one_input_cpu
test_min_two_inputs_cpu,zdnn_min_ext,"0:0=a|1:0=a"
# test_min_float16_cpu
test_min_float32_cpu,zdnn_min_ext,NO_DYNAMIC_SHAPE_TEST
test_min_float32_cpu,zdnn_min_ext,"0:0=a|1:0=a"
# test_min_float64_cpu
# test_min_int8_cpu
# test_min_int16_cpu
Expand Down Expand Up @@ -329,7 +329,7 @@ set(NNPA_TEST_LIST
# test_softmax_axis_1_cpu
# test_softmax_axis_2_cpu
# test_softmax_default_axis_cpu
test_softmax_example_cpu,zdnn_softmax_ext,NO_DYNAMIC_SHAPE_TEST
test_softmax_example_cpu,zdnn_softmax_ext
# test_softmax_large_number_cpu # accuracy error

# ==OP== Softplus
Expand Down
Loading