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@20992 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Jun 5, 2014
1 parent f24e338 commit 63f1650
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions Compiler/BackEnd/HpcOmScheduler.mo
Expand Up @@ -1639,8 +1639,8 @@ algorithm
array<Integer> taskAss,taskDuplAss,nodeMark;
array<list<Integer>> procAss, sccSimEqMap, inComps, comps;
array<tuple<Integer,Real>> exeCosts;
array<list<tuple<Integer,Integer,Integer>>> commCosts;
array<tuple<Integer,Integer,Integer>> varCompMapping,eqCompMapping,mapDupl;
array<list<tuple<Integer,Integer,Integer>>> commCosts;
array<tuple<Integer,Integer,Integer>> varCompMapping,eqCompMapping,mapDupl;
list<Integer> order, rootNodes;
array<String> nodeNames, nodeDescs;
list<list<Integer>> clusters, duplSccSimEqMap, duplComps;
Expand Down Expand Up @@ -1713,13 +1713,13 @@ algorithm
lsIdx = List.fold(List.map(List.flatten(odes),SimCodeUtil.getLSindex),intMax,0)+1;
nlsIdx = List.fold(List.map(List.flatten(odes),SimCodeUtil.getNLSindex),intMax,0)+1;
mIdx = List.fold(List.map(List.flatten(odes),SimCodeUtil.getMixedindex),intMax,0)+1;

print("TG before");
HpcOmTaskGraph.printTaskGraph(iTaskGraph);
HpcOmTaskGraph.printTaskGraph(iTaskGraph);
(taskAss,procAss,taskGraph,taskDuplAss,_,simCode,schedule,duplSccSimEqMap,duplComps) = createTDSduplicateTasks(clusters,taskAss,procAss,(threadIdx,taskIdx,compIdx,simVarIdx,simEqSysIdx,lsIdx,nlsIdx,mIdx),iTaskGraph,taskGraph,taskDuplAss,iTaskGraphMeta,iSimCode,schedule,iSccSimEqMapping,duplSccSimEqMap,duplComps);
print("TG after");
HpcOmTaskGraph.printTaskGraph(taskGraph);

//update stuff
numDupl = List.fold(List.map(duplComps,listLength),intAdd,0);
procAss = Util.arrayMap(procAss,listReverse);
Expand All @@ -1732,7 +1732,7 @@ algorithm
exeCosts = Util.arrayAppend(exeCosts,arrayCreate(numDupl,(1,1.0)));
nodeMark = Util.arrayAppend(nodeMark,arrayCreate(numDupl,-1));
meta = HpcOmTaskGraph.TASKGRAPHMETA(comps,varCompMapping,eqCompMapping,rootNodes,nodeNames,nodeDescs,exeCosts,commCosts,nodeMark);

//dumping stuff-------------------------
SimCode.SIMCODE(modelInfo = SimCode.MODELINFO(vars=simVars), odeEquations=odes) = simCode;
print("the simEqSysts2: \n"+&stringDelimitList(List.map(odes,SimCodeUtil.dumpSimEqSystemLst),"\n")+&"\n");
Expand Down Expand Up @@ -1976,15 +1976,15 @@ algorithm
//BackendVarTransform.dumpReplacements(repl);
numEqs := listLength(simEqSysts);
simEqSysIdcs2 := List.intRange2(simEqSysIdx,simEqSysIdx+numEqs-1);

(simEqSystsDupl,_) := List.map1_2(simEqSysts,replaceExpsInSimEqSystem,repl);// replace the exps and crefs
(simEqSystsDupl,(lsIdx,nlsIdx,mIdx)) := List.mapFold(simEqSystsDupl,replaceSystemIndex,(lsIdx,nlsIdx,mIdx));// udpate the indeces of th systems
simEqSystsDupl := List.threadMap(simEqSystsDupl,simEqSysIdcs2,SimCodeUtil.replaceSimEqSysIndex);
//print("the simEqSystsDupl "+&SimCodeUtil.dumpSimEqSystemLst(simEqSystsDupl)+&"\n");
simCode := List.fold1(simEqSystsDupl,SimCodeUtil.addSimEqSysToODEquations,1,simCode);
simEqSysIdx2 := simEqSysIdx + numEqs;
print("simEqSysIdcs2 :"+&intListString(simEqSysIdcs2)+&"\n");

//update duplSccSimEqMap, duplComps, taskAss, procAss for the new duplicates
duplSccSimEqMapOut := listAppend(List.map(simEqSysIdcs2,List.create),duplSccSimEqMapIn);
taskAssOut := arrayUpdate(taskAssIn,taskIdx,threadIdx);
Expand All @@ -1998,15 +1998,15 @@ algorithm

// set task in thread
threadOut := HpcOmSimCode.CALCTASK(1,taskIdx,0.0,-1.0,threadIdx,simEqSysIdcs2)::threadIn;

// update taskGraph and taskDuplAss
taskDuplAssOut := arrayUpdate(taskDuplAssIn,taskIdx,node);
origSuccTasks := arrayGet(taskGraphIn,node);
clSuccTasks := List.first(allCluster);// the current cluster
(clSuccTasks,origSuccTasks,_) := List.intersection1OnTrue(origSuccTasks,clSuccTasks,intEq);
taskGraph := arrayUpdate(taskGraphIn,node,origSuccTasks);
taskGraphOut := arrayUpdate(taskGraph,taskIdx,clSuccTasks);

idcsOut := (threadIdx,taskIdx+1,compIdx,simVarIdx2,simEqSysIdx2,lsIdx,nlsIdx,mIdx);
simCodeOut := simCode;
replOut := repl;
Expand Down
4 changes: 2 additions & 2 deletions Compiler/BackEnd/HpcOmSimCodeMain.mo
Expand Up @@ -254,8 +254,8 @@ algorithm
criticalPathInfo = HpcOmScheduler.analyseScheduledTaskGraph(schedule,numProc,taskGraph1,taskGraphData1);
schedulerInfo = HpcOmScheduler.convertScheduleStrucToInfo(schedule,arrayLength(taskGraph));
Debug.execStat("hpcom create schedule", GlobalScript.RT_CLOCK_EXECSTAT_HPCOM_MODULES);
fileName = ("taskGraph"+&filenamePrefix+&"ODE_schedule_duplic.graphml");

fileName = ("taskGraph"+&filenamePrefix+&"ODE_schedule_duplic.graphml");
HpcOmTaskGraph.dumpAsGraphMLSccLevel(taskGraph2, taskGraphData2, inBackendDAE, fileName, criticalPathInfo, HpcOmTaskGraph.convertNodeListToEdgeTuples(List.first(criticalPaths)), HpcOmTaskGraph.convertNodeListToEdgeTuples(List.first(criticalPathsWoC)), sccSimEqMapping, schedulerInfo);
fileName = ("taskGraph"+&filenamePrefix+&"ODE_schedule.graphml");
HpcOmTaskGraph.dumpAsGraphMLSccLevel(taskGraph1, taskGraphData1, inBackendDAE, fileName, criticalPathInfo, HpcOmTaskGraph.convertNodeListToEdgeTuples(List.first(criticalPaths)), HpcOmTaskGraph.convertNodeListToEdgeTuples(List.first(criticalPathsWoC)), sccSimEqMapping, schedulerInfo);
Expand Down
2 changes: 1 addition & 1 deletion Compiler/FrontEnd/InstDAE.mo
Expand Up @@ -214,7 +214,7 @@ algorithm
case (vn, ty as DAE.T_COMPLEX(complexClassType = ClassInf.EXTERNAL_OBJ(_)),ct,kind,dir,daePrl,prot,e,inst_dims,_,dae_var_attr,comment,_,_,_)
equation
finst_dims = List.flatten(inst_dims);
then
then
DAE.DAE({DAE.VAR(vn,kind,dir,daePrl,prot,ty,e,finst_dims,ct,source,dae_var_attr,comment,io)});

// instantiation of complex type extending from basic type
Expand Down

0 comments on commit 63f1650

Please sign in to comment.