From 95b07c1c0fed6a985607131e59a593786d40b389 Mon Sep 17 00:00:00 2001 From: Rickard Bolin Date: Wed, 27 Apr 2022 16:27:31 +0000 Subject: MLBEDSW-6425: Update to TensorFlow 2.8 (bugfix) Generate flatbuffer files with relative imports. Signed-off-by: Rickard Bolin Change-Id: Idd59bb2ebb829bc42677920577c1f8a04e23ca68 --- README.md | 3 ++- ethosu/vela/tflite/Model.py | 10 +++++----- ethosu/vela/tflite/SignatureDef.py | 4 ++-- ethosu/vela/tflite/SparsityParameters.py | 2 +- ethosu/vela/tflite/SubGraph.py | 4 ++-- ethosu/vela/tflite/Tensor.py | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b5f352eb..051ebf37 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,8 @@ The tool has limited functionality for compiling a ## TensorFlow Support -* Vela 3.3.0 to current supports TensorFlow 2.7 +* Vela 3.4.0 to current supports TensorFlow 2.8 +* Vela 3.3.0 supports TensorFlow 2.7 * Vela 3.1.0 to 3.2.0 supports TensorFlow 2.5 * Vela 2.1.0 to 3.0.0 supports TensorFlow 2.4 * Vela 2.0.0 to 2.0.1 supports TensorFlow 2.3 diff --git a/ethosu/vela/tflite/Model.py b/ethosu/vela/tflite/Model.py index 660695fb..8a12d103 100644 --- a/ethosu/vela/tflite/Model.py +++ b/ethosu/vela/tflite/Model.py @@ -42,7 +42,7 @@ class Model(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.OperatorCode import OperatorCode + from .OperatorCode import OperatorCode obj = OperatorCode() obj.Init(self._tab.Bytes, x) return obj @@ -67,7 +67,7 @@ class Model(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.SubGraph import SubGraph + from .SubGraph import SubGraph obj = SubGraph() obj.Init(self._tab.Bytes, x) return obj @@ -99,7 +99,7 @@ class Model(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.Buffer import Buffer + from .Buffer import Buffer obj = Buffer() obj.Init(self._tab.Bytes, x) return obj @@ -151,7 +151,7 @@ class Model(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.Metadata import Metadata + from .Metadata import Metadata obj = Metadata() obj.Init(self._tab.Bytes, x) return obj @@ -176,7 +176,7 @@ class Model(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.SignatureDef import SignatureDef + from .SignatureDef import SignatureDef obj = SignatureDef() obj.Init(self._tab.Bytes, x) return obj diff --git a/ethosu/vela/tflite/SignatureDef.py b/ethosu/vela/tflite/SignatureDef.py index 787b6840..f75494b5 100644 --- a/ethosu/vela/tflite/SignatureDef.py +++ b/ethosu/vela/tflite/SignatureDef.py @@ -35,7 +35,7 @@ class SignatureDef(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.TensorMap import TensorMap + from .TensorMap import TensorMap obj = TensorMap() obj.Init(self._tab.Bytes, x) return obj @@ -60,7 +60,7 @@ class SignatureDef(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.TensorMap import TensorMap + from .TensorMap import TensorMap obj = TensorMap() obj.Init(self._tab.Bytes, x) return obj diff --git a/ethosu/vela/tflite/SparsityParameters.py b/ethosu/vela/tflite/SparsityParameters.py index 76485f4b..5da46927 100644 --- a/ethosu/vela/tflite/SparsityParameters.py +++ b/ethosu/vela/tflite/SparsityParameters.py @@ -89,7 +89,7 @@ class SparsityParameters(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.DimensionMetadata import DimensionMetadata + from .DimensionMetadata import DimensionMetadata obj = DimensionMetadata() obj.Init(self._tab.Bytes, x) return obj diff --git a/ethosu/vela/tflite/SubGraph.py b/ethosu/vela/tflite/SubGraph.py index d93c5b51..7cd97f26 100644 --- a/ethosu/vela/tflite/SubGraph.py +++ b/ethosu/vela/tflite/SubGraph.py @@ -35,7 +35,7 @@ class SubGraph(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.Tensor import Tensor + from .Tensor import Tensor obj = Tensor() obj.Init(self._tab.Bytes, x) return obj @@ -114,7 +114,7 @@ class SubGraph(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from tflite.Operator import Operator + from .Operator import Operator obj = Operator() obj.Init(self._tab.Bytes, x) return obj diff --git a/ethosu/vela/tflite/Tensor.py b/ethosu/vela/tflite/Tensor.py index 4284319a..2d7f9b6c 100644 --- a/ethosu/vela/tflite/Tensor.py +++ b/ethosu/vela/tflite/Tensor.py @@ -81,7 +81,7 @@ class Tensor(object): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12)) if o != 0: x = self._tab.Indirect(o + self._tab.Pos) - from tflite.QuantizationParameters import QuantizationParameters + from .QuantizationParameters import QuantizationParameters obj = QuantizationParameters() obj.Init(self._tab.Bytes, x) return obj @@ -99,7 +99,7 @@ class Tensor(object): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(16)) if o != 0: x = self._tab.Indirect(o + self._tab.Pos) - from tflite.SparsityParameters import SparsityParameters + from .SparsityParameters import SparsityParameters obj = SparsityParameters() obj.Init(self._tab.Bytes, x) return obj -- cgit v1.2.1