Move TempAwareGreedyLB out of the common set
authorPhil Miller <mille121@illinois.edu>
Thu, 24 Feb 2011 15:31:34 +0000 (09:31 -0600)
committerPhil Miller <mille121@illinois.edu>
Thu, 24 Feb 2011 15:31:34 +0000 (09:31 -0600)
src/ck-ldb/CommonLBs.ci
src/ck-ldb/EveryLB.ci
src/ck-ldb/Make.lb
src/ck-ldb/Makefile_lb.sh
src/scripts/Make.depends

index d463102413aab0238d932d0100bb0b5afc988573..238e5d7005bbf311fba8cab25f9af84b4ca8a61d 100644 (file)
@@ -6,7 +6,6 @@ module CommonLBs {
   extern module DummyLB;
   extern module GreedyAgentLB;
   extern module GreedyCommLB;
-  extern module TempAwareGreedyLB;
   extern module GreedyLB;
   extern module NeighborCommLB;
   extern module NeighborLB;
index 315cd5f5b933f0ada3bc982af117151878593463..3defdd416ccf4ce1d874a03ae5cf47afcef18c6d 100644 (file)
@@ -6,7 +6,6 @@ module EveryLB {
   extern module DummyLB;
   extern module GreedyAgentLB;
   extern module GreedyCommLB;
-  extern module TempAwareGreedyLB;
   extern module GreedyLB;
   extern module NeighborCommLB;
   extern module NeighborLB;
index aed8de2ccba462c97c70ebc8d8bbb11a534e403e..b2e8e1c3f384562a579ce86d65bbe46d3c7cdfed 100644 (file)
@@ -1,14 +1,13 @@
 # Automatically generated by script Makefile_lb.sh
-#  by uid=21585(sarood) gid=80(kale) groups=80(kale),400(ppladmin)
-#  at might
-#  on Thu Feb 24 07:39:44 CST 2011
+#  by uid=1000(phil) gid=1000(phil) groups=1000(phil),20(dialout),24(cdrom),25(floppy),27(sudo),29(audio),44(video),46(plugdev),112(powerdev)
+#  at itu
+#  on Thu Feb 24 09:27:15 CST 2011
 ALL_LDBS=\
    $(L)/libmoduleBlockLB.a \
    $(L)/libmoduleCommLB.a \
    $(L)/libmoduleDummyLB.a \
    $(L)/libmoduleGreedyAgentLB.a \
    $(L)/libmoduleGreedyCommLB.a \
-   $(L)/libmoduleTempAwareGreedyLB.a \
    $(L)/libmoduleGreedyLB.a \
    $(L)/libmoduleNeighborCommLB.a \
    $(L)/libmoduleNeighborLB.a \
@@ -67,12 +66,6 @@ $(L)/libmoduleGreedyCommLB.a: GreedyCommLB.o manager.o
 LBHEADERS += GreedyCommLB.h GreedyCommLB.decl.h
 
 
-$(L)/libmoduleTempAwareGreedyLB.a: TempAwareGreedyLB.o 
-       $(CHARMC) -o $(L)/libmoduleTempAwareGreedyLB.a TempAwareGreedyLB.o 
-       
-LBHEADERS += TempAwareGreedyLB.h TempAwareGreedyLB.decl.h
-
-
 $(L)/libmoduleGreedyLB.a: GreedyLB.o 
        $(CHARMC) -o $(L)/libmoduleGreedyLB.a GreedyLB.o 
        
@@ -230,7 +223,6 @@ ALL_LB_OBJS=EveryLB.o \
     DummyLB.o \
     GreedyAgentLB.o \
     GreedyCommLB.o \
-    TempAwareGreedyLB.o \
     GreedyLB.o \
     NeighborCommLB.o \
     NeighborLB.o \
@@ -264,7 +256,6 @@ EVERYLB_DEPS=EveryLB.o \
     DummyLB.o \
     GreedyAgentLB.o \
     GreedyCommLB.o \
-    TempAwareGreedyLB.o \
     GreedyLB.o \
     NeighborCommLB.o \
     NeighborLB.o \
@@ -298,7 +289,6 @@ COMMONLBS_DEPS=CommonLBs.o \
     DummyLB.o \
     GreedyAgentLB.o \
     GreedyCommLB.o \
-    TempAwareGreedyLB.o \
     GreedyLB.o \
     NeighborCommLB.o \
     NeighborLB.o \
index d3a632280a84f40ec7c21397d5ab5c50efc1f4db..8b7d0c08378852124c97e828265a53eec3542f72 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
-#UNCOMMON_LDBS="MetisLB ScotchLB TeamLB"
-COMMON_LDBS="BlockLB CommLB DummyLB GreedyAgentLB GreedyCommLB TempAwareGreedyLB GreedyLB NeighborCommLB NeighborLB OrbLB PhasebyArrayLB RandCentLB RecBipartLB RefineLB RefineCommLB RotateLB"
+#UNCOMMON_LDBS="TempAwareGreedyLB MetisLB ScotchLB TeamLB"
+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"
 ALL_LDBS="$COMMON_LDBS $OTHER_LDBS"
 
index 5a69914408910b43fd34d175cc1f15c1f993cddc..93c424bb3e699eb3b8afb661c5489384dc84e6ec 100644 (file)
@@ -1417,8 +1417,8 @@ EveryLB.o: EveryLB.C LBDatabase.h lbdb.h converse.h conv-config.h \
  trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h EveryLB.decl.h \
  charm++.h BlockLB.decl.h CentralLB.decl.h BaseLB.decl.h \
  LBDatabase.decl.h CentralLBMsg.h CommLB.decl.h DummyLB.decl.h \
- GreedyAgentLB.decl.h GreedyCommLB.decl.h TempAwareGreedyLB.decl.h \
GreedyLB.decl.h NeighborCommLB.decl.h NborBaseLB.decl.h NeighborLBMsg.h \
+ GreedyAgentLB.decl.h GreedyCommLB.decl.h GreedyLB.decl.h \
+ NeighborCommLB.decl.h NborBaseLB.decl.h NeighborLBMsg.h \
  NeighborLB.decl.h OrbLB.decl.h PhasebyArrayLB.decl.h RandCentLB.decl.h \
  RecBipartLB.decl.h RefineLB.decl.h RefineCommLB.decl.h RotateLB.decl.h \
  ComboCentLB.decl.h GraphPartLB.decl.h GraphBFTLB.decl.h \
@@ -1445,8 +1445,8 @@ CommonLBs.o: CommonLBs.C LBDatabase.h lbdb.h converse.h conv-config.h \
  trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h CommonLBs.decl.h \
  charm++.h BlockLB.decl.h CentralLB.decl.h BaseLB.decl.h \
  LBDatabase.decl.h CentralLBMsg.h CommLB.decl.h DummyLB.decl.h \
- GreedyAgentLB.decl.h GreedyCommLB.decl.h TempAwareGreedyLB.decl.h \
GreedyLB.decl.h NeighborCommLB.decl.h NborBaseLB.decl.h NeighborLBMsg.h \
+ GreedyAgentLB.decl.h GreedyCommLB.decl.h GreedyLB.decl.h \
+ NeighborCommLB.decl.h NborBaseLB.decl.h NeighborLBMsg.h \
  NeighborLB.decl.h OrbLB.decl.h PhasebyArrayLB.decl.h RandCentLB.decl.h \
  RecBipartLB.decl.h RefineLB.decl.h RefineCommLB.decl.h RotateLB.decl.h \
  CommonLBs.def.h
@@ -1547,25 +1547,6 @@ GreedyCommLB.o: GreedyCommLB.C elements.h converse.h conv-config.h \
  GreedyCommLB.decl.h CommLBHeap.h manager.h GreedyCommLB.def.h
        $(CHARMC) -c -I. GreedyCommLB.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
-
 GreedyLB.o: GreedyLB.C GreedyLB.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 \