From 181473307ca4e8745dbb0c8474f2615d1752b03a Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Wed, 17 Nov 2021 14:34:30 +0000 Subject: IVGCVSW-6584 AddConvolution3dLayer to PyArmNN Signed-off-by: Teresa Charlin Change-Id: I6d09abb75db1875d4d4075b1801fdc46a0f4ae7b --- python/pyarmnn/test/test_descriptors.py | 21 ++++++++++++++++++++- python/pyarmnn/test/test_network.py | 3 ++- 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'python/pyarmnn/test') diff --git a/python/pyarmnn/test/test_descriptors.py b/python/pyarmnn/test/test_descriptors.py index 507afad46e..54b79d7397 100644 --- a/python/pyarmnn/test/test_descriptors.py +++ b/python/pyarmnn/test/test_descriptors.py @@ -1,4 +1,4 @@ -# Copyright © 2020 Arm Ltd. All rights reserved. +# Copyright © 2020 Arm Ltd and Contributors. All rights reserved. # SPDX-License-Identifier: MIT import inspect @@ -101,6 +101,23 @@ def test_convolution2d_descriptor_default_values(): assert desc.m_BiasEnabled == False assert desc.m_DataLayout == ann.DataLayout_NCHW +def test_convolution3d_descriptor_default_values(): + desc = ann.Convolution3dDescriptor() + assert desc.m_PadLeft == 0 + assert desc.m_PadTop == 0 + assert desc.m_PadRight == 0 + assert desc.m_PadBottom == 0 + assert desc.m_PadFront == 0 + assert desc.m_PadBack == 0 + assert desc.m_StrideX == 1 + assert desc.m_StrideY == 1 + assert desc.m_StrideZ == 1 + assert desc.m_DilationX == 1 + assert desc.m_DilationY == 1 + assert desc.m_DilationZ == 1 + assert desc.m_BiasEnabled == False + assert desc.m_DataLayout == ann.DataLayout_NDHWC + def test_depthtospace_descriptor_default_values(): desc = ann.DepthToSpaceDescriptor() @@ -486,6 +503,7 @@ generated_classes_names = list(map(lambda x: x[0], generated_classes)) 'Pooling2dDescriptor', 'FullyConnectedDescriptor', 'Convolution2dDescriptor', + 'Convolution3dDescriptor', 'DepthwiseConvolution2dDescriptor', 'DetectionPostProcessDescriptor', 'NormalizationDescriptor', @@ -532,6 +550,7 @@ generated_classes_names = list(map(lambda x: x[0], generated_classes)) 'Pooling2dDescriptor', 'FullyConnectedDescriptor', 'Convolution2dDescriptor', + 'Convolution3dDescriptor', 'DepthwiseConvolution2dDescriptor', 'DetectionPostProcessDescriptor', 'NormalizationDescriptor', diff --git a/python/pyarmnn/test/test_network.py b/python/pyarmnn/test/test_network.py index d734f619f7..04e1b7a05f 100644 --- a/python/pyarmnn/test/test_network.py +++ b/python/pyarmnn/test/test_network.py @@ -1,4 +1,4 @@ -# Copyright © 2020 Arm Ltd. All rights reserved. +# Copyright © 2020 Arm Ltd and Contributors. All rights reserved. # SPDX-License-Identifier: MIT import os import stat @@ -197,6 +197,7 @@ def test_serialize_to_dot_mode_readonly(network_file, get_runtime, tmpdir): 'AddConcatLayer', 'AddConstantLayer', 'AddConvolution2dLayer', + 'AddConvolution3dLayer', 'AddDepthToSpaceLayer', 'AddDepthwiseConvolution2dLayer', 'AddDequantizeLayer', -- cgit v1.2.1