Commit 7d1a590d authored by Martin Bauer's avatar Martin Bauer
Browse files

Ensured that same method description produces exactly same code on two runs

- due to unordered containers  the same method could produce different but functionally equivalent code
- this behaviour is bad for caching

-> switched to ordered containers
parent eb9e40d7
......@@ -170,7 +170,8 @@ def compile(code, tmpDir, libFile, createAssemblyCode=False):
def compileAndLoad(kernelFunctionNode):
tmpDir = tempfile.mkdtemp()
libFile = os.path.join(tmpDir, "")
compile(generateC(kernelFunctionNode), tmpDir, libFile)
sourceCode = generateC(kernelFunctionNode)
compile(sourceCode, tmpDir, libFile)
loadedJitLib = cdll.LoadLibrary(libFile)
......@@ -129,7 +129,7 @@ def replaceSecondOrderProducts(expr, searchSymbols, positive=None, replaceMixed=
otherFactors *= t
if len(distinctVelTerms) == 2 and nrOfVelTerms == 2:
u, v = list(distinctVelTerms)
u, v = sorted(list(distinctVelTerms), key=lambda symbol:
if positive is None:
otherFactorsWithoutSymbols = otherFactors
for s in otherFactors.atoms(sp.Symbol):
from collections import defaultdict
from collections import defaultdict, OrderedDict
from operator import attrgetter
import sympy as sp
......@@ -62,7 +62,7 @@ def makeLoopOverDomain(body, functionName, iterationSlice=None, ghostLayers=None
if len(shapeSet) != 1:
raise ValueError("Differently sized field accesses in loop body: " + str(shapeSet))
shape = list(shapeSet)[0]
shape = list(sorted(shapeSet, key=lambda e: str(e[0])))[0]
if iterationSlice is not None:
iterationSlice = normalizeSlice(iterationSlice, shape)
......@@ -222,6 +222,9 @@ def resolveFieldAccesses(astNode, readOnlyFieldNames=set(), fieldToBasePointerIn
counters to index the field these symbols are used as coordinates
:return: transformed AST
fieldToBasePointerInfo = OrderedDict(sorted(fieldToBasePointerInfo.items(), key=lambda pair: pair[0]))
fieldToFixedCoordinates = OrderedDict(sorted(fieldToFixedCoordinates.items(), key=lambda pair: pair[0]))
def visitSympyExpr(expr, enclosingBlock, sympyAssignment):
if isinstance(expr, Field.Access):
fieldAccess = expr
......@@ -359,9 +362,8 @@ def splitInnerLoop(astNode, symbolGroups):
assert len(outerLoop) == 1, "Error in AST, multiple outermost loops."
outerLoop = outerLoop[0]
symbolsWithTemporaryArray = dict()
assignmentMap = {a.lhs: a for a in innerLoop.body.args}
symbolsWithTemporaryArray = OrderedDict()
assignmentMap = OrderedDict((a.lhs, a) for a in innerLoop.body.args)
assignmentGroups = []
for symbolGroup in symbolGroups:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment