Skip to content

Commit

Permalink
- fix bootstrapper
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21214 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Volker Waurich committed Jun 20, 2014
1 parent a0a33c4 commit 1b1bac4
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions Compiler/BackEnd/HpcOmTaskGraph.mo
Expand Up @@ -2991,19 +2991,16 @@ algorithm
(exeCosts,pos) := HpcOmScheduler.quicksortWithOrder(exeCosts);
singleNodes := List.map1(pos,List.getIndexFirst,singleNodes);
singleNodes := listReverse(singleNodes);
print("singleNodes "+&stringDelimitList(List.map(singleNodes,intString),"\n")+&"\n");
//print("singleNodes "+&stringDelimitList(List.map(singleNodes,intString),"\n")+&"\n");
exeCosts := listReverse(exeCosts);
print("exeCosts "+&stringDelimitList(List.map(exeCosts,realString),"\n")+&"\n");
//print("exeCosts "+&stringDelimitList(List.map(exeCosts,realString),"\n")+&"\n");
// cluster these singleNodes
(cluster,costs) := distributeToClusters(singleNodes,exeCosts,numProc);
print("cluster "+&stringDelimitList(List.map(arrayList(cluster),intLstString),"\n")+&"\n");
print("costs "+&stringDelimitList(List.map(arrayList(costs),realString),"\n")+&"\n");
//print("cluster "+&stringDelimitList(List.map(arrayList(cluster),intLstString),"\n")+&"\n");
//print("costs "+&stringDelimitList(List.map(arrayList(costs),realString),"\n")+&"\n");
//update taskgraph and taskgraphMeta
clusterLst := arrayList(cluster);
print("clusterLst "+&stringDelimitList(List.map(clusterLst,intLstString),"\n")+&"\n");
(oTaskGraph,oTaskGraphMeta) := contractNodesInGraph(clusterLst,iTaskGraph,iTaskGraphMeta);
printTaskGraph(oTaskGraph);
printTaskGraphMeta(oTaskGraphMeta);
changed := intGt(listLength(singleNodes),numProc);
end mergeSingleNodes;

Expand Down Expand Up @@ -3038,7 +3035,7 @@ protected function distributeToClusters1
output array<list<Integer>> clustersOut;
output array<Real> clusterValuesOut;
algorithm
(clusters,clusterValues) := matchcontinue(tplIn,tplFold,numClusters)
(clustersOut,clusterValuesOut) := matchcontinue(tplIn,tplFold,numClusters)
local
Integer numCl, diff;
list<Integer> itemsIn,lst1,lst2,lst1_1,lst1_2;
Expand Down

0 comments on commit 1b1bac4

Please sign in to comment.