Manually reverting one of the commits
authorNikhil Jain <nikhil@illinois.edu>
Thu, 15 Dec 2011 20:15:20 +0000 (14:15 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Thu, 15 Dec 2011 20:15:20 +0000 (14:15 -0600)
examples/charm++/load_balancing/stencil3d/Makefile
examples/charm++/typed_reduction/Makefile
examples/charm++/typed_reduction/TypedReduction.cc
examples/charm++/typed_reduction/TypedReduction.h
src/ck-ldb/EveryLB.ci
src/ck-ldb/Make.lb
src/ck-ldb/Makefile_lb.sh
src/scripts/Make.cidepends
src/scripts/Make.depends

index 895fd1a892d4cc6c66fdde76442d9c9e1a68c415..73f246dbdd2d7bfea0b627281427230ad3661beb 100644 (file)
@@ -24,6 +24,7 @@ clean:
        rm -f *.decl.h *.def.h conv-host *.o stencil3d stencil3d.prj charmrun *~
 
 test: stencil3d
+       ./charmrun +p4 ./stencil3d 64 32 +balancer RefineLB $(TESTOPTS)
        ./charmrun +p4 ./stencil3d 64 32 +balancer GreedyLB $(TESTOPTS)
 
 bgtest: stencil3d
index e54428cb54edf70351b9efef9f89fa71425c14e7..2da420e0740fd32176de95bef0996a5e808e2218 100644 (file)
@@ -9,7 +9,7 @@ TESTFLAGS = $(TESTOPTS)
 
 all: $(BINARY)
 $(BINARY): $(patsubst %.cc,%.o,$(wildcard *.cc))
-       $(CHARMC) $(CHARMCLINKFLAGS) -o $@ $+  -memory charmdebug
+       $(CHARMC) $(CHARMCLINKFLAGS) -o $@ $+ 
 
 .SECONDARY: $(patsubst %.cc,%.decl.h,$(wildcard *.cc))
 .SECONDARY: $(patsubst %.cc,%.def.h,$(wildcard *.cc))
index a42b0c6d73375214642b1b6deb02c8f12e84792e..a19b0f4ed926316164f0b3761b3b034df60b6fec 100644 (file)
@@ -5,7 +5,6 @@ Driver::Driver(CkArgMsg* args) {
     int array_size = 10;
     if (args->argc > 1) array_size = strtol(args->argv[1], NULL, 10);
     w = CProxy_Worker::ckNew(array_size);
-    count = 0;
     CkCallback *cb = new CkCallback(CkIndex_Driver::untyped_done(NULL), thisProxy);
     w.ckSetReductionClient(cb);
     w.reduce();
@@ -16,14 +15,6 @@ void Driver::untyped_done(CkReductionMsg* m) {
     int* output = (int*)m->getData();
     CkPrintf("Untyped Sum: %d\n", output[0]);
     delete m;
-    count++;
-
-    if(count < 11)
-      w.reduce();
-    else
-      CkExit();
-     
-    return;
     CkCallback *cb = new CkCallback(
             CkReductionTarget(Driver, typed_done), thisProxy);
     w.ckSetReductionClient(cb);
@@ -42,7 +33,7 @@ void Driver::typed_done(int result)
 void Driver::typed_array_done(int* results, int n)
 {
     CkPrintf("Typed Sum: [ ");
-    for (int i=0; i<5; ++i) CkPrintf("%d ", results[i]);
+    for (int i=0; i<n; ++i) CkPrintf("%d ", results[i]);
     CkPrintf("]\n");
     CkCallback *cb = new CkCallback(
             CkReductionTarget(Driver, typed_array_done2), thisProxy);
@@ -70,18 +61,18 @@ void Driver::typed_array_done3(int n, double* results)
 Worker::Worker() { }
 
 void Worker::reduce() {
-    int contribution[3000];
-    contribute(3000*sizeof(int), contribution, CkReduction::sum_int); 
+    int contribution=1;
+    contribute(1*sizeof(int), &contribution, CkReduction::sum_int); 
 }
 
 void Worker::reduce_array() {
-    int contribution[3000];
-    contribute(3000*sizeof(int), contribution, CkReduction::sum_int); 
+    int contribution[3]={1,2,3};
+    contribute(3*sizeof(int), contribution, CkReduction::sum_int); 
 }
 
 void Worker::reduce_array_doubles() {
     double contribution[3] = { 0.16180, 0.27182, 0.31415 };
-    contribute(3*sizeof(double), &contribution, CkReduction::sum_double);
+    contribute(3*sizeof(double), contribution, CkReduction::sum_double);
 }
 
 #include "TypedReduction.def.h"
index ac3c9aed60dc3730713ee2069153fc1f125d68b2..4056ce9be9a9337b5f4b13b5e1457c0d3cc13674 100644 (file)
@@ -9,7 +9,6 @@ class Driver : public CBase_Driver {
         void typed_array_done3(int n, double* results);
     private:
         CProxy_Worker w;
-        int count;
 };
 
 class Worker : public CBase_Worker {
index 014b72e0ae27c965b13deb8fa227b1c8e770846a..5bb718348fed287f03a0418db732dbebb45f31f4 100644 (file)
@@ -31,7 +31,6 @@ module EveryLB {
   extern module RefineTopoLB;
   extern module TopoCentLB;
   extern module TopoLB;
-  extern module RefineSwapLB;
 
   initnode void initEveryLB(void);
 };
index be658a0211b36175e22b023d05067b5749384c7e..8269e5737df706dc0a811078af2dd46137f97ddf 100644 (file)
@@ -30,7 +30,6 @@ ALL_LDBS=\
    $(L)/libmoduleRefineTopoLB.a \
    $(L)/libmoduleTopoCentLB.a \
    $(L)/libmoduleTopoLB.a \
-   $(L)/libmoduleRefineSwapLB.a \
    manager.o
 
 
@@ -214,12 +213,6 @@ $(L)/libmoduleTopoLB.a: TopoLB.o
 LBHEADERS += TopoLB.h TopoLB.decl.h
 
 
-$(L)/libmoduleRefineSwapLB.a: RefineSwapLB.o 
-       $(CHARMC) -o $(L)/libmoduleRefineSwapLB.a RefineSwapLB.o 
-       
-LBHEADERS += RefineSwapLB.h RefineSwapLB.decl.h
-
-
 $(L)/libmoduleTempAwareGreedyLB.a: TempAwareGreedyLB.o 
        $(CHARMC) -o $(L)/libmoduleTempAwareGreedyLB.a TempAwareGreedyLB.o 
        
@@ -282,7 +275,6 @@ ALL_LB_OBJS=EveryLB.o \
     RefineTopoLB.o \
     TopoCentLB.o \
     TopoLB.o \
-    RefineSwapLB.o \
     TempAwareGreedyLB.o \
     MetisLB.o \
     ScotchLB.o \
@@ -325,7 +317,6 @@ EVERYLB_DEPS=EveryLB.o \
     RefineTopoLB.o \
     TopoCentLB.o \
     TopoLB.o \
-    RefineSwapLB.o \
     manager.o \
     tm_tree.o  \
     tm_timings.o  \
index 0e3085662d460b8b3bf054c3e9b2d483f6f9ed31..e59e977e3ad320fa56b009d910974c9e12cab3b6 100755 (executable)
@@ -2,7 +2,7 @@
 UNCOMMON_LDBS="TempAwareGreedyLB MetisLB ScotchLB TeamLB WSLB"
 COMMON_LDBS="BlockLB CommLB DummyLB GreedyAgentLB GreedyCommLB GreedyLB NeighborCommLB NeighborLB OrbLB PhasebyArrayLB RandCentLB RecBipartLB RefineLB RefineCommLB RotateLB TreeMatchLB"
 OTHER_LDBS="ComboCentLB GraphPartLB GraphBFTLB GridCommLB GridCommRefineLB GridHybridLB GridHybridSeedLB GridMetisLB HbmLB HybridLB RefineKLB RefineTopoLB TopoCentLB TopoLB"
-ALL_LDBS="$COMMON_LDBS $OTHER_LDBS RefineSwapLB"
+ALL_LDBS="$COMMON_LDBS $OTHER_LDBS"
 
 out="Make.lb"
 
index 74662a947ff177d347ed83994d042d533a52bedf..d9122c7fe3f567d1a37d8b76bb9b33ede3f3cce4 100644 (file)
@@ -49,7 +49,6 @@ RecBipartLB.decl.h RecBipartLB.def.h: RecBipartLB.ci.stamp
 RecBisectBfLB.decl.h RecBisectBfLB.def.h: RecBisectBfLB.ci.stamp
 RefineCommLB.decl.h RefineCommLB.def.h: RefineCommLB.ci.stamp
 RefineKLB.decl.h RefineKLB.def.h: RefineKLB.ci.stamp
-RefineSwapLB.decl.h RefineSwapLB.def.h: RefineSwapLB.ci.stamp
 RefineLB.decl.h RefineLB.def.h: RefineLB.ci.stamp
 RefineTopoLB.decl.h RefineTopoLB.def.h: RefineTopoLB.ci.stamp
 RotateLB.decl.h RotateLB.def.h: RotateLB.ci.stamp
index 7032341583e0161b92c07f0d172d820eb3f6782c..615d6665fc7c25d83ad695772d1c77a6d9e5ab93 100644 (file)
@@ -1473,7 +1473,7 @@ EveryLB.o: EveryLB.C LBDatabase.h lbdb.h converse.h conv-config.h \
  GridHybridLB.decl.h GridHybridSeedLB.decl.h GridMetisLB.decl.h \
  HbmLB.decl.h HybridLBMsg.h HybridLB.decl.h HybridBaseLB.decl.h \
  RefineKLB.decl.h RefineTopoLB.decl.h TopoCentLB.decl.h TopoLB.decl.h \
- EveryLB.def.h RefineSwapLB.decl.h
+ EveryLB.def.h 
        $(CHARMC) -c -I. EveryLB.C
 
 CommonLBs.o: CommonLBs.C LBDatabase.h lbdb.h converse.h conv-config.h \
@@ -1754,25 +1754,6 @@ RefineLB.o: RefineLB.C elements.h converse.h conv-config.h \
  CentralLB.decl.h CentralLBMsg.h Refiner.h RefineLB.decl.h RefineLB.def.h
        $(CHARMC) -c -I. RefineLB.C
 
-RefineSwapLB.o: RefineSwapLB.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 persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h \
- middle-conv.h ckset.h cklists.h ckheap.h RefineSwapLB.h CentralLB.h BaseLB.h \
- LBDatabase.h LBDBManager.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 debug-conv++.h simd.h CkMarshall.decl.h \
- ckarrayindex.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.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 Refiner.h RefineSwapLB.decl.h RefineSwapLB.def.h
-       $(CHARMC) -c -I. RefineSwapLB.C
-
 RefineCommLB.o: RefineCommLB.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 \