Remove the _parseNode override since we don't use the memory-aware node bindings anymore

Author: lukamac

Deeploy/CommonExtensions/NetworkDeployers/NetworkDeployerWrapper.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from typing import Any, Tuple, Union
+from typing import Any, Union
 
 import onnx_graphsurgeon as gs
 
@@ -63,11 +63,6 @@ def lower(self, graph: gs.Graph) -> gs.Graph:
     def codeTransform(self, verbose: CodeGenVerbosity = _NoVerbosity):
         return self._innerObject.codeTransform(verbose)
 
-    # MemoryAwareDeployer augment
-    def _parseNode(self, node: ONNXLayer, ctxt: NetworkContext,
-                   default_channels_first: bool) -> Tuple[NetworkContext, bool]:
-        return self._innerObject._parseNode(node, ctxt, default_channels_first)
-
     # PULPDeployer augment
     def generateBufferAllocationCode(self) -> str:
         return self._innerObject.generateBufferAllocationCode()

Deeploy/MemoryLevelExtension/NetworkDeployers/MemoryLevelDeployer.py

@@ -11,7 +11,7 @@
 from Deeploy.CommonExtensions.NetworkDeployers.NetworkDeployerWrapper import NetworkDeployerWrapper
 from Deeploy.CommonExtensions.NetworkDeployers.SignPropDeployer import SignPropDeployer
 from Deeploy.DeeployTypes import CodeGenVerbosity, ConstantBuffer, DeploymentEngine, DeploymentPlatform, \
-    NetworkContext, NetworkDeployer, NetworkOptimizationPass, NetworkOptimizer, ONNXLayer, Schedule, StructBuffer, \
+    NetworkContext, NetworkDeployer, NetworkOptimizationPass, NetworkOptimizer, Schedule, StructBuffer, \
     TopologyOptimizer, TransientBuffer, VariableBuffer, _NoVerbosity
 from Deeploy.Logging import DEFAULT_LOGGER as log
 from Deeploy.MemoryLevelExtension.MemoryLevels import MemoryHierarchy, MemoryLevel
@@ -128,18 +128,6 @@ def getTargetMemoryLevelMapping(self) -> TargetMemoryLevelMapping:
             f"Platform should be a MemoryPlatform or MemoryPlatformWrapper! Got {type(self.Platform).__name__}"
         return TargetMemoryLevelMapping(self.graph, self.Platform, self.ctxt)
 
-    def _parseNode(self, node: ONNXLayer, ctxt: NetworkContext,
-                   default_channels_first: bool) -> Tuple[NetworkContext, bool]:
-
-        newCtxt, parsePass = super()._parseNode(node, ctxt, default_channels_first)
-
-        if not parsePass:
-            return ctxt, False
-
-        newCtxt, self.graph = self.memoryLevelAnnotationOptimizer.optimize(newCtxt, self.graph)
-
-        return newCtxt, parsePass
-
     def bind(self):
 
         ret = super().bind()
@@ -181,22 +169,6 @@ def getTargetMemoryLevelMapping(self) -> TargetMemoryLevelMapping:
             f"Platform should be a MemoryPlatform or MemoryPlatformWrapper! Got {type(self.Platform).__name__}"
         return TargetMemoryLevelMapping(self.graph, self.Platform, self.ctxt)
 
-    def _parseNode(self, node: ONNXLayer, ctxt: NetworkContext,
-                   default_channels_first: bool) -> Tuple[NetworkContext, bool]:
-
-        newCtxt, parsePass = node.parse(ctxt.copy(), default_channels_first)
-
-        if not parsePass:
-            return ctxt, False
-
-        newCtxt, self.graph = self.memoryLevelAnnotationOptimizer.optimize(newCtxt, self.graph)
-        newCtxt, LayerBindSuccess = node.typeCheck(newCtxt)
-
-        if not LayerBindSuccess:
-            return ctxt, False
-
-        return newCtxt, True
-
     def bind(self):
 
         ret = super().bind()
@@ -229,22 +201,6 @@ def getTargetMemoryLevelMapping(self) -> TargetMemoryLevelMapping:
             f"Platform should be a MemoryPlatform or MemoryPlatformWrapper! Got {type(self.Platform).__name__}"
         return TargetMemoryLevelMapping(self.graph, self.Platform, self.ctxt)
 
-    def _parseNode(self, node: ONNXLayer, ctxt: NetworkContext,
-                   default_channels_first: bool) -> Tuple[NetworkContext, bool]:
-
-        newCtxt, parsePass = node.parse(ctxt.copy(), default_channels_first)
-
-        if not parsePass:
-            return ctxt, False
-
-        newCtxt, self.graph = self.memoryLevelAnnotationOptimizer.optimize(newCtxt, self.graph)
-        newCtxt, LayerBindSuccess = node.typeCheck(newCtxt)
-
-        if not LayerBindSuccess:
-            return ctxt, False
-
-        return newCtxt, True
-
     def bind(self):
 
         ret = super().bind()