From 4b7179936d659a6d4abd6b7659c2cc05c5a845fb Mon Sep 17 00:00:00 2001 From: Rickard Bolin Date: Fri, 3 Feb 2023 11:04:43 +0000 Subject: Revert "MLBEDSW-6954: Update to TensorFlow 2.11" This reverts commit 9d254b6f9e76ccf266a0f72a0171e73bc8d435c9. Reason for revert: Due to 0-size constants being treated differently (MLTOOLS-2043) Change-Id: Ie1150fb2dd9092050a7fd44708a893d52ffe59f8 Signed-off-by: Rickard Bolin --- ethosu/vela/tflite/TensorType.py | 1 - ethosu/vela/tflite/TransposeConvOptions.py | 12 +----------- ethosu/vela/tflite_mapping.py | 4 +--- 3 files changed, 2 insertions(+), 15 deletions(-) (limited to 'ethosu') diff --git a/ethosu/vela/tflite/TensorType.py b/ethosu/vela/tflite/TensorType.py index 604d4362..621d0c54 100644 --- a/ethosu/vela/tflite/TensorType.py +++ b/ethosu/vela/tflite/TensorType.py @@ -20,4 +20,3 @@ class TensorType(object): VARIANT = 14 UINT32 = 15 UINT16 = 16 - INT4 = 17 diff --git a/ethosu/vela/tflite/TransposeConvOptions.py b/ethosu/vela/tflite/TransposeConvOptions.py index af9159c2..a11a79e9 100644 --- a/ethosu/vela/tflite/TransposeConvOptions.py +++ b/ethosu/vela/tflite/TransposeConvOptions.py @@ -49,14 +49,7 @@ class TransposeConvOptions(object): return self._tab.Get(flatbuffers.number_types.Int32Flags, o + self._tab.Pos) return 0 - # TransposeConvOptions - def FusedActivationFunction(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10)) - if o != 0: - return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos) - return 0 - -def TransposeConvOptionsStart(builder): builder.StartObject(4) +def TransposeConvOptionsStart(builder): builder.StartObject(3) def Start(builder): return TransposeConvOptionsStart(builder) def TransposeConvOptionsAddPadding(builder, padding): builder.PrependInt8Slot(0, padding, 0) @@ -68,9 +61,6 @@ def AddStrideW(builder, strideW): def TransposeConvOptionsAddStrideH(builder, strideH): builder.PrependInt32Slot(2, strideH, 0) def AddStrideH(builder, strideH): return TransposeConvOptionsAddStrideH(builder, strideH) -def TransposeConvOptionsAddFusedActivationFunction(builder, fusedActivationFunction): builder.PrependInt8Slot(3, fusedActivationFunction, 0) -def AddFusedActivationFunction(builder, fusedActivationFunction): - return TransposeConvOptionsAddFusedActivationFunction(builder, fusedActivationFunction) def TransposeConvOptionsEnd(builder): return builder.EndObject() def End(builder): return TransposeConvOptionsEnd(builder) \ No newline at end of file diff --git a/ethosu/vela/tflite_mapping.py b/ethosu/vela/tflite_mapping.py index 11f74ba9..8ec01737 100644 --- a/ethosu/vela/tflite_mapping.py +++ b/ethosu/vela/tflite_mapping.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2020-2023 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: Copyright 2020-2022 Arm Limited and/or its affiliates # # SPDX-License-Identifier: Apache-2.0 # @@ -162,7 +162,6 @@ def inverse_map(map): datatype_map = { - TensorType.INT4: DataType.int4, TensorType.UINT8: DataType.uint8, TensorType.INT8: DataType.int8, TensorType.INT16: DataType.int16, @@ -185,7 +184,6 @@ datatype_map = { datatype_inv_map = inverse_map(datatype_map) datatype_inv_map[DataType.quint8] = TensorType.UINT8 -datatype_inv_map[DataType.qint4] = TensorType.INT4 datatype_inv_map[DataType.qint8] = TensorType.INT8 datatype_inv_map[DataType.qint16] = TensorType.INT16 datatype_inv_map[DataType.qint32] = TensorType.INT32 -- cgit v1.2.1