head	1.47;
access;
symbols
	charm6_1:1.47
	charm_6_0_1:1.47
	charm6_0_1:1.47
	charm6_0:1.45
	ChaNGa_1-0:1.44
	charm5_9:1.39
	charm_5-4-2:1.12
	charm_5-4-1:1.12
	pre-winnt-version:1.2;
locks; strict;
comment	@# @;


1.47
date	2008.06.11.02.40.40;	author gioachin;	state Exp;
branches;
next	1.46;
commitid	xsaVcFWV6GlOyt6t;

1.46
date	2008.04.25.19.35.15;	author abecker;	state Exp;
branches;
next	1.45;
commitid	0Cf0n3GmBtPqGw0t;

1.45
date	2007.06.21.16.36.41;	author idooley2;	state Exp;
branches;
next	1.44;
commitid	4b12467aa9044567;

1.44
date	2006.05.05.16.00.33;	author gzheng;	state Exp;
branches;
next	1.43;

1.43
date	2006.01.21.09.11.25;	author gzheng;	state Exp;
branches;
next	1.42;

1.42
date	2005.12.09.19.31.26;	author gzheng;	state Exp;
branches;
next	1.41;

1.41
date	2005.12.09.18.48.38;	author idooley2;	state Exp;
branches;
next	1.40;

1.40
date	2005.12.09.18.13.05;	author idooley2;	state Exp;
branches;
next	1.39;

1.39
date	2004.10.06.22.14.50;	author gioachin;	state Exp;
branches;
next	1.38;

1.38
date	2004.10.06.18.55.46;	author olawlor;	state Exp;
branches;
next	1.37;

1.37
date	2004.10.05.20.24.53;	author gioachin;	state Exp;
branches;
next	1.36;

1.36
date	2004.08.21.19.06.31;	author olawlor;	state Exp;
branches;
next	1.35;

1.35
date	2004.08.21.14.57.39;	author schak;	state Exp;
branches;
next	1.34;

1.34
date	2004.08.13.22.20.52;	author olawlor;	state Exp;
branches;
next	1.33;

1.33
date	2004.05.19.23.36.10;	author skumar2;	state Exp;
branches;
next	1.32;

1.32
date	2004.03.01.15.35.29;	author jdesouza;	state Exp;
branches;
next	1.31;

1.31
date	2003.09.27.05.30.38;	author gzheng;	state Exp;
branches;
next	1.30;

1.30
date	2003.09.17.15.23.06;	author skumar2;	state Exp;
branches;
next	1.29;

1.29
date	2003.09.16.20.15.49;	author skumar2;	state Exp;
branches;
next	1.28;

1.28
date	2003.08.30.02.42.30;	author olawlor;	state Exp;
branches;
next	1.27;

1.27
date	2003.07.18.03.17.12;	author olawlor;	state Exp;
branches;
next	1.26;

1.26
date	2003.04.09.18.50.10;	author jbooth;	state Exp;
branches;
next	1.25;

1.25
date	2003.03.27.16.21.38;	author olawlor;	state Exp;
branches;
next	1.24;

1.24
date	2003.01.20.20.38.29;	author olawlor;	state Exp;
branches;
next	1.23;

1.23
date	2002.12.11.22.30.00;	author jbooth;	state Exp;
branches;
next	1.22;

1.22
date	2002.09.04.23.45.26;	author olawlor;	state Exp;
branches;
next	1.21;

1.21
date	2002.08.02.00.09.35;	author cheelee;	state Exp;
branches;
next	1.20;

1.20
date	2002.06.26.03.07.12;	author gzheng;	state Exp;
branches;
next	1.19;

1.19
date	2002.06.15.22.29.37;	author olawlor;	state Exp;
branches;
next	1.18;

1.18
date	2001.12.16.23.18.34;	author gzheng;	state Exp;
branches;
next	1.17;

1.17
date	2001.12.06.23.18.16;	author olawlor;	state Exp;
branches;
next	1.16;

1.16
date	2001.08.17.01.35.15;	author milind;	state Exp;
branches;
next	1.15;

1.15
date	2001.07.23.16.07.01;	author olawlor;	state Exp;
branches;
next	1.14;

1.14
date	2001.05.25.09.47.27;	author milind;	state Exp;
branches;
next	1.13;

1.13
date	2001.05.22.22.08.07;	author pnarula;	state Exp;
branches;
next	1.12;

1.12
date	2000.08.31.22.02.40;	author milind;	state Exp;
branches;
next	1.11;

1.11
date	2000.07.24.19.05.07;	author milind;	state Exp;
branches;
next	1.10;

1.10
date	2000.07.17.14.36.09;	author milind;	state Exp;
branches;
next	1.9;

1.9
date	2000.07.13.21.29.15;	author milind;	state Exp;
branches;
next	1.8;

1.8
date	2000.06.29.05.31.56;	author milind;	state Exp;
branches;
next	1.7;

1.7
date	2000.06.26.07.29.44;	author milind;	state Exp;
branches;
next	1.6;

1.6
date	2000.06.16.20.22.10;	author milind;	state Exp;
branches;
next	1.5;

1.5
date	2000.06.14.20.03.43;	author milind;	state Exp;
branches;
next	1.4;

1.4
date	2000.06.13.22.38.39;	author milind;	state Exp;
branches;
next	1.3;

1.3
date	2000.06.13.22.11.12;	author milind;	state Exp;
branches;
next	1.2;

1.2
date	99.06.18.13.31.37;	author milind;	state Exp;
branches;
next	1.1;

1.1
date	99.06.18.13.27.10;	author milind;	state Exp;
branches;
next	;


desc
@@


1.47
log
@Added module CkCache to charm and to the default build.
This module is taken from ChaNGa's original CacheManager after being generalized.
@
text
@CHARMC=../../bin/charmc $(OPTS)
CHARMINC=.
DIRS=   sparseContiguousReducer tcharm ampi idxl parmetis \
        multiphaseSharedArrays fem ifem ParFUM \
        armci collide mblock barrier cache \
	irecv netfem liveViz taskGraph search datatransfer pythonCCS

.PHONY: $(DIRS)

all:  $(DIRS)

cache:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

sparseContiguousReducer:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

tcharm:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

ampi:  tcharm
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

idxl:  ampi
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

parmetis: ampi
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

multiphaseSharedArrays:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

fem:  idxl ampi parmetis
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

ParFUM:	idxl ampi parmetis collide multiphaseSharedArrays
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

ParFUM-Tops: ParFUM
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

ifem: fem
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

armci: ampi
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

collide: tcharm
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

mblock: tcharm
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

barrier:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

irecv:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

netfem: tcharm
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

liveViz:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

taskGraph:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

search:
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

datatransfer: ampi fem
	$(MAKE) -C $@@ all OPTS='$(OPTS)'

pythonCCS:
	-(CHARMINC=../../../include;. $$CHARMINC/conv-config.sh; \
	if test "$$CMK_BUILD_PYTHON" != ""; then ($(MAKE) -C $@@ all OPTS='$(OPTS)' || exit 1); fi)


clean:
	for d in $(DIRS); do (cd $$d && make clean OPTS='$(OPTS)'); done
@


1.46
log
@added ParFUM dependency on msa, added ParFUM-Tops to LIBS
@
text
@d5 1
a5 1
        armci collide mblock barrier \
d12 3
@


1.45
log
@Fixing some dependencies.
@
text
@d33 4
a36 1
ParFUM:	idxl ampi parmetis collide
@


1.44
log
@fixed module depencies
@
text
@d39 1
a39 1
armci: tcharm ampi
d54 1
a54 1
netfem:
@


1.43
log
@more accurate make dependency for parallel make
@
text
@d42 1
a42 1
collide:
d45 1
a45 1
mblock:
@


1.42
log
@rewrote for better dependence support.
@
text
@d21 1
a21 1
idxl:
d36 1
a36 1
ifem:
d39 1
a39 1
armci:
d66 1
a66 1
datatransfer:
@


1.41
log
@Forgot one dependency for ParFUM
@
text
@d3 2
a4 1
DIRS=sparseContiguousReducer tcharm ampi idxl parmetis multiphaseSharedArrays fem ifem ParFUM \
d6 1
a6 1
	multicast irecv netfem liveViz taskGraph search datatransfer
d8 3
a10 4
all:  
	for d in $(DIRS); do (cd $$d && $(MAKE) all OPTS='$(OPTS)' || exit 1) || exit 1; done
	-(CHARMINC=../../../include;. $$CHARMINC/conv-config.sh; \
	if test "$$CMK_BUILD_PYTHON" != ""; then (cd pythonCCS && $(MAKE) all OPTS='$(OPTS)' || exit 1); fi)
d12 2
a13 2
idxl:
	(cd idxl; $(MAKE) all OPTS='$(OPTS)')
d16 1
a16 1
	(cd tcharm; $(MAKE) all OPTS='$(OPTS)')
d19 4
a22 1
	(cd ampi; $(MAKE) all OPTS='$(OPTS)')
d25 4
a28 1
	(cd parmetis; $(MAKE) all OPTS='$(OPTS)')
d31 1
a31 1
	(cd fem; $(MAKE) all OPTS='$(OPTS)')
d34 38
a71 1
	(cd ParFUM; $(MAKE) all OPTS='$(OPTS)')
a72 2
python:
	(cd pythonCCS; $(MAKE) all OPTS='$(OPTS)')
@


1.40
log
@Added ParFUM to be built when make is issued in cklibs.
@
text
@d27 1
a27 1
ParFUM:	idxl ampi parmetis
@


1.39
log
@update on python compilation
@
text
@d3 1
a3 1
DIRS=sparseContiguousReducer tcharm ampi idxl parmetis multiphaseSharedArrays fem ifem \
d27 3
@


1.38
log
@Correct broken python build command, which:
  1.) Fails completely if python is disabled (test doesn't succeed, leaves
nonzero return code)
  2.) Doesn't work on non-gnu "test" (== not portable, use =)
@
text
@d10 1
a10 1
	if test "$$CMK_BUILD_PYTHON" = "1"; then (cd pythonCCS && $(MAKE) all OPTS='$(OPTS)' || exit 1); fi)
@


1.37
log
@added pythonCCS interface to LIBS autobuild
@
text
@d9 2
a10 2
	(CHARMINC=../../../include;. ../../../include/conv-config.sh; \
	if test "$$CMK_BUILD_PYTHON" == "1"; then (cd pythonCCS && $(MAKE) all OPTS='$(OPTS)' || exit 1); fi)
@


1.36
log
@Redo change overwritten by Sayantan: don't build liveViz3d
by default (yet).
@
text
@d2 1
d9 2
d27 3
@


1.35
log
@included parmetis and multiphasedsharedarrays in the dirs of the makefile
@
text
@d4 1
a4 1
	multicast irecv netfem liveViz liveViz3d taskGraph search datatransfer
@


1.34
log
@Remove liveViz3d from default build, until the new version
is fully stablized.
@
text
@d2 3
a4 3
DIRS=sparseContiguousReducer tcharm ampi idxl fem ifem \
        armci collide mblock barrier multiphaseSharedArrays \
	multicast irecv netfem liveViz taskGraph search datatransfer
d18 4
a21 1
fem:  idxl ampi
@


1.33
log
@removing commlib from libs/ck-libs
@
text
@d4 1
a4 1
	multicast irecv netfem liveViz liveViz3d taskGraph search datatransfer
@


1.32
log
@Initial checkin of multiphase shared arrays.
@
text
@d2 1
a2 1
DIRS=commlib sparseContiguousReducer tcharm ampi idxl fem ifem \
@


1.31
log
@small changes for parallel make
@
text
@d3 1
a3 1
        armci collide mblock barrier \
d11 1
a11 1
	
@


1.30
log
@taking fftlib because it depends on the installation of the fftw library.
@
text
@d1 1
a4 1
CHARMC=../../bin/charmc $(OPTS)
d6 14
a19 2
all:
	for d in $(DIRS); do (cd $$d && make all OPTS='$(OPTS)' || exit 1) || exit 1; done
@


1.29
log
@Adding fftlib and sparseContiguousReducer to the cklibs Makefile
@
text
@d1 1
a1 1
DIRS=commlib fftlib sparseContiguousReducer tcharm ampi idxl fem ifem \
@


1.28
log
@Add datatransfer library to the set of built libraries.
@
text
@d1 2
a2 1
DIRS=commlib tcharm ampi idxl fem ifem armci collide mblock barrier \
@


1.27
log
@Build ampi before fem framework.
@
text
@d2 1
a2 1
	multicast irecv netfem liveViz liveViz3d taskGraph search
@


1.26
log
@Added search library into the list of targets to be built.
@
text
@d1 1
a1 1
DIRS=commlib tcharm idxl fem ampi ifem armci collide mblock barrier \
@


1.25
log
@Added commlib to list of libraries (since AMPI now depends on it),
and reordered build list a bit more sensibly (important stuff first).
@
text
@d2 1
a2 1
	multicast irecv netfem liveViz liveViz3d taskGraph
@


1.24
log
@Added idxl and ifem libraries.
@
text
@d1 2
a2 2
DIRS=tcharm armci collide netfem idxl fem ifem ampi mblock barrier \
	multicast irecv liveViz liveViz3d taskGraph
@


1.23
log
@Added taskGraph library to the makefile.
@
text
@d1 1
a1 1
DIRS=tcharm armci collide netfem fem ampi mblock barrier \
@


1.22
log
@Build liveViz3d library.
@
text
@d2 1
a2 1
	multicast irecv liveViz liveViz3d
@


1.21
log
@Added armci "skeleton" library and example test program.
@
text
@d1 2
a2 1
DIRS=tcharm armci collide netfem fem ampi mblock barrier multicast irecv liveViz
@


1.20
log
@fix when trap in a infinite loop when a directory is missing.
@
text
@d1 1
a1 1
DIRS=tcharm collide netfem fem ampi mblock barrier multicast irecv liveViz
@


1.19
log
@Changed to "for d in $(DIRS)" style, and added liveViz.
@
text
@d5 1
a5 1
	for d in $(DIRS); do (cd $$d; make all OPTS='$(OPTS)' || exit 1) || exit 1; done
d8 1
a8 1
	for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
@


1.18
log
@add multicast in Makefile.
@
text
@d1 1
d5 1
a5 9
	cd tcharm; make all OPTS='$(OPTS)'
	cd collide; make all OPTS='$(OPTS)'
	cd netfem; make all OPTS='$(OPTS)'
	cd fem; make all OPTS='$(OPTS)'
	cd ampi; make all OPTS='$(OPTS)'
	cd mblock; make all OPTS='$(OPTS)'
	cd barrier; make all OPTS='$(OPTS)'
	cd multicast; make all OPTS='$(OPTS)'
	cd irecv; make all OPTS='$(OPTS)'
d8 1
a8 11
	cd tcharm; make clean
	cd collide; make clean
	cd netfem; make clean
	cd fem; make clean
	cd ampi; make clean
	cd amr; make clean
	cd mblock; make clean
	cd barrier; make clean
	cd multicast; make clean
	cd irecv; make clean

@


1.17
log
@Added new libraries: tcharm, ampi, netfem
@
text
@d11 1
d23 1
@


1.16
log
@Added the first version (completely untested) of mblock framework.
@
text
@d4 1
a4 2
	cd barrier; make all OPTS='$(OPTS)'
	cd irecv; make all OPTS='$(OPTS)'
d6 1
d8 1
d10 2
d14 3
a16 2
	cd barrier; make clean
	cd irecv; make clean
d18 1
a18 1
	cd collide; make clean
d21 2
@


1.15
log
@Added collision library.
@
text
@d8 1
d16 1
@


1.14
log
@1. Renamed pup_* fortran functions to fpup_* because on IBM-SP, the f90 version
does not have an underscore appended to the name. So, C and f90 versions
would clash.
2. Since AMR requires a dfferent arrayindex_maxlen, made it compile only when
AMR is the build target. Otherwise it would compile everytime libs are needed.
Switched the #warning back to #error, since #warning is not supported on all
cpp's.
3. Added xlf90 library to the charmc link line for mpi-sp.
4. Regularized fortran name mangling in all f90 interfaces required for AMPI.
@
text
@d6 1
d13 1
@


1.13
log
@Added AMR directory.
@
text
@a6 1
	cd amr; make all OPTS='$(OPTS)'
@


1.12
log
@Completed integration of documentation into charm cvs tree.
Added appropriate targets for super-install for making different types
(ps, pdf, html) of documentation.
@
text
@d7 1
d13 1
@


1.11
log
@Added a target for-namd, that makes charm++, pvm and ampic. Also, split
ampi into ampic and ampif, so that lack of fortran compilers is no
deterrent for using namd. Removed gathering of sources into arch/src
and arch/libsrc, as they tend to confuse people that the binary
distribution is actually a source distrib.
@
text
@d7 6
@


1.10
log
@SUPER_INSTALL now takes "-*" arguments prior to the target, that will
be passed to make as "makeflags". This makes it easy to suppress
make's output of commands etc (with the -s flag). As a result of this,
several Makefiles have been massaged.
@
text
@d6 1
a6 1
	cd fem; make -k all OPTS='$(OPTS)'
@


1.9
log
@Made correct compilation of fem library optional, because it depends of f90.
@
text
@d4 3
a6 6
	@@echo 'building barrier library...'
	@@cd barrier; make all OPTS='$(OPTS)'
	@@echo 'building irecv library...'
	@@cd irecv; make all OPTS='$(OPTS)'
	@@echo 'building fem library...'
	@@cd fem; make -k all OPTS='$(OPTS)'
@


1.8
log
@made make silent.
@
text
@d9 1
a9 1
	@@cd fem; make all OPTS='$(OPTS)'
@


1.7
log
@Checked that FEM framework compiles under xlC, and then uncommented
the command from the Makefile to build the fem framework.
@
text
@d4 6
a9 3
	cd barrier; make all OPTS='$(OPTS)'
	cd irecv; make all OPTS='$(OPTS)'
	cd fem; make all OPTS='$(OPTS)'
@


1.6
log
@Turned off FEM compilation because it fails on blue-horizon.
@
text
@d6 1
a6 1
	#cd fem; make all OPTS='$(OPTS)'
@


1.5
log
@Added the threaded FEM Framework.
@
text
@d6 1
a6 1
	cd fem; make all OPTS='$(OPTS)'
@


1.4
log
@Fixed the target all to make irecv and barrier, no matter what.
@
text
@d6 1
a6 1

@


1.3
log
@Reorganized libs directory by moving irecv and barrier libraries under
ck-libs, and removing the top-level directories for each of these.
@
text
@d3 1
a3 3
all: barrier irecv

barrier:
a4 2

irecv:
@


1.2
log
@Added an overall makefile, and included charmc path in each Makefile.
@
text
@d1 9
a9 1
CHARMC=../../../bin/charmc $(OPTS)
a10 2
all:
	echo 'Nothing to do here right now'
@


1.1
log
@Added dummy Makefiles for all libs.
@
text
@d1 2
@

