head	1.23;
access;
symbols
	charm6_1:1.23
	charm_6_0_1:1.23
	charm6_0_1:1.23
	charm6_0:1.20
	ChaNGa_1-0:1.15
	charm5_9:1.8;
locks; strict;
comment	@# @;


1.23
date	2009.02.04.17.26.44;	author gzheng;	state Exp;
branches;
next	1.22;
commitid	UPBsPyK2SnTsO8Bt;

1.22
date	2008.06.13.16.19.14;	author gzheng;	state Exp;
branches;
next	1.21;
commitid	DIzYmvvygKXB1O6t;

1.21
date	2008.05.21.18.23.40;	author gzheng;	state Exp;
branches;
next	1.20;
commitid	VY5DlnLXAjR5sR3t;

1.20
date	2007.10.17.04.13.31;	author gzheng;	state Exp;
branches;
next	1.19;
commitid	335a47158bd24567;

1.19
date	2007.09.20.20.25.00;	author bhatele;	state Exp;
branches;
next	1.18;
commitid	41d046f2d7064567;

1.18
date	2007.02.11.08.51.25;	author chao;	state Exp;
branches;
next	1.17;
commitid	3a1145ced8f34567;

1.17
date	2007.02.09.17.21.49;	author chao;	state Exp;
branches;
next	1.16;
commitid	27945ccad9f4567;

1.16
date	2007.02.09.17.20.27;	author chao;	state Exp;
branches;
next	1.15;
commitid	23945ccad3a4567;

1.15
date	2006.08.25.19.08.36;	author gzheng;	state Exp;
branches;
next	1.14;

1.14
date	2006.04.10.18.39.37;	author yanshi;	state Exp;
branches;
next	1.13;

1.13
date	2006.04.07.19.39.08;	author yanshi;	state Exp;
branches;
next	1.12;

1.12
date	2006.04.07.05.32.40;	author yanshi;	state Exp;
branches;
next	1.11;

1.11
date	2005.09.20.18.33.20;	author gzheng;	state Exp;
branches;
next	1.10;

1.10
date	2005.09.20.18.28.59;	author chao;	state Exp;
branches;
next	1.9;

1.9
date	2005.09.20.18.22.09;	author chao;	state Exp;
branches;
next	1.8;

1.8
date	2005.04.05.23.55.15;	author gioachin;	state Exp;
branches;
next	1.7;

1.7
date	2005.04.02.22.45.11;	author chao;	state Exp;
branches;
next	1.6;

1.6
date	2005.04.01.21.49.45;	author chao;	state Exp;
branches;
next	1.5;

1.5
date	2005.01.23.17.35.03;	author gzheng;	state Exp;
branches;
next	1.4;

1.4
date	2005.01.22.18.23.55;	author gzheng;	state Exp;
branches;
next	1.3;

1.3
date	2004.10.24.05.56.26;	author gzheng;	state Exp;
branches;
next	1.2;

1.2
date	2004.10.15.18.43.00;	author gzheng;	state Exp;
branches;
next	1.1;

1.1
date	2004.09.08.19.10.38;	author chao;	state Exp;
branches;
next	;


desc
@@


1.23
log
@added ./
@
text
@CHARMBASE=../../../
CHARMC=../../../bin/charmc $(OPTS)
TOKENS=6

all: ampi

ampi: jacobi jacobi.iso jacobi-get

mpi: jacobi.C
	mpiCC -o jacobi jacobi.C  $(OPTS)

jacobi-cpp: jacobi-cpp.C
	$(CHARMC) -c jacobi-cpp.C 
	$(CHARMC) -o jacobi-cpp jacobi-cpp.o -language ampi -module EveryLB -lm

jacobi: jacobi.C
	$(CHARMC) -c jacobi.C 
	$(CHARMC) -o jacobi jacobi.o -language ampi -module EveryLB -lm

jacobi.iso: jacobi.C
	$(CHARMC) -c -DNO_PUP jacobi.C
	-$(CHARMC) -o jacobi.iso jacobi.o -language ampi -module EveryLB -memory isomalloc

jacobi-get: jacobi-get.C
	$(CHARMC) -c jacobi-get.C
	$(CHARMC) -o jacobi-get jacobi-get.o -language ampi -module EveryLB -lm

jacobi-get-tokens:
	cd $(CHARMBASE)/tmp; touch machine.c; touch ckfutures.C; make AMPI OPTS="-DIGET_FLOWCONTROL=1 -DIGET_TOKENNUM=$(TOKENS)"; cd -; 
	make jacobi-get;

test: ampi
	./charmrun +p3 ./jacobi 2 2 2 +vp8 +balancer RotateLB +LBDebug 1 $(TESTOPTS)
	-./charmrun +p3 ./jacobi.iso 2 2 2 +vp8 +balancer RotateLB +LBDebug 1 $(TESTOPTS) &  \
 pid=$$!; (sleep 30; echo killall jacobi.iso; killall -9 jacobi.iso)

bgtest: jacobi
	./charmrun +p2 ./jacobi 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1 $(TESTOPTS)
	-./charmrun +p2 ./jacobi.iso 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1 $(TESTOPTS)

clean:
	rm -f *.o jacobi *~ moduleinit.C charmrun conv-host jacobi-cpp jacobi.iso jacobi-get
	rm -rf 40 80 120
@


1.22
log
@simple changes.
@
text
@d33 2
a34 2
	./charmrun +p3 jacobi 2 2 2 +vp8 +balancer RotateLB +LBDebug 1 $(TESTOPTS)
	-./charmrun +p3 jacobi.iso 2 2 2 +vp8 +balancer RotateLB +LBDebug 1 $(TESTOPTS) &  \
d38 2
a39 2
	./charmrun +p2 jacobi 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1 $(TESTOPTS)
	-./charmrun +p2 jacobi.iso 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1 $(TESTOPTS)
@


1.21
log
@start jacobi.iso in background, kill it after 30 seconds
@
text
@d35 1
a35 1
 pid=$$!; (sleep 30; echo kill -9 $$pid; kill -9 $$pid)
@


1.20
log
@fixed TESTOPTS
@
text
@d23 1
d34 2
a35 1
	-./charmrun +p3 jacobi.iso 2 2 2 +vp8 +balancer RotateLB +LBDebug 1 $(TESTOPTS)
@


1.19
log
@"all" target added
@
text
@d32 2
a33 2
	./charmrun +p3 jacobi 2 2 2 +vp8 +balancer RotateLB +LBDebug $(TESTOPTS)
	-./charmrun +p3 jacobi.iso 2 2 2 +vp8 +balancer RotateLB +LBDebug $(TESTOPTS)
@


1.18
log
@Added -DNO_PUP for jacobi by mistake...
@
text
@d5 2
@


1.17
log
@complete make clean target
@
text
@a0 1
OPTS=-g
d15 1
a15 1
	$(CHARMC) -c jacobi.C -DNO_PUP
@


1.16
log
@c++ version of jacobi
@
text
@d39 1
a39 1
	rm -f *.o jacobi *~ moduleinit.C charmrun conv-host
@


1.15
log
@pass TESTOPTS
@
text
@d1 1
d11 4
d16 1
a16 1
	$(CHARMC) -c jacobi.C
@


1.14
log
@Updates: more correct refine loop. Still need some fixing.
@
text
@d26 2
a27 2
	./charmrun +p3 jacobi 2 2 2 +vp8 +balancer RotateLB +LBDebug
	-./charmrun +p3 jacobi.iso 2 2 2 +vp8 +balancer RotateLB +LBDebug
d30 2
a31 2
	./charmrun +p2 jacobi 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1
	-./charmrun +p2 jacobi.iso 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1
@


1.13
log
@Fixed to get ghost with user defined type. Still need to
update the refine loop to use the ghost for compute.
@
text
@d1 1
d3 1
d21 4
@


1.12
log
@Program to do jacobi with MPI_IGet. Need correct packing now.
@
text
@d3 1
a3 1
ampi: jacobi jacobi.iso
d10 1
a10 1
	$(CHARMC) -o jacobi jacobi.o -language ampi -module EveryLB
d17 1
a17 1
	$(CHARMC) -o jacobi-get jacobi-get.o -language ampi -module EveryLB
@


1.11
log
@added back missing NO_PUP for isomalloc version.
fixed Makefile for compilation.
@
text
@d15 3
@


1.10
log
@Added test for iso and use RotateLB
@
text
@d3 1
a3 1
ampi: jacobi
d17 2
a18 2
	./charmrun +p3 jacobi 2 2 2 +vp8 +balancer RotateLB
	-./charmrun +p3 jacobi.iso 2 2 2 +vp8 +balancer RotateLB
@


1.9
log
@Roll back to 12/04 to correct my accidental checkin of test code.
@
text
@d12 4
d17 2
a18 1
	./charmrun +p3 jacobi 2 2 2 +vp8 +balancer GreedyCommLB
d21 2
a22 1
	./charmrun +p2 jacobi 2 2 2 10 +vp8 +balancer GreedyCommLB +x2 +y2 +z1
@


1.8
log
@fixed missing module
@
text
@d6 1
a6 1
	mpiCC -o jacobi.mpi jacobi.C  $(OPTS)
d12 2
a13 3
jacobi.iso: jacobi.C
	$(CHARMC) -c -DNO_PUP jacobi.C
	-$(CHARMC) -o jacobi.iso jacobi.o -language ampi -module EveryLB
d15 2
a16 7
test: jacobi jacobi.iso
	./charmrun +p3 jacobi 2 2 2 +vp8 +balancer RotateLB
	-./charmrun +p3 jacobi.iso 2 2 2 +vp8 +balancer RotateLB

bgtest: jacobi  jacobi.iso
	./charmrun +p2 jacobi 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1
	-./charmrun +p2 jacobi.iso 2 2 2 10 +vp8 +balancer RotateLB +x2 +y2 +z1
@


1.7
log
@*** empty log message ***
@
text
@d10 1
a10 1
	$(CHARMC) -o jacobi jacobi.o -language ampi 
@


1.6
log
@*** empty log message ***
@
text
@d6 1
a6 1
	mpiCC -o jacobi jacobi.C  $(OPTS)
d10 1
a10 1
	$(CHARMC) -o jacobi jacobi.o -language ampi -module EveryLB
@


1.5
log
@switch to RotateLB.
@
text
@d14 1
a14 1
	-$(CHARMC) -o jacobi.iso jacobi.o -language ampi -module EveryLB -memory isomalloc
@


1.4
log
@tested isomalloc (allow failure though)
@
text
@d16 3
a18 3
test: ampi  jacobi.iso
	./charmrun +p3 jacobi 2 2 2 +vp8 +balancer GreedyCommLB
	-./charmrun +p3 jacobi.iso 2 2 2 +vp8 +balancer GreedyCommLB
d20 3
a22 2
bgtest: jacobi
	./charmrun +p2 jacobi 2 2 2 10 +vp8 +balancer GreedyCommLB +x2 +y2 +z1
@


1.3
log
@set up for bgtest
@
text
@d12 5
a16 1
test: ampi
d18 1
@


1.2
log
@added a bgtest target
@
text
@d16 1
a16 1
	./charmrun +p2 jacobi 2 2 2 10 +vp8 +bgconfig ./bg_config
@


1.1
log
@Add test cases for AMPI
@
text
@d3 1
a3 3
ampi: jacobi.C
	$(CHARMC) -c jacobi.C
	$(CHARMC) -o jacobi jacobi.o -language ampi -module EveryLB
d8 4
d15 3
@

