Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23364 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Nov 14, 2014
1 parent 25e5292 commit ce01598
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Compiler/BackEnd/HpcOmScheduler.mo
Expand Up @@ -195,7 +195,7 @@ algorithm
//print("Eq idc: " + stringDelimitList(List.map(eqIdc, intString), ",") + "\n");
simEqIdc = List.map(List.map1(eqIdc,getSimEqSysIdxForComp,iSccSimEqMapping), List.last);
simEqIdc = List.sort(simEqIdc,intGt);

newTask = HpcOmSimCode.CALCTASK(weighting,index,calcTime,threadFinishTime,threadId,simEqIdc);
threadTasks = newTask::threadTasks;
allThreadTasks = arrayUpdate(allThreadTasks,threadId,threadTasks);
Expand Down Expand Up @@ -790,7 +790,7 @@ algorithm
case(HpcOmTaskGraph.COMMUNICATION(nV1,ints1,fl1,b1,s1,childNode,reqT1),_,HpcOmTaskGraph.COMMUNICATION(nV2,ints2,fl2,b2,s2,childNode,reqT2))
equation
true = listMember(childNode,tasks);
then HpcOmTaskGraph.COMMUNICATION(nV1+nV2,listAppend(ints1,ints2),listAppend(fl1,fl2),listAppend(b1,b2),listAppend(s1,s2),childNode,reqT1+reqT2);
then HpcOmTaskGraph.COMMUNICATION(nV1+nV2,listAppend(ints1,ints2),listAppend(fl1,fl2),listAppend(b1,b2),listAppend(s1,s2),childNode,reqT1+reqT2);
else
then iCommunication;
end matchcontinue;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/BackEnd/HpcOmTaskGraph.mo
Expand Up @@ -3627,7 +3627,7 @@ algorithm
case(contrNodes::rest,_,_,TASKGRAPHMETA(inComps = inComps),_)
equation
//add new edges to the contrNode
contrNode::removeNodes = contrNodes;
contrNode::removeNodes = contrNodes;
List.map_0(removeNodes,function Array.updateIndexFirst(inValue = -1, inArray=contractedTasksIn)); // mark in contrTask array
children = List.flatten(List.map(contrNodes,function Array.getIndexFirst(inArray = graphIn)));
children = filterContractedNodes(children,contractedTasksIn);
Expand All @@ -3641,12 +3641,12 @@ algorithm
_ = List.map(children,function addEdgeToGraph(parent=contrNode, graphIn=graphIn));
_ = List.map(children, function addEdgeToGraph(child=contrNode, graphIn=graphTIn));
_ = List.map(parents,function addEdgeToGraph(parent=contrNode, graphIn=graphTIn));

// remove the contracted nodes (except the contrNode) IS NOT NECESSARY BUT MAYBE FASTER??!?!?
List.map_0(removeNodes,function Array.updateIndexFirst(inValue = -1, inArray=contractedTasksIn)); // mark in contrTask array
List.map_0(removeNodes,function Array.updateIndexFirst(inValue = {}, inArray=graphIn)); // remove from graph
List.map_0(removeNodes,function Array.updateIndexFirst(inValue = {}, inArray=graphTIn)); // remove from transposed graph

updateInCompsInfo(contrNode,removeNodes,inComps);
dataTmp = setInCompsInMeta(inComps,graphDataIn);
then contractNodesInGraph(rest,graphIn,graphTIn,dataTmp,contractedTasksIn);
Expand Down
8 changes: 4 additions & 4 deletions Compiler/SimCode/HpcOmSimCodeMain.mo
Expand Up @@ -296,8 +296,8 @@ algorithm
// Analyse Systems of Equations
//-----------------------------
(scheduledTasks,scheduledDAENodes) = HpcOmEqSystems.parallelizeTornSystems(taskGraphOde,taskGraphDataOde,sccSimEqMapping,simVarMapping,inBackendDAE);


//Apply filters
//-------------
taskGraphDataSimplified = taskGraphDataOde;
Expand Down Expand Up @@ -474,15 +474,15 @@ algorithm
equation
//Merge nodes
(_,_,_,_,changed) = HpcOmTaskGraph.mergeSimpleNodes(iTaskGraph, iTaskGraphT, iTaskGraphMeta, contractedTasksIn);

//HpcOmTaskGraph.TASKGRAPHMETA(inComps=inComps,nodeMark=nodeMark) = taskGraphMeta1;
//doNotMerge = List.map3(doNotMergeIn,HpcOmTaskGraph.getCompInComps,1,inComps,nodeMark);
//(taskGraph1,taskGraphMeta1,changed2) = HpcOmTaskGraph.mergeParentNodes(taskGraph1, taskGraphMeta1, doNotMerge);

//HpcOmTaskGraph.TASKGRAPHMETA(inComps=inComps,nodeMark=nodeMark) = taskGraphMeta1;
//doNotMerge = List.map3(doNotMergeIn,HpcOmTaskGraph.getCompInComps,1,inComps,nodeMark);
//(taskGraph1,taskGraphMeta1,changed3) = HpcOmTaskGraph.mergeSingleNodes(taskGraph1, taskGraphMeta1, doNotMerge);

then applyGRS1(iTaskGraph,iTaskGraphT,iTaskGraphMeta,contractedTasksIn,changed);
else (iTaskGraph, iTaskGraphMeta);
end matchcontinue;
Expand Down

0 comments on commit ce01598

Please sign in to comment.