Skip to content

Commit 9b44940

Browse files
lee2716lee2716
committed
style: consolidate imports in Snitch platform
1 parent caaf547 commit 9b44940

28 files changed

+210
-397
lines changed

‎Deeploy/Targets/Snitch/Bindings.py‎

Lines changed: 21 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,21 @@
55
from functools import partial
66

77
from Deeploy.AbstractDataTypes import PointerClass
8-
from Deeploy.CommonExtensions.CodeTransformationPasses.Closure import ClosureGeneration
9-
from Deeploy.CommonExtensions.CodeTransformationPasses.Closure import MemoryAwareClosureGeneration
10-
from Deeploy.CommonExtensions.CodeTransformationPasses.MemoryAllocation import ArgumentStructGeneration
11-
from Deeploy.CommonExtensions.CodeTransformationPasses.MemoryAllocation import MemoryManagementGeneration
12-
from Deeploy.CommonExtensions.DataTypes import float32_t
13-
from Deeploy.CommonExtensions.DataTypes import int8_t
14-
from Deeploy.CommonExtensions.DataTypes import int32_t
15-
from Deeploy.CommonExtensions.DataTypes import uint8_t
16-
from Deeploy.DeeployTypes import CodeTransformation
17-
from Deeploy.DeeployTypes import NodeBinding
8+
from Deeploy.CommonExtensions.CodeTransformationPasses.Closure import ClosureGeneration, MemoryAwareClosureGeneration
9+
from Deeploy.CommonExtensions.CodeTransformationPasses.MemoryAllocation import ArgumentStructGeneration, \
10+
MemoryManagementGeneration
11+
from Deeploy.CommonExtensions.DataTypes import float32_t, int8_t, int32_t, uint8_t
12+
from Deeploy.DeeployTypes import CodeTransformation, NodeBinding
1813
from Deeploy.FutureExtension.CodeTransformationPasses.FutureCodeTransformation import FutureGeneration
19-
from Deeploy.Targets.Generic.Templates import ConcatTemplate
20-
from Deeploy.Targets.Generic.Templates import iNoNormTemplate
21-
from Deeploy.Targets.Generic.TypeCheckers import AddChecker
22-
from Deeploy.Targets.Generic.TypeCheckers import ConcatChecker
23-
from Deeploy.Targets.Generic.TypeCheckers import DivChecker
24-
from Deeploy.Targets.Generic.TypeCheckers import GatherChecker
25-
from Deeploy.Targets.Generic.TypeCheckers import GEMMChecker
26-
from Deeploy.Targets.Generic.TypeCheckers import HardSwishChecker
27-
from Deeploy.Targets.Generic.TypeCheckers import iNoNormChecker
28-
from Deeploy.Targets.Generic.TypeCheckers import MatMulChecker
29-
from Deeploy.Targets.Generic.TypeCheckers import MulChecker
30-
from Deeploy.Targets.Generic.TypeCheckers import ReshapeChecker
31-
from Deeploy.Targets.Generic.TypeCheckers import RMSNormChecker
32-
from Deeploy.Targets.Generic.TypeCheckers import RQAddChecker
33-
from Deeploy.Targets.Generic.TypeCheckers import SoftmaxChecker
34-
from Deeploy.Targets.Generic.TypeCheckers import TransposeChecker
35-
from Deeploy.Targets.Snitch.CodeTransformationPasses import SnitchClusterTiling
36-
from Deeploy.Targets.Snitch.CodeTransformationPasses import SnitchCoreFilterPass
37-
from Deeploy.Targets.Snitch.CodeTransformationPasses import SnitchSynchCoresPass
14+
from Deeploy.Targets.Generic.Templates import ConcatTemplate, iNoNormTemplate
15+
from Deeploy.Targets.Generic.TypeCheckers import AddChecker, ConcatChecker, DivChecker, GatherChecker, GEMMChecker, \
16+
HardSwishChecker, MatMulChecker, MulChecker, ReshapeChecker, RMSNormChecker, RQAddChecker, SoftmaxChecker, \
17+
TransposeChecker, iNoNormChecker
18+
from Deeploy.Targets.Snitch.CodeTransformationPasses import SnitchClusterTiling, SnitchCoreFilterPass, \
19+
SnitchSynchCoresPass
3820
from Deeploy.Targets.Snitch.DMA.SnitchDma import SnitchDma
39-
from Deeploy.Targets.Snitch.Templates import AddTemplate
40-
from Deeploy.Targets.Snitch.Templates import FloatGemmTemplate
41-
from Deeploy.Targets.Snitch.Templates import FloatMatMulTemplate
42-
from Deeploy.Targets.Snitch.Templates import GatherTemplate
43-
from Deeploy.Targets.Snitch.Templates import iSoftmaxTemplate
44-
from Deeploy.Targets.Snitch.Templates import MatMulTemplate
45-
from Deeploy.Targets.Snitch.Templates import ReshapeTemplate
46-
from Deeploy.Targets.Snitch.Templates import RQAddTemplate
47-
from Deeploy.Targets.Snitch.Templates import TransposeTemplate
21+
from Deeploy.Targets.Snitch.Templates import AddTemplate, FloatGemmTemplate, FloatMatMulTemplate, GatherTemplate, \
22+
MatMulTemplate, ReshapeTemplate, RQAddTemplate, TransposeTemplate, iSoftmaxTemplate
4823
from Deeploy.Targets.Snitch.Templates.FloatAddTemplate import referenceTemplate as FloatAddTemplate
4924
from Deeploy.Targets.Snitch.Templates.FloatDivTemplate import referenceTemplate as FloatDivTemplate
5025
from Deeploy.Targets.Snitch.Templates.FloatHardSwishTemplate import referenceTemplate as FloatHardSwishTemplate
@@ -53,14 +28,14 @@
5328
from Deeploy.Targets.Snitch.Templates.FloatSoftmaxTemplate import FloatSoftmax_Template
5429
from Deeploy.Targets.Snitch.Templates.GemmTemplate import SnitchGemm_Template
5530
from Deeploy.Targets.Snitch.Templates.RqGemmTemplate import SnitchRqGemm_Template
56-
from Deeploy.TilingExtension.CodeTransformationPasses.TilingVariableReplacement import TilingVariableReplacement
57-
from Deeploy.TilingExtension.CodeTransformationPasses.TilingVariableReplacement import TilingVariableReplacementUpdate
31+
from Deeploy.TilingExtension.CodeTransformationPasses.TilingVariableReplacement import TilingVariableReplacement, \
32+
TilingVariableReplacementUpdate
5833

59-
TilingCallClosure = partial(ClosureGeneration, closureSuffix = "_tiling_closure")
34+
TilingCallClosure = partial(ClosureGeneration, closureSuffix="_tiling_closure")
6035
MemoryAwareFunctionCallClosure = partial(MemoryAwareClosureGeneration,
61-
closureSuffix = "_closure",
62-
startRegion = "L2",
63-
endRegion = "L1")
36+
closureSuffix="_closure",
37+
startRegion="L2",
38+
endRegion="L1")
6439

6540
BasicTransformer = CodeTransformation(
6641
[SnitchSynchCoresPass(),
@@ -71,13 +46,13 @@
7146
TiledTransformer = CodeTransformation([
7247
SnitchCoreFilterPass("compute"),
7348
TilingVariableReplacement("L1"),
74-
TilingCallClosure(writeback = False),
49+
TilingCallClosure(writeback=False),
7550
SnitchSynchCoresPass(),
7651
TilingVariableReplacementUpdate("L1"),
7752
SnitchClusterTiling("L2", "L1", SnitchDma()),
7853
ArgumentStructGeneration(),
7954
MemoryManagementGeneration("L1"),
80-
MemoryAwareFunctionCallClosure(writeback = False, generateStruct = True),
55+
MemoryAwareFunctionCallClosure(writeback=False, generateStruct=True),
8156
MemoryManagementGeneration("L2"),
8257
MemoryManagementGeneration()
8358
])

‎Deeploy/Targets/Snitch/CodeTransformationPasses/SnitchClusterSynch.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
from typing import Tuple
66

7-
from Deeploy.DeeployTypes import _NoVerbosity
8-
from Deeploy.DeeployTypes import CodeGenVerbosity
9-
from Deeploy.DeeployTypes import CodeTransformationPass
10-
from Deeploy.DeeployTypes import ExecutionBlock
11-
from Deeploy.DeeployTypes import NetworkContext
12-
from Deeploy.DeeployTypes import NodeTemplate
7+
from Deeploy.DeeployTypes import CodeGenVerbosity, CodeTransformationPass, ExecutionBlock, NetworkContext, \
8+
NodeTemplate, _NoVerbosity
139

1410
_synchTemplate = NodeTemplate("""
1511
snrt_cluster_hw_barrier();

‎Deeploy/Targets/Snitch/CodeTransformationPasses/SnitchCoreFilter.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
from typing import Literal, Tuple
66

7-
from Deeploy.DeeployTypes import _NoVerbosity
8-
from Deeploy.DeeployTypes import CodeGenVerbosity
9-
from Deeploy.DeeployTypes import CodeTransformationPass
10-
from Deeploy.DeeployTypes import ExecutionBlock
11-
from Deeploy.DeeployTypes import NetworkContext
12-
from Deeploy.DeeployTypes import NodeTemplate
7+
from Deeploy.DeeployTypes import CodeGenVerbosity, CodeTransformationPass, ExecutionBlock, NetworkContext, \
8+
NodeTemplate, _NoVerbosity
139

1410

1511
class SnitchCoreFilterPass(CodeTransformationPass):

‎Deeploy/Targets/Snitch/CodeTransformationPasses/SnitchProfileExecutionBlock.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
from typing import Tuple
66

7-
from Deeploy.DeeployTypes import _NoVerbosity
8-
from Deeploy.DeeployTypes import CodeGenVerbosity
9-
from Deeploy.DeeployTypes import CodeTransformationPass
10-
from Deeploy.DeeployTypes import ExecutionBlock
11-
from Deeploy.DeeployTypes import NetworkContext
12-
from Deeploy.DeeployTypes import NodeTemplate
7+
from Deeploy.DeeployTypes import CodeGenVerbosity, CodeTransformationPass, ExecutionBlock, NetworkContext, \
8+
NodeTemplate, _NoVerbosity
139

1410
_dumpCycleCntTemplate = NodeTemplate("""
1511
snrt_cluster_hw_barrier();

‎Deeploy/Targets/Snitch/DMA/SnitchDma.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@
44

55
from typing import Dict, Tuple
66

7-
from Deeploy.DeeployTypes import NetworkContext
8-
from Deeploy.DeeployTypes import NodeTemplate
9-
from Deeploy.DeeployTypes import OperatorRepresentation
10-
from Deeploy.DeeployTypes import VariableBuffer
11-
from Deeploy.TilingExtension.AsyncDma import AsyncDma
12-
from Deeploy.TilingExtension.AsyncDma import DmaDirection
13-
from Deeploy.TilingExtension.AsyncDma import Future
14-
from Deeploy.TilingExtension.AsyncDma import PerTensorWaitingStrategy
7+
from Deeploy.DeeployTypes import NetworkContext, NodeTemplate, OperatorRepresentation, VariableBuffer
8+
from Deeploy.TilingExtension.AsyncDma import AsyncDma, DmaDirection, Future, PerTensorWaitingStrategy
159

1610

1711
class SnitchBarrierFuture(Future):
@@ -37,7 +31,7 @@ class SnitchDma(AsyncDma):
3731

3832
_transferTemplates = {
3933
2:
40-
NodeTemplate("""
34+
NodeTemplate("""
4135
if (snrt_is_dm_core()) {
4236
${future} = snrt_dma_start_2d(${dest}, ${src}, ${size}, ${stride_dest}, ${stride_src}, ${repeat});
4337
// WIESEP: Hack as otherwise the last commited DMA transaction ID can never be resolved.

‎Deeploy/Targets/Snitch/DataTypes.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
from Deeploy.AbstractDataTypes import PointerClass
6-
from Deeploy.AbstractDataTypes import Struct
7-
from Deeploy.AbstractDataTypes import VoidType
5+
from Deeploy.AbstractDataTypes import PointerClass, Struct, VoidType
86
from Deeploy.CommonExtensions.DataTypes import uint16_t
97

108

‎Deeploy/Targets/Snitch/Deployer.py‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,10 @@
99
from Deeploy.AbstractDataTypes import Pointer
1010
from Deeploy.CommonExtensions.NetworkDeployers.SignPropDeployer import SignPropDeployer
1111
from Deeploy.CommonExtensions.OptimizationPasses.TopologyOptimizationPasses.LoweringOptimizationPasses import \
12-
NCHWtoNHWCPass
13-
from Deeploy.CommonExtensions.OptimizationPasses.TopologyOptimizationPasses.LoweringOptimizationPasses import \
14-
RemoveGlobalOutputReshapePass
15-
from Deeploy.CommonExtensions.OptimizationPasses.TopologyOptimizationPasses.LoweringOptimizationPasses import \
16-
TransposeMatmulInputsPass
17-
from Deeploy.DeeployTypes import DeploymentPlatform
18-
from Deeploy.DeeployTypes import TopologyOptimizer
19-
from Deeploy.Targets.Generic.TopologyOptimizationPasses.Passes import ReshapeConstOptPass
20-
from Deeploy.Targets.Generic.TopologyOptimizationPasses.Passes import TransposeConstOptPass
21-
from Deeploy.Targets.Generic.TopologyOptimizationPasses.Passes import TransposeMergePass
22-
from Deeploy.Targets.Generic.TopologyOptimizationPasses.Passes import TransposeSplitPass
12+
NCHWtoNHWCPass, RemoveGlobalOutputReshapePass, TransposeMatmulInputsPass
13+
from Deeploy.DeeployTypes import DeploymentPlatform, TopologyOptimizer
14+
from Deeploy.Targets.Generic.TopologyOptimizationPasses.Passes import ReshapeConstOptPass, TransposeConstOptPass, \
15+
TransposeMergePass, TransposeSplitPass
2316

2417

2518
class SnitchDeployer(SignPropDeployer):
@@ -31,18 +24,18 @@ def __init__(self,
3124
loweringOptimizer: TopologyOptimizer,
3225
scheduler: Callable = lambda x: x,
3326
name: str = 'DeeployNetwork',
34-
default_channels_first = False,
27+
default_channels_first=False,
3528
deeployStateDir: str = "DeeployStateDir",
36-
inputOffsets = {}):
29+
inputOffsets={}):
3730
super().__init__(graph,
3831
deploymentPlatform,
3932
inputTypes,
4033
loweringOptimizer,
4134
scheduler,
4235
name,
43-
default_channels_first = default_channels_first,
44-
deeployStateDir = deeployStateDir,
45-
inputOffsets = inputOffsets)
36+
default_channels_first=default_channels_first,
37+
deeployStateDir=deeployStateDir,
38+
inputOffsets=inputOffsets)
4639

4740
self.loweringOptimizer.passes += [
4841
TransposeMatmulInputsPass(),

‎Deeploy/Targets/Snitch/Parsers.py‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@
77
import numpy as np
88
import onnx_graphsurgeon as gs
99

10-
from Deeploy.DeeployTypes import NetworkContext
11-
from Deeploy.DeeployTypes import NodeParser
12-
from Deeploy.Targets.Generic.Parsers import AddParser
13-
from Deeploy.Targets.Generic.Parsers import DivParser
14-
from Deeploy.Targets.Generic.Parsers import GEMMParser
15-
from Deeploy.Targets.Generic.Parsers import MulParser
16-
from Deeploy.Targets.Generic.Parsers import RQGEMMParser
10+
from Deeploy.DeeployTypes import NetworkContext, NodeParser
11+
from Deeploy.Targets.Generic.Parsers import AddParser, DivParser, GEMMParser, MulParser, RQGEMMParser
1712

1813

1914
class SnitchGEMMParser(GEMMParser):

0 commit comments

Comments
 (0)