Fix errors

Xeratec · Xeratec · commit 6cd45a7463fb · 2025-12-21T22:06:36.000+01:00
diff --git a/.github/workflows/ci-platform-generic.yml b/.github/workflows/ci-platform-generic.yml
@@ -85,7 +85,7 @@ jobs:
         Kernels/FP32/Sqrt
         Kernels/FP32/Transpose
 
-        Kernels/Integer/Slice
+        Kernels/Integer/Softmax/Regular
 
         Kernels/Integer/Add/MultIO
         Kernels/Integer/Add/Regular
@@ -114,8 +114,7 @@ jobs:
 
         Kernels/Mixed/Dequant
         Kernels/Mixed/Quant
-        Kernels/Mixed/QuantizedLinear
-        Kernels/Integer/Conv/Regular_2D_RQ
+        Models/Transformer_DeepQuant
         Kernels/Integer/Conv/DW_2D_RQ
         Kernels/Integer/Conv/Regular_2D_RQ
         Kernels/Integer/MatMul/Regular_RQ
diff --git a/.github/workflows/ci-platform-siracusa.yml b/.github/workflows/ci-platform-siracusa.yml
@@ -84,7 +84,7 @@ jobs:
         Kernels/FP32/Transpose
 
         Kernels/Integer/Hardswish/Regular
-        Kernels/Integer/Slice
+        Kernels/Integer/Softmax/Regular
 
         Kernels/Integer/Add/MultIO
         Kernels/Integer/Add/Regular
@@ -104,7 +104,7 @@ jobs:
         Others/Backtracking
         Kernels/Mixed/Dequant
         Kernels/Mixed/Quant
-        Kernels/Mixed/QuantizedLinear
+        Models/Transformer_DeepQuant
         Kernels/Integer/Conv/Regular_2D_RQ
         Kernels/Integer/Conv/DW_2D_RQ
         Kernels/Integer/Hardswish/Regular_RQ
diff --git a/.github/workflows/ci-platform-snitch-tiled.yml b/.github/workflows/ci-platform-snitch-tiled.yml
@@ -38,7 +38,7 @@ jobs:
       tests-config: |
         [
           {"name":"Kernels/Integer/Add/Large","L1":[5000,10000]},
-          {"name":"Kernels/Integer/Concat","L1":[5000,10000]},
+          {"name":"Kernels/Integer/Softmax/Large","L1":[5000,10000]},
 
           {"name":"Kernels/FP32/Softmax/Regular","L1":[2000,5000,10000]},
 
diff --git a/.github/workflows/ci-platform-snitch.yml b/.github/workflows/ci-platform-snitch.yml
@@ -41,8 +41,8 @@ jobs:
         Kernels/Integer/Add/Large
         Kernels/Integer/Add/Regular
 
-        Kernels/Integer/Concat
-        Kernels/Integer/Slice
+        Kernels/Integer/Softmax/Large
+        Kernels/Integer/Softmax/Regular
 
         Kernels/Integer/MatMul/Regular
 
diff --git a/DeeployTest/deeployStateEqualityTest.py b/DeeployTest/deeployStateEqualityTest.py
@@ -24,7 +24,7 @@
                         metavar = 'testdir',
                         dest = 'dir',
                         type = str,
-                        default = './Tests/Others/SimpleRegression',
+                        default = './Tests/Models/CNN_Linear2',
                         help = 'Set the regression test\n')
     parser.add_argument('-d',
                         metavar = 'dumpdir',
diff --git a/DeeployTest/generateNetwork.py b/DeeployTest/generateNetwork.py
@@ -134,8 +134,8 @@ def generateNetwork(args):
     log.debug(f"Deployer: {deployer}")
 
     if not isinstance(
-            platform,
-            CMSISPlatform) and not "simpleCNN" in args.dir and not "RQMatMul" in args.dir and not "RQGEMM" in args.dir:
+            platform, CMSISPlatform
+    ) and not "CNN_Linear1" in args.dir and not "Regular_RQ" in args.dir and not "Regular_RQ" in args.dir:
         deployer.loweringOptimizer.passes.insert(0, EmulateCMSISRequantPass())
 
     verbosityCfg = _NoVerbosity
diff --git a/DeeployTest/testEngineAwareOptimizerWrapper.py b/DeeployTest/testEngineAwareOptimizerWrapper.py
@@ -22,7 +22,7 @@
 
 
 def _test_partial_coloring():
-    test_dir = "Tests/Others/SimpleRegression"
+    test_dir = "Tests/Models/CNN_Linear2"
 
     model = onnx.load(os.path.join(test_dir, "network.onnx"))
     graph = gs.import_onnx(model).toposort()
@@ -79,7 +79,7 @@ def _test_pass(_pass: TopologyOptimizationPass, graph: gs.Graph, engineName: str
 
 
 def _test_passes():
-    test_dir = "Tests/Others/SimpleRegression"
+    test_dir = "Tests/Models/CNN_Linear2"
     model = onnx.load(os.path.join(test_dir, "network.onnx"))
     graph = gs.import_onnx(model).toposort()
     passes = [
diff --git a/DeeployTest/testMemoryLevelExtension.py b/DeeployTest/testMemoryLevelExtension.py
@@ -68,7 +68,7 @@
         _type, offset = inferTypeAndOffset(num, signProp)
         inputTypes[f"input_{index}"] = _type
         inputOffsets[f"input_{index}"] = offset
-        if "simpleRegression" in args.dir:
+        if "CNN_Linear2" in args.dir:
             inputOffsets[f"input_{index}"] = 0
 
     deployer = mapDeployer(platform, graph, inputTypes, deeployStateDir = _DEEPLOYSTATEDIR, inputOffsets = inputOffsets)
diff --git a/DeeployTest/testRegexMatching.py b/DeeployTest/testRegexMatching.py
@@ -42,7 +42,7 @@ def __init__(self):
 
 if __name__ == "__main__":
     optimizer = TopologyOptimizer([ConvTestPass()])
-    model = onnx.load_model('Tests/Models/simpleCNN/network.onnx')
+    model = onnx.load_model('Tests/Models/CNN_Linear1/network.onnx')
     graph = gs.import_onnx(model)
 
     match_count = 0
diff --git a/DeeployTest/testReplaceInsertSubgraph.py b/DeeployTest/testReplaceInsertSubgraph.py
@@ -11,7 +11,7 @@
 from Deeploy.OptimizationPasses.TopologyOptimizationPasses.PULPPasses import PULPConvRequantMergePass
 
 if __name__ == "__main__":
-    test_dir = "Tests/Others/SimpleRegression"
+    test_dir = "Tests/Models/CNN_Linear2"
 
     model = onnx.load(os.path.join(test_dir, "network.onnx"))
     graph = gs.import_onnx(model).toposort()
diff --git a/DeeployTest/testSlice_PULP.py b/DeeployTest/testSlice_PULP.py
@@ -41,11 +41,11 @@
 
     signProp = False
 
-    onnx_graph = onnx.load_model('./Tests/IntKernels/Slice/network.onnx')
+    onnx_graph = onnx.load_model('./Tests/Kernels/Integer/Slice/network.onnx')
     graph = gs.import_onnx(onnx_graph)
 
-    inputs = np.load('./Tests/IntKernels/Slice/inputs.npz')
-    outputs = np.load(f'./Tests/IntKernels/Slice/outputs.npz')
+    inputs = np.load('./Tests/Kernels/Integer/Slice/inputs.npz')
+    outputs = np.load(f'./Tests/Kernels/Integer/Slice/outputs.npz')
     tensors = graph.tensors()
 
     # Load as int64 and infer types later
@@ -99,18 +99,19 @@
             if not isFloat and not buffer._signed:
                 values -= buffer.nLevels // 2
 
-    generateTestNetwork(deployer, test_inputs, test_outputs, 'TEST_SIRACUSA/Tests/IntKernels/Slice', _NoVerbosity)
+    generateTestNetwork(deployer, test_inputs, test_outputs, 'TEST_SIRACUSA/Tests/Kernels/Integer/Slice', _NoVerbosity)
 
     os.system(
-        f"$CMAKE -DTOOLCHAIN={args.toolchain} -DTOOLCHAIN_INSTALL_DIR={_TOOLCHAIN_DIR}  -DTESTNAME=Slice -DGENERATED_SOURCE=TEST_SIRACUSA/Tests/IntKernels/Slice -Dplatform=Siracusa -B TEST_SIRACUSA/build -DNUM_CORES=1 .."
+        f"$CMAKE -DTOOLCHAIN={args.toolchain} -DTOOLCHAIN_INSTALL_DIR={_TOOLCHAIN_DIR}  -DTESTNAME=Slice -DGENERATED_SOURCE=TEST_SIRACUSA/Tests/Kernels/Integer/Slice -Dplatform=Siracusa -B TEST_SIRACUSA/build -DNUM_CORES=1 .."
     )
     process = subprocess.Popen(["$CMAKE --build TEST_SIRACUSA/build --target gvsoc_Slice"],
                                stdout = subprocess.PIPE,
                                stderr = subprocess.STDOUT,
                                shell = True,
                                encoding = 'utf-8')
     fileHandle = open('out.txt', 'a')
-    fileHandle.write(f"################## Testing Tests/IntKernels/Slice on SIRACUSA Platform ##################\n")
+    fileHandle.write(
+        f"################## Testing Tests/Kernels/Integer/Slice on SIRACUSA Platform ##################\n")
 
     result = ""
     while True:
@@ -127,4 +128,4 @@
     fileHandle.close()
 
     if not "Errors: 0 out of " in result:
-        raise RuntimeError(f"Found an error in Tests/IntKernels/Slice")
+        raise RuntimeError(f"Found an error in Tests/Kernels/Integer/Slice")
diff --git a/DeeployTest/testTilerExtension.py b/DeeployTest/testTilerExtension.py
@@ -147,7 +147,7 @@ def setupDeployer(memoryHierarchy: MemoryHierarchy, graph: gs.Graph) -> NetworkD
         _type, offset = inferTypeAndOffset(num, signProp)
         inputTypes[f"input_{index}"] = _type
         inputOffsets[f"input_{index}"] = offset
-        if "simpleRegression" in args.dir:
+        if "CNN_Linear2" in args.dir:
             inputOffsets[f"input_{index}"] = 0
 
     deployer = mapDeployer(platform,

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ jobs:`
`38`	`38`	`tests-config: \|`
`39`	`39`	`[`
`40`	`40`	`{"name":"Kernels/Integer/Add/Large","L1":[5000,10000]},`
`41`		`- {"name":"Kernels/Integer/Concat","L1":[5000,10000]},`
	`41`	`+ {"name":"Kernels/Integer/Softmax/Large","L1":[5000,10000]},`
`42`	`42`
`43`	`43`	`{"name":"Kernels/FP32/Softmax/Regular","L1":[2000,5000,10000]},`
`44`	`44`