Skip to content

Commit

Permalink
[Janitor mode] Fix tabs
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17320 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Sep 21, 2013
1 parent c2e03fe commit 1afb73f
Show file tree
Hide file tree
Showing 3 changed files with 615 additions and 615 deletions.
26 changes: 13 additions & 13 deletions Compiler/BackEnd/HpcOmScheduler.mo
Expand Up @@ -293,10 +293,10 @@ protected function addSuccessorLocksToSchedule
output Schedule oSchedule;

partial function FuncType
input tuple<Task,Integer> iSuccessorTask;
input Integer iTaskIdx;
input list<Task> iReleaseTasks;
output list<Task> oReleaseTasks;
input tuple<Task,Integer> iSuccessorTask;
input Integer iTaskIdx;
input list<Task> iReleaseTasks;
output list<Task> oReleaseTasks;
end FuncType;
protected
array<list<Task>> allThreadTasks;
Expand Down Expand Up @@ -631,9 +631,9 @@ protected function convertTaskGraphToTasks1 "function convertTaskGraphToTasks1
input array<tuple<Task,Integer>> iTasks;
output array<tuple<Task,Integer>> oTasks;
partial function FuncType
input Integer iNodeIdx;
input HpcOmTaskGraph.TaskGraphMeta iTaskGraphMeta;
output Task oTask;
input Integer iNodeIdx;
input HpcOmTaskGraph.TaskGraphMeta iTaskGraphMeta;
output Task oTask;
end FuncType;
protected
array<list<Integer>> inComps;
Expand All @@ -647,12 +647,12 @@ algorithm
case(_,_,_,_,_)
equation
true = intLe(iIndex, arrayLength(iTaskGraphT));
refCount = listLength(arrayGet(iTaskGraphT, iIndex));
//newTask := convertNodeToTask(iIndex, iTaskGraphMeta);
newTask = iConverterFunc(iIndex, iTaskGraphMeta);
tmpTasks = arrayUpdate(iTasks, iIndex, (newTask,refCount));
tmpTasks = convertTaskGraphToTasks1(iTaskGraphMeta,iTaskGraphT,iIndex+1,iConverterFunc,tmpTasks);
then tmpTasks;
refCount = listLength(arrayGet(iTaskGraphT, iIndex));
//newTask := convertNodeToTask(iIndex, iTaskGraphMeta);
newTask = iConverterFunc(iIndex, iTaskGraphMeta);
tmpTasks = arrayUpdate(iTasks, iIndex, (newTask,refCount));
tmpTasks = convertTaskGraphToTasks1(iTaskGraphMeta,iTaskGraphT,iIndex+1,iConverterFunc,tmpTasks);
then tmpTasks;
else then iTasks;
end matchcontinue;
end convertTaskGraphToTasks1;
Expand Down
30 changes: 15 additions & 15 deletions Compiler/BackEnd/HpcOmTaskGraph.mo
Expand Up @@ -2551,17 +2551,17 @@ algorithm
equation
true = List.exist1(criticalPathEdges, compareIntTuple2, (parentIdx, childIdx));
//Edge is part of critical path
//components = arrayGet(inComps,childIdx);
//primalCompChild = List.last(components);
//components = arrayGet(inComps,parentIdx);
//primalCompParent = List.first(components);
//print("Try to get comm costs from " +& intString(parentIdx) +& " to " +& intString(childIdx) +& "\n");
//(numOfCommVars,commCost) = getCommunicationCost(primalCompParent,primalCompChild,commCosts);
((_,numOfCommVars,commCost)) = getCommCostBetweenNodes(parentIdx,childIdx,tGraphDataIn);
numOfCommVarsString = intString(numOfCommVars);
commCostString = intString(commCost);
tmpGraph = GraphML.addEdge("Edge" +& intString(parentIdx) +& intString(childIdx), "Node" +& intString(childIdx), "Node" +& intString(parentIdx), GraphML.COLOR_BLACK, GraphML.LINE(), GraphML.LINEWIDTH_BOLD, SOME(GraphML.EDGELABEL(numOfCommVarsString,GraphML.COLOR_BLACK, GraphML.FONTSIZE_STANDARD)), (NONE(),SOME(GraphML.ARROWSTANDART())), {(commCostAttIdx, commCostString)}, iGraph);
then tmpGraph;
//components = arrayGet(inComps,childIdx);
//primalCompChild = List.last(components);
//components = arrayGet(inComps,parentIdx);
//primalCompParent = List.first(components);
//print("Try to get comm costs from " +& intString(parentIdx) +& " to " +& intString(childIdx) +& "\n");
//(numOfCommVars,commCost) = getCommunicationCost(primalCompParent,primalCompChild,commCosts);
((_,numOfCommVars,commCost)) = getCommCostBetweenNodes(parentIdx,childIdx,tGraphDataIn);
numOfCommVarsString = intString(numOfCommVars);
commCostString = intString(commCost);
tmpGraph = GraphML.addEdge("Edge" +& intString(parentIdx) +& intString(childIdx), "Node" +& intString(childIdx), "Node" +& intString(parentIdx), GraphML.COLOR_BLACK, GraphML.LINE(), GraphML.LINEWIDTH_BOLD, SOME(GraphML.EDGELABEL(numOfCommVarsString,GraphML.COLOR_BLACK, GraphML.FONTSIZE_STANDARD)), (NONE(),SOME(GraphML.ARROWSTANDART())), {(commCostAttIdx, commCostString)}, iGraph);
then tmpGraph;
case(_,_,TASKGRAPHMETA(commCosts=commCosts, nodeMark=nodeMark, inComps=inComps),_,_,_)
equation
//components = arrayGet(inComps,childIdx);
Expand Down Expand Up @@ -5262,10 +5262,10 @@ algorithm
case((nodeIdx, numOfVars, reqCycles),_,_)
equation
true = intLe(nodeIdx, arrayLength(iCommCosts));
costs = arrayGet(iCommCosts, nodeIdx);
costs = (iParentCompIdx, numOfVars, reqCycles) :: costs;
tmpCommCosts = arrayUpdate(iCommCosts, nodeIdx, costs);
then tmpCommCosts;
costs = arrayGet(iCommCosts, nodeIdx);
costs = (iParentCompIdx, numOfVars, reqCycles) :: costs;
tmpCommCosts = arrayUpdate(iCommCosts, nodeIdx, costs);
then tmpCommCosts;
else then iCommCosts;
end matchcontinue;
end transposeCommCosts1;
Expand Down

0 comments on commit 1afb73f

Please sign in to comment.