Merge branch 'charm' of charmgit:charm into bhatele/ldbcputimer
authorAbhinav S Bhatele <bhatele@illinois.edu>
Fri, 25 Feb 2011 19:40:28 +0000 (13:40 -0600)
committerAbhinav S Bhatele <bhatele@illinois.edu>
Fri, 25 Feb 2011 19:40:28 +0000 (13:40 -0600)
Conflicts:
src/ck-ldb/Make.lb
src/ck-ldb/Makefile_lb.sh

1  2 
src/ck-ldb/CentralLB.C
src/ck-ldb/Make.lb
src/ck-ldb/Makefile_lb.sh
src/ck-ldb/lbdb.h
src/scripts/Make.cidepends
src/scripts/Make.depends

Simple merge
index 12b695d5fa51344e34d575623b08bc7d1fadd88e,874a6c0534a159b541b624b446be1bb70210ce82..a4b101a363c3db0d864def71695f998829000398
@@@ -209,24 -207,6 +206,30 @@@ $(L)/libmoduleTopoLB.a: TopoLB.
  LBHEADERS += TopoLB.h TopoLB.decl.h
  
  
++$(L)/libmoduleTempAwareGreedyLB.a: TempAwareGreedyLB.o 
++      $(CHARMC) -o $(L)/libmoduleTempAwareGreedyLB.a TempAwareGreedyLB.o 
++      
++LBHEADERS += TempAwareGreedyLB.h TempAwareGreedyLB.decl.h
++
++
 +$(L)/libmoduleMetisLB.a: MetisLB.o 
 +      $(CHARMC) -o $(L)/libmoduleMetisLB.a MetisLB.o 
 +      cp -f libmoduleMetisLB.dep $(L)/
 +LBHEADERS += MetisLB.h MetisLB.decl.h
 +
 +
 +$(L)/libmoduleScotchLB.a: ScotchLB.o 
 +      $(CHARMC) -o $(L)/libmoduleScotchLB.a ScotchLB.o 
 +      cp -f libmoduleScotchLB.dep $(L)/
 +LBHEADERS += ScotchLB.h ScotchLB.decl.h
 +
 +
 +$(L)/libmoduleTeamLB.a: TeamLB.o 
 +      $(CHARMC) -o $(L)/libmoduleTeamLB.a TeamLB.o 
 +      cp -f libmoduleTeamLB.dep $(L)/
 +LBHEADERS += TeamLB.h TeamLB.decl.h
 +
 +
  $(L)/libmoduleWSLB.a: WSLB.o 
        $(CHARMC) -o $(L)/libmoduleWSLB.a WSLB.o 
        
@@@ -264,9 -244,6 +267,10 @@@ ALL_LB_OBJS=EveryLB.o 
      RefineTopoLB.o \
      TopoCentLB.o \
      TopoLB.o \
++    TempAwareGreedyLB.o \
 +    MetisLB.o \
 +    ScotchLB.o \
 +    TeamLB.o \
      WSLB.o \
      manager.o
  # EveryLB dependecies
index 4c5af21722c62c08a0bfc05fb0d40d097d06b3a7,1e18b9cd25356861b25f0c893f60ed1033975907..97e94517a386d8c47356d0d2e5116a9f10786339
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
- UNCOMMON_LDBS="MetisLB ScotchLB TeamLB WSLB"
 -#UNCOMMON_LDBS="TempAwareGreedyLB MetisLB ScotchLB TeamLB"
++UNCOMMON_LDBS="TempAwareGreedyLB MetisLB ScotchLB TeamLB WSLB"
  COMMON_LDBS="BlockLB CommLB DummyLB GreedyAgentLB GreedyCommLB GreedyLB NeighborCommLB NeighborLB OrbLB PhasebyArrayLB RandCentLB RecBipartLB RefineLB RefineCommLB RotateLB"
 -OTHER_LDBS="ComboCentLB GraphPartLB GraphBFTLB GridCommLB GridCommRefineLB GridHybridLB GridHybridSeedLB GridMetisLB HbmLB HybridLB RefineKLB RefineTopoLB TopoCentLB TopoLB WSLB"
 +OTHER_LDBS="ComboCentLB GraphPartLB GraphBFTLB GridCommLB GridCommRefineLB GridHybridLB GridHybridSeedLB GridMetisLB HbmLB HybridLB RefineKLB RefineTopoLB TopoCentLB TopoLB"
  ALL_LDBS="$COMMON_LDBS $OTHER_LDBS"
  
  out="Make.lb"
Simple merge
index e0c4895c5b2d41cf856f3d05af600cef917f3183,72e1e084ec6157f29504a010a51b7a867f39e975..ed1be8cdd1096e6b69ed0569d22f8319b379b6c3
@@@ -41,6 -41,6 +41,7 @@@ NborBaseLB.decl.h NborBaseLB.def.h: Nbo
  NeighborCommLB.decl.h NeighborCommLB.def.h: NeighborCommLB.ci.stamp
  NeighborLB.decl.h NeighborLB.def.h: NeighborLB.ci.stamp
  NullLB.decl.h NullLB.def.h: NullLB.ci.stamp
++NumaLB.decl.h NumaLB.def.h: NumaLB.ci.stamp
  OrbLB.decl.h OrbLB.def.h: OrbLB.ci.stamp
  PathHistory.decl.h PathHistory.def.h: pathHistory.ci.stamp
  PhasebyArrayLB.decl.h PhasebyArrayLB.def.h: PhasebyArrayLB.ci.stamp
index c1d97a720f0644f67f962898b1af57fac508b536,93c424bb3e699eb3b8afb661c5489384dc84e6ec..1f61c8817044b4a5a8c8387827a7736c11a13104
@@@ -2010,61 -2010,6 +2010,80 @@@ TopoLB.o: TopoLB.C TopoLB.decl.h charm+
   TopoLB.def.h
        $(CHARMC) -c -I. TopoLB.C
  
++TempAwareGreedyLB.o: TempAwareGreedyLB.C TempAwareGreedyLB.h CentralLB.h \
++ BaseLB.h LBDatabase.h lbdb.h converse.h conv-config.h conv-autoconfig.h \
++ conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
++ conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
++ persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
++ LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
++ LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
++ ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
++ ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
++ ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
++ CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
++ readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
++ CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
++ waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
++ ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h envelope.h \
++ NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h \
++ TempAwareGreedyLB.decl.h ckgraph.h TempAwareGreedyLB.def.h
++      $(CHARMC) -c -I. TempAwareGreedyLB.C
++
 +MetisLB.o: MetisLB.C MetisLB.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
 + converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
 + conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
 + conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
 + charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
 + LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
 + ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
 + CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
 + ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
 + cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
 + CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
 + CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
 + charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
 + ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
 + trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
 + CentralLB.decl.h CentralLBMsg.h MetisLB.decl.h ckgraph.h MetisLB.def.h
 +      $(CHARMC) -c -I. MetisLB.C
 +
 +ScotchLB.o: ScotchLB.C ScotchLB.h CentralLB.h BaseLB.h LBDatabase.h \
 + lbdb.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
 + conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
 + conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
 + debug-conv.h charm.h pup.h middle.h middle-conv.h LBDBManager.h \
 + cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
 + LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
 + ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
 + ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
 + ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
 + CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
 + readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
 + CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
 + waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
 + ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h envelope.h \
 + NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h \
 + ScotchLB.decl.h ckgraph.h ScotchLB.def.h
 +      $(CHARMC) -c -I. ScotchLB.C
 +
 +TeamLB.o: TeamLB.C TeamLB.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
 + converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
 + conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
 + conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
 + charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
 + LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
 + ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
 + CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
 + ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
 + cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
 + CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
 + CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
 + charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
 + ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
 + trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
 + CentralLB.decl.h CentralLBMsg.h TeamLB.decl.h ckgraph.h TeamLB.def.h
 +      $(CHARMC) -c -I. TeamLB.C
 +
  WSLB.o: WSLB.C elements.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \