diff options
author | Cathal Corbett <cathal.corbett@arm.com> | 2021-10-22 11:12:07 +0100 |
---|---|---|
committer | David Monahan <david.monahan@arm.com> | 2021-11-08 19:05:11 +0000 |
commit | 5b8093c17044e8eaaaa42d96ba4902dee5791be4 (patch) | |
tree | 7f49f91e76f171041fe51c2c078b9271aa220b48 /python/pyarmnn/src/pyarmnn/_tensor/const_tensor.py | |
parent | d69cb904415621b066599dc20164bdb71558dc14 (diff) | |
download | armnn-5b8093c17044e8eaaaa42d96ba4902dee5791be4.tar.gz |
IVGCVSW-6420: Constant flag in tensor info is not set correctly
!android-nn-driver:6532
!armnn-internal-tests:372451
* Made fix to 2 out of 3 ConstTensor() constructors in Tensor.hpp to
throw InvalidArgumentException when TensorInfo isConstant parameter
is false.
* Added new ConstTensor() constructor in Tensor.cpp to accept vector<>.data()
using template<typename MemoryType>.
* Fixed runtime->GetOutputTensorInfo()/GetInputTensorInfo() methods and
called submethods to return TensorInfo& rather than TensorInfo.
* Fixed all failing unit tests for CpuRef/CpuAcc/GpuAcc to ensure any
ConstTensor created has it's TensorInfo isConstant set to true.
* Added unit tests in TensorTest.cpp to ensure ConstTensor constructors
throw InvalidArgumentException when TensorInfo isConstat parameter is
false.
* Added unit test to ensure an empty ConstTensor constructor will set
TensorInfo isConatant to true.
* Indentation fixes.
* Fix to arm_tensor.i to add isConstant parameter to TensorInfo
constructor. Added methods IsConstant() and SetConstant().
* Fix to const_tensor.py to throw ValueError when TensorInfo
isConstant is set to false when constructing a ConstTensor.
* Fixed PyArmnn unit tests to set TensorInfo isConstant to
True when ConstTensor is used.
* Added unit tests in test_const_tensor.py to ensure ConstTensor
constructors throw ValueError when TensorInfo isConstat parameter
is false.
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I44e440dd0422c366d31bbdbc77ad2b4db0bde148
Diffstat (limited to 'python/pyarmnn/src/pyarmnn/_tensor/const_tensor.py')
-rw-r--r-- | python/pyarmnn/src/pyarmnn/_tensor/const_tensor.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/python/pyarmnn/src/pyarmnn/_tensor/const_tensor.py b/python/pyarmnn/src/pyarmnn/_tensor/const_tensor.py index 94995bdd8c..ab4305c18e 100644 --- a/python/pyarmnn/src/pyarmnn/_tensor/const_tensor.py +++ b/python/pyarmnn/src/pyarmnn/_tensor/const_tensor.py @@ -59,24 +59,31 @@ class ConstTensor(AnnConstTensor): Raises: TypeError: Unsupported input data type. - ValueError: Unsupported tensor data type and incorrect input data size. + ValueError: Unsupported tensor data type, incorrect input data size and creation of ConstTensor from non-constant TensorInfo. """ self.__memory_area = None # TensorInfo as first argument and numpy array as second if len(args) > 1 and isinstance(args[0], TensorInfo): - if isinstance(args[1], np.ndarray): + if not isinstance(args[1], np.ndarray): + raise TypeError('Data must be provided as a numpy array.') + # if TensorInfo IsConstant is false + elif not args[0].IsConstant(): + raise ValueError('TensorInfo when initializing ConstTensor must be set to constant.') + else: self.__create_memory_area(args[0].GetDataType(), args[0].GetNumBytes(), args[0].GetNumElements(), args[1]) super().__init__(args[0], self.__memory_area.data) - else: - raise TypeError('Data must be provided as a numpy array.') # copy constructor - reference to memory area is passed from copied const # tensor and armnn's copy constructor is called elif len(args) > 0 and isinstance(args[0], (ConstTensor, Tensor)): - self.__memory_area = args[0].get_memory_area() - super().__init__(args[0]) + # if TensorInfo IsConstant is false + if not args[0].GetInfo().IsConstant(): + raise ValueError('TensorInfo of Tensor when initializing ConstTensor must be set to constant.') + else: + self.__memory_area = args[0].get_memory_area() + super().__init__(args[0]) # empty tensor elif len(args) == 0: |