Added sequential support.
authorEric Bohm <ebohm@illinois.edu>
Wed, 20 Oct 2004 03:46:30 +0000 (03:46 +0000)
committerEric Bohm <ebohm@illinois.edu>
Wed, 20 Oct 2004 03:46:30 +0000 (03:46 +0000)
make SEQUENTIAL=1 now builds the sequential version of the simulator.
It turns on the -DSEQUENTIAL_POSE flag, adds the -s to etrans, and
copies libmoduleseqpose to libmodulepose for linking so you get the
sequential pose.
Building without sequential copies the libmoduleorigpose back in so
parallel builds shouldn't be broken.

examples/pose/HiSim/BlueGene/Makefile
examples/pose/HiSim/Makefile.common
examples/pose/HiSim/Topology/Makefile

index 75e551536476952930961a365dff2631ffbc29cd..13fe360e024c6ca9eec21b07f3afd29c26a691d1 100644 (file)
@@ -39,7 +39,7 @@ OTHER = -lconv-bluegene-logs
 LIBS = -Lstdc++ -lm
 MACHINE = BlueGene
 
-all:  
+all:  sqtest
        @echo
        test -d ../tmp || mkdir ../tmp;
        for i in $(SUBDIRS) ; do \
@@ -56,6 +56,16 @@ $(OBJDIR)/InitNetwork.o: InitNetwork.C
 $(OBJDIR)/util.o: util.C
        $(CHARMC) -o $@ -seq util.C
 
+
+sqtest:
+ifeq ($(SEQUENTIAL),1)
+       cp  $(CHARMBASE)/lib/libmoduleseqpose.a $(CHARMBASE)/lib/libmodulepose.a
+       cp  $(CHARMBASE)/lib_so/libmoduleseqpose.so $(CHARMBASE)/lib_so/libmodulepose.so
+else
+       cp  $(CHARMBASE)/lib/libmoduleorigpose.a $(CHARMBASE)/lib/libmodulepose.a
+       cp  $(CHARMBASE)/lib_so/libmoduleorigpose.so $(CHARMBASE)/lib_so/libmodulepose.so
+endif
+
 clean:
        @echo
        for i in $(SUBDIRS) ; do \
index 5b38e33542e650ed94b5909a3747aaa7cc16a82f..ffcf88f5060b96484b2ea8a4f3b7d1d8c577a82f 100644 (file)
@@ -7,3 +7,7 @@ OBJDIR=../tmp
 
 CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
 ETRANS=$(CHARMBIN)/etrans.pl
+ifeq ($(SEQUENTIAL),1)
+OPTS += "-DSEQUENTIAL_POSE"
+ETRANS += "-s"
+endif
index a62b8cbbac4110bbb9bd3cea08a94ac20ccc09d6..bc7e1f1402146c32f5b6c6f64f95f6ba6576e019 100644 (file)
@@ -1,10 +1,6 @@
 OPTS=-g #-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
 
-CHARMBASE=../../../../
-CHARMBIN=$(CHARMBASE)/bin
-CHARMINC=$(CHARMBASE)/include
-
-CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) -Dcompile
+include ../Makefile.common
 
 LIBS=-Lstdc++ -lm