646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
diff --git a/Tensile/SolutionStructs.py b/Tensile/SolutionStructs.py
|
|
index f663c6f1..17bcf897 100644
|
|
--- a/Tensile/SolutionStructs.py
|
|
+++ b/Tensile/SolutionStructs.py
|
|
@@ -4828,24 +4828,26 @@ class Solution(collections.abc.Mapping):
|
|
# create a dictionary of lists of parameter values
|
|
@staticmethod
|
|
def getSerialNaming(objs):
|
|
+ valid_params = sorted(validParameters.keys())
|
|
data = {}
|
|
- for objIdx in range(0, len(objs)):
|
|
- obj = objs[objIdx]
|
|
- for paramName in sorted(obj.keys()):
|
|
- if paramName in list(validParameters.keys()):
|
|
- paramValue = obj[paramName]
|
|
- if paramName in data:
|
|
- if paramValue not in data[paramName]:
|
|
- data[paramName].append(paramValue)
|
|
- else:
|
|
- data[paramName] = [ paramValue ]
|
|
- maxObjs = 1
|
|
- for paramName in data:
|
|
- if not isinstance(data[paramName][0],dict):
|
|
- data[paramName] = sorted(data[paramName])
|
|
- maxObjs *= len(data[paramName])
|
|
- numDigits = len(str(maxObjs))
|
|
- return [ data, numDigits ]
|
|
+
|
|
+ objs = [getattr(obj, "_state", obj) for obj in objs]
|
|
+
|
|
+ for param in valid_params:
|
|
+ d = []
|
|
+ for obj in objs:
|
|
+ if param in obj:
|
|
+ v = obj[param]
|
|
+ if v not in d:
|
|
+ d.append(v)
|
|
+ if len(d):
|
|
+ if not isinstance(d[0], dict): d.sort()
|
|
+ data[param] = d
|
|
+
|
|
+ # Calculate max objects using prod() from math module
|
|
+ max_objs = math.prod(len(values) for values in data.values())
|
|
+ num_digits = len(str(max_objs))
|
|
+ return data, num_digits
|
|
|
|
########################################
|
|
# Get Name Serial
|