updated dependence rules for TreeMatchLB
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 29 Mar 2011 19:38:45 +0000 (14:38 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 29 Mar 2011 19:38:45 +0000 (14:38 -0500)
src/ck-ldb/Make.lb
src/ck-ldb/Makefile_lb.sh
src/scripts/Make.depends

index 184c5ac2e4a0abbf0c19bd462e678d3f0fdcfe14..8269e5737df706dc0a811078af2dd46137f97ddf 100644 (file)
@@ -123,8 +123,8 @@ $(L)/libmoduleRotateLB.a: RotateLB.o
 LBHEADERS += RotateLB.h RotateLB.decl.h
 
 
-$(L)/libmoduleTreeMatchLB.a: TreeMatchLB.o treematch.o treebucket.o treetimings.o treemapping.o
-       $(CHARMC) -o $(L)/libmoduleTreeMatchLB.a TreeMatchLB.o treematch.o treebucket.o treetimings.o treemapping.o
+$(L)/libmoduleTreeMatchLB.a: TreeMatchLB.o tm_tree.o tm_bucket.o tm_timings.o tm_mapping.o
+       $(CHARMC) -o $(L)/libmoduleTreeMatchLB.a TreeMatchLB.o tm_tree.o tm_bucket.o tm_timings.o tm_mapping.o
        
 LBHEADERS += TreeMatchLB.h TreeMatchLB.decl.h
 
@@ -281,10 +281,10 @@ ALL_LB_OBJS=EveryLB.o \
     TeamLB.o \
     WSLB.o \
     manager.o  \
-    treematch.o  \
-    treetimings.o  \
-    treebucket.o \
-    treemapping.o
+    tm_tree.o  \
+    tm_timings.o  \
+    tm_bucket.o \
+    tm_mapping.o
 # EveryLB dependecies
 EVERYLB_DEPS=EveryLB.o \
     BlockLB.o \
@@ -318,10 +318,10 @@ EVERYLB_DEPS=EveryLB.o \
     TopoCentLB.o \
     TopoLB.o \
     manager.o \
-    treematch.o  \
-    treetimings.o  \
-    treebucket.o \
-    treemapping.o
+    tm_tree.o  \
+    tm_timings.o  \
+    tm_bucket.o \
+    tm_mapping.o
 # CommonLBs dependencies
 COMMONLBS_DEPS=CommonLBs.o \
     BlockLB.o \
@@ -341,10 +341,10 @@ COMMONLBS_DEPS=CommonLBs.o \
     RotateLB.o \
     TreeMatchLB.o \
     manager.o \
-    treematch.o  \
-    treetimings.o  \
-    treebucket.o \
-    treemapping.o
+    tm_tree.o  \
+    tm_timings.o  \
+    tm_bucket.o \
+    tm_mapping.o
 
 $(L)/libmoduleEveryLB.a: $(EVERYLB_DEPS)
        $(CHARMC) -o $(L)/libmoduleEveryLB.a $(EVERYLB_DEPS)
index 9dd9c7f17c417f87ac28e1ea9721b0d4f4d89f39..e59e977e3ad320fa56b009d910974c9e12cab3b6 100755 (executable)
@@ -25,7 +25,7 @@ do
         [ $bal = 'GridCommRefineLB' ] && manager="manager.o"
         [ $bal = 'GridHybridLB' ] && manager="manager.o"
         [ $bal = 'GridHybridSeedLB' ] && manager="manager.o"
-        [ $bal = 'TreeMatchLB' ] && manager="treematch.o treebucket.o treetimings.o treemapping.o"
+        [ $bal = 'TreeMatchLB' ] && manager="tm_tree.o tm_bucket.o tm_timings.o tm_mapping.o"
        cat >> $out << EOB 
 
 \$(L)/libmodule$bal.a: $bal.o $manager
@@ -66,10 +66,10 @@ do
        echo "    $bal.o \\" >> $out
 done
 echo "    manager.o  \\" >> $out
-echo "    treematch.o  \\" >> $out
-echo "    treetimings.o  \\" >> $out
-echo "    treebucket.o \\" >> $out
-echo "    treemapping.o" >> $out
+echo "    tm_tree.o  \\" >> $out
+echo "    tm_timings.o  \\" >> $out
+echo "    tm_bucket.o \\" >> $out
+echo "    tm_mapping.o" >> $out
 
 echo "# EveryLB dependecies" >> $out
 echo "EVERYLB_DEPS=EveryLB.o \\" >> $out
@@ -78,10 +78,10 @@ do
        echo "    $bal.o \\" >> $out
 done
 echo "    manager.o \\" >> $out
-echo "    treematch.o  \\" >> $out
-echo "    treetimings.o  \\" >> $out
-echo "    treebucket.o \\" >> $out
-echo "    treemapping.o" >> $out
+echo "    tm_tree.o  \\" >> $out
+echo "    tm_timings.o  \\" >> $out
+echo "    tm_bucket.o \\" >> $out
+echo "    tm_mapping.o" >> $out
 
 echo "# CommonLBs dependencies" >> $out
 echo "COMMONLBS_DEPS=CommonLBs.o \\" >> $out
@@ -90,10 +90,10 @@ do
        echo "    $bal.o \\" >> $out
 done
 echo "    manager.o" \\>> $out
-echo "    treematch.o  \\" >> $out
-echo "    treetimings.o  \\" >> $out
-echo "    treebucket.o \\" >> $out
-echo "    treemapping.o" >> $out
+echo "    tm_tree.o  \\" >> $out
+echo "    tm_timings.o  \\" >> $out
+echo "    tm_bucket.o \\" >> $out
+echo "    tm_mapping.o" >> $out
 
 cat >> $out <<EOB
 
index 0455b9e78bb0135177f74780a00cc520e8b80245..4878dac1c16acba1198de4c0ac55d2e9f2c54876 100644 (file)
@@ -1752,10 +1752,9 @@ TreeMatchLB.o: TreeMatchLB.C charm++.h charm.h converse.h conv-config.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 treemapping.h treematch.h TreeMatchLB.h \
- CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
- BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h TreeMatchLB.decl.h \
- TreeMatchLB.def.h
+ trace-bluegene.h envelope.h tm_tree.h TreeMatchLB.h CentralLB.h BaseLB.h \
+ LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
+ CentralLBMsg.h TreeMatchLB.decl.h TreeMatchLB.def.h
        $(CHARMC) -c -I. TreeMatchLB.C
 
 ComboCentLB.o: ComboCentLB.C ComboCentLB.h CentralLB.h BaseLB.h \
@@ -2141,17 +2140,17 @@ manager.o: manager.C manager.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
  CentralLB.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. manager.C
 
-treematch.o: treematch.c treematch.h treetimings.h treebucket.h
-       $(CHARMC) -c -I. treematch.c
+tm_tree.o: tm_tree.c tm_tree.h tm_timings.h tm_bucket.h
+       $(CHARMC) -c -I. tm_tree.c
 
-treetimings.o: treetimings.c treetimings.h
-       $(CHARMC) -c -I. treetimings.c
+tm_timings.o: tm_timings.c tm_timings.h
+       $(CHARMC) -c -I. tm_timings.c
 
-treebucket.o: treebucket.c treematch.h treebucket.h treetimings.h
-       $(CHARMC) -c -I. treebucket.c
+tm_bucket.o: tm_bucket.c tm_tree.h tm_bucket.h tm_timings.h
+       $(CHARMC) -c -I. tm_bucket.c
 
-treemapping.o: treemapping.c treetimings.h treematch.h treemapping.h
-       $(CHARMC) -c -I. treemapping.c
+tm_mapping.o: tm_mapping.c tm_timings.h tm_tree.h tm_mapping.h
+       $(CHARMC) -c -I. tm_mapping.c
 
 blue.o: blue.C cklists.h pup.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 \