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@21289 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Jun 26, 2014
1 parent 7d223b3 commit ca36211
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Compiler/BackEnd/HpcOmScheduler.mo
Expand Up @@ -1214,7 +1214,7 @@ algorithm
(levelNodeClusterArr,levelNodeClusterCostsArr) = HpcOmTaskGraph.distributeToClusters(levelNodes,levelNodeCosts,numProc-1); // if there are more task in the same level than 2*numproc, cluster them
levelNodeCluster = arrayList(levelNodeClusterArr);
levelNodeClusterCosts = arrayList(levelNodeClusterCostsArr);

print("levelNodeCluster: \n"+&stringDelimitList(List.map(levelNodeCluster,intListString)," ; ")+&"\n");
(levelNodeCluster,levelAss) = BLS_fillParallelSections2(levelNodeCluster,iGraph,graphT,iMeta,maxCosts,levelAssIn,levelIdx,{});
print("levelNodeCluster2: \n"+&stringDelimitList(List.map(levelNodeCluster,intListString)," ; ")+&"\n");
Expand Down Expand Up @@ -1265,7 +1265,7 @@ algorithm
children = Debug.bcallret1(List.isNotEmpty(childCluster),List.first,childCluster,{});
//print("children merged to target size: "+&stringDelimitList(List.map(children,intString)," ; ")+&"\n");
cluster = listAppend(cluster,children);

// update levelAss
List.map2_0(children,Util.arrayUpdateIndexFirst,levelIdx,levelAssIn);
(nodeCluster,levelAss) = BLS_fillParallelSections2(clusterRest,iGraph,iGraphT,iMeta,targetCost,levelAssIn,levelIdx,cluster::nodeClusterIn);
Expand Down Expand Up @@ -1298,7 +1298,7 @@ algorithm
ok1 := List.fold(List.map1(parentLevel,intLe,levelIdx),boolAnd,true);// its not alowed to merge nodes upwards that are dependent of nodes from their level
(_,parents) := List.filter1OnTrueSync(parentLevel,intEq,levelIdx,parents); // only the parents from the upper level
//print("parents from upper level: "+&stringDelimitList(List.map(parents,intString)," ; ")+&"\n");
(_,parentsFromOtherCluster,_) := List.intersection1OnTrue(parents,cluster,intEq);
(_,parentsFromOtherCluster,_) := List.intersection1OnTrue(parents,cluster,intEq);
//print("parentsFromOtherCluster: "+&stringDelimitList(List.map(parentsFromOtherCluster,intString)," ; ")+&"\n");
ok2 := List.isEmpty(parentsFromOtherCluster); // the parents from the current level have to be part of the same cluster(section)
ok := ok1 and ok2;
Expand Down
4 changes: 2 additions & 2 deletions Compiler/BackEnd/HpcOmSimCodeMain.mo
Expand Up @@ -201,12 +201,12 @@ algorithm
//------------
taskGraphData = HpcOmTaskGraph.createCosts(inBackendDAE, filenamePrefix +& "_eqs_prof" , simeqCompMapping, taskGraphData);
Debug.execStat("hpcom create costs", GlobalScript.RT_CLOCK_EXECSTAT_HPCOM_MODULES);

fileName = ("taskGraph"+&filenamePrefix+&".graphml");
schedulerInfo = arrayCreate(arrayLength(taskGraph), (-1,-1,-1.0));
HpcOmTaskGraph.dumpAsGraphMLSccLevel(taskGraph, taskGraphData,inBackendDAE, fileName, "", {}, {}, sccSimEqMapping ,schedulerInfo);
Debug.execStat("hpcom dump TaskGraph", GlobalScript.RT_CLOCK_EXECSTAT_HPCOM_MODULES);

//HpcOmTaskGraph.printTaskGraph(taskGraph);
//HpcOmTaskGraph.printTaskGraphMeta(taskGraphData);

Expand Down
2 changes: 1 addition & 1 deletion Compiler/BackEnd/HpcOmTaskGraph.mo
Expand Up @@ -2319,7 +2319,7 @@ algorithm
componentsString = (" "+&intString(nodeIdx)+&" ");
simCodeEqs = List.flatten(List.map1(components, Util.arrayGetIndexFirst, sccSimEqMapping));
simCodeEqString = stringDelimitList(List.map(simCodeEqs,intString),", ");

((schedulerThreadId,schedulerTaskNumber,taskFinishTime)) = arrayGet(schedulerInfo,nodeIdx);
taskStartTime = realSub(taskFinishTime,calcTime);
threadIdxString = "Th " +& intString(schedulerThreadId);
Expand Down

0 comments on commit ca36211

Please sign in to comment.