[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Introduce POOMA_MESSAGING
|
From: |
Richard Guenther |
|
Subject: |
[PATCH] Introduce POOMA_MESSAGING |
|
Date: |
Thu, 18 Dec 2003 20:50:05 +0100 (CET) |
Hi!
This patch introduces POOMA_MESSAGING which is set for both Cheetah and in
future native MPI. It also mechanically changes POOMA_CHEETAH to
POOMA_MESSAGING tests, where appropriate. Also including of
Cheetah/Cheetah.h is exchanged for including Tulip/Messaging.h (which in
turn includes Cheetah/Cheetah.h and will include mpi.h for native MPI).
Ok?
Richard.
2003Dec18 Richard Guenther <address@hidden>
* configure: add POOMA_MESSAGING define, if Cheetah is configured.
src/Domain/Grid.h: change #if POOMA_CHEETAH to #if POOMA_MESSAGING
where appropriate, #include Tulip/Messaging.h rather than
Cheetah/Cheetah.h.
src/Engine/RemoteDynamicEngine.h: likewise.
src/Engine/RemoteEngine.h: likewise.
src/Engine/tests/dynamiclayout_test1.cpp: likewise.
src/Engine/tests/makeOwnCopy.cpp: likewise.
src/Engine/tests/remoteDynamicTest1.cpp: likewise.
src/Field/tests/ExpressionTest.cpp: likewise.
src/Field/tests/FieldTour1.cpp: likewise.
src/Field/tests/Gradient.cpp: likewise.
src/Field/tests/LocalPatch.cpp: likewise.
src/Field/tests/OffsetReduction.cpp: likewise.
src/Field/tests/ScalarCode.cpp: likewise.
src/Field/tests/StencilTests.cpp: likewise.
src/Field/tests/VectorTest.cpp: likewise.
src/Field/tests/WhereTest.cpp: likewise.
src/IO/tests/FileSetWriterTest1.cpp: likewise.
src/IO/tests/FileSetWriterTest2.cpp: likewise.
src/Particles/Attribute.h: likewise.
src/Particles/Attribute.h: likewise.
src/Particles/AttributeWrapper.h: likewise.
src/Particles/PatchSwapLayout.h: likewise.
src/Particles/tests/attributelist.cpp: likewise.
src/Particles/tests/bclist.cpp: likewise.
src/Particles/tests/bctest1.cpp: likewise.
src/Particles/tests/bctest2.cpp: likewise.
src/Particles/tests/bctest3.cpp: likewise.
src/Particles/tests/destroy.cpp: likewise.
src/Particles/tests/interpolate.cpp: likewise.
src/Particles/tests/particle_bench1.cpp: likewise.
src/Particles/tests/particle_bench2.cpp: likewise.
src/Particles/tests/particle_bench3.cpp: likewise.
src/Particles/tests/particle_bench4.cpp: likewise.
src/Particles/tests/spatial.cpp: likewise.
src/Particles/tests/uniform.cpp: likewise.
src/Pooma/Pooma.cmpl.cpp: likewise.
src/Pooma/Pooma.h: likewise.
src/Tulip/Messaging.h: likewise.
src/Tulip/PatchSizeSyncer.cmpl.cpp: likewise.
src/Tulip/tests/GridMessageTest.cpp: likewise.
src/Tulip/PatchSizeSyncer.h: likewise, remove unused declarations.
src/Tulip/tests/CollectFromContextsTest.cpp: disable parts of
the test for serial runs.
Index: configure
===================================================================
RCS file: /home/pooma/Repository/r2/configure,v
retrieving revision 1.111
diff -u -u -r1.111 configure
--- configure 5 Aug 2003 17:45:16 -0000 1.111
+++ configure 18 Dec 2003 19:30:43 -0000
@@ -403,7 +403,9 @@
$fftw_able = 0;
$fftw_default_dir = "";
-### include cheetah usage?
+### include messaging via cheetah/mpi?
+$messaging = 0;
+$mpi = 0;
$cheetah = 0;
$cheetah_able = 0;
$cheetah_arch = "";
@@ -1266,7 +1268,7 @@
}
-### figure out if we should include the CHEETAH package or not
+### figure out if we should include the CHEETAH package or MPI or nothing
sub setcheetah
{
# set $cheetah variable properly
@@ -1275,9 +1277,11 @@
$cheetah = 1;
}
print "Set cheetah = $cheetah\n" if $dbgprnt;
+ $messaging = $cheetah + $mpi;
- # add a define indicating whether CHEETAH is available, and configure
+ # add a define indicating whether CHEETAH/MPI is available, and configure
# extra options to include and define lists
+ my $defmessaging = $messaging;
my $defcheetah = 0;
if ($cheetah)
{
@@ -1311,6 +1315,7 @@
$link = $cheetah_link;
}
}
+ add_yesno_define("POOMA_MESSAGING", $defmessaging);
add_yesno_define("POOMA_CHEETAH", $defcheetah);
}
Index: src/Domain/Grid.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Domain/Grid.h,v
retrieving revision 1.17
diff -u -u -r1.17 Grid.h
--- src/Domain/Grid.h 12 Oct 2003 11:14:38 -0000 1.17
+++ src/Domain/Grid.h 18 Dec 2003 19:30:51 -0000
@@ -501,9 +501,9 @@
//
//////////////////////////////////////////////////////////////////////
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
-#include "Cheetah/Cheetah.h"
+#include "Tulip/Messaging.h"
namespace Cheetah {
@@ -559,7 +559,7 @@
} // namespace Cheetah
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
#endif // POOMA_DOMAIN_GRID_H
Index: src/Engine/RemoteDynamicEngine.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/RemoteDynamicEngine.h,v
retrieving revision 1.21
diff -u -u -r1.21 RemoteDynamicEngine.h
--- src/Engine/RemoteDynamicEngine.h 22 Oct 2003 19:38:07 -0000 1.21
+++ src/Engine/RemoteDynamicEngine.h 18 Dec 2003 19:30:55 -0000
@@ -337,8 +337,7 @@
domain_m = d;
}
- //
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
template <class Dom>
int packSize(const Dom &packList) const
@@ -758,9 +757,9 @@
}
};
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
-#include "MatchingHandler/Serialize.h"
+#include "Tulip/Messaging.h"
namespace Cheetah {
@@ -835,7 +834,7 @@
} // namespace Cheetah
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
/// checkDynamicID(obj, ID) is a specializable function that is used
/// by some classes to check the dynamic ID value stored in the first
Index: src/Engine/RemoteEngine.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/RemoteEngine.h,v
retrieving revision 1.38
diff -u -u -r1.38 RemoteEngine.h
--- src/Engine/RemoteEngine.h 21 Nov 2003 21:30:38 -0000 1.38
+++ src/Engine/RemoteEngine.h 18 Dec 2003 19:30:59 -0000
@@ -1200,9 +1200,9 @@
};
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
-#include "MatchingHandler/Serialize.h"
+#include "Tulip/Messaging.h"
struct EngineElemSerialize
{
@@ -1593,7 +1593,7 @@
} // namespace Cheetah
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
//-----------------------------------------------------------------------------
Index: src/Engine/tests/dynamiclayout_test1.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/tests/dynamiclayout_test1.cpp,v
retrieving revision 1.5
diff -u -u -r1.5 dynamiclayout_test1.cpp
--- src/Engine/tests/dynamiclayout_test1.cpp 6 Jun 2000 20:46:53 -0000
1.5
+++ src/Engine/tests/dynamiclayout_test1.cpp 18 Dec 2003 19:30:59 -0000
@@ -45,7 +45,7 @@
#include <vector>
using namespace std;
-#ifdef POOMA_CHEETAH
+#ifdef POOMA_MESSAGING
typedef MultiPatch<DynamicTag,Remote<Dynamic> > DynamicMultiPatch_t;
#else
typedef MultiPatch<DynamicTag,Dynamic> DynamicMultiPatch_t;
Index: src/Engine/tests/makeOwnCopy.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/tests/makeOwnCopy.cpp,v
retrieving revision 1.2
diff -u -u -r1.2 makeOwnCopy.cpp
--- src/Engine/tests/makeOwnCopy.cpp 13 May 2003 17:43:12 -0000 1.2
+++ src/Engine/tests/makeOwnCopy.cpp 18 Dec 2003 19:31:00 -0000
@@ -85,7 +85,7 @@
tester.out() << ad << bd << std::endl;
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
// Create the layouts.
@@ -121,7 +121,7 @@
tester.out() << ard << brd << std::endl;
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
int ret = tester.results("makeOwnCopy");
Pooma::finalize();
Index: src/Engine/tests/remoteDynamicTest1.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/tests/remoteDynamicTest1.cpp,v
retrieving revision 1.8
diff -u -u -r1.8 remoteDynamicTest1.cpp
--- src/Engine/tests/remoteDynamicTest1.cpp 16 May 2001 21:21:07 -0000
1.8
+++ src/Engine/tests/remoteDynamicTest1.cpp 18 Dec 2003 19:31:00 -0000
@@ -41,7 +41,7 @@
#include <iostream>
#include <vector>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
struct PackObject
{
Index: src/Field/tests/ExpressionTest.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/ExpressionTest.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 ExpressionTest.cpp
--- src/Field/tests/ExpressionTest.cpp 30 Aug 2001 01:15:18 -0000 1.1
+++ src/Field/tests/ExpressionTest.cpp 18 Dec 2003 19:31:02 -0000
@@ -57,7 +57,7 @@
#include <iostream>
#include <math.h>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
typedef Remote<CompressibleBrick> CompBrickTag_t;
Index: src/Field/tests/FieldTour1.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/FieldTour1.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 FieldTour1.cpp
--- src/Field/tests/FieldTour1.cpp 30 Aug 2001 01:15:18 -0000 1.1
+++ src/Field/tests/FieldTour1.cpp 18 Dec 2003 19:31:03 -0000
@@ -31,7 +31,7 @@
#include "Pooma/Fields.h"
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/Field/tests/Gradient.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/Gradient.cpp,v
retrieving revision 1.2
diff -u -u -r1.2 Gradient.cpp
--- src/Field/tests/Gradient.cpp 10 Feb 2003 22:13:15 -0000 1.2
+++ src/Field/tests/Gradient.cpp 18 Dec 2003 19:31:03 -0000
@@ -48,7 +48,7 @@
#include <iostream>
#include <cmath>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/Field/tests/LocalPatch.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/LocalPatch.cpp,v
retrieving revision 1.3
diff -u -u -r1.3 LocalPatch.cpp
--- src/Field/tests/LocalPatch.cpp 10 Feb 2003 22:13:15 -0000 1.3
+++ src/Field/tests/LocalPatch.cpp 18 Dec 2003 19:31:04 -0000
@@ -32,7 +32,7 @@
#include "Pooma/Fields.h"
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
typedef Remote<CompressibleBrick> CompressibleBrickTag_t;
Index: src/Field/tests/OffsetReduction.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/OffsetReduction.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 OffsetReduction.cpp
--- src/Field/tests/OffsetReduction.cpp 30 Aug 2001 01:15:18 -0000 1.1
+++ src/Field/tests/OffsetReduction.cpp 18 Dec 2003 19:31:04 -0000
@@ -50,7 +50,7 @@
#include <iostream>
#include <cmath>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/Field/tests/ScalarCode.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/ScalarCode.cpp,v
retrieving revision 1.2
diff -u -u -r1.2 ScalarCode.cpp
--- src/Field/tests/ScalarCode.cpp 14 Oct 2003 16:14:53 -0000 1.2
+++ src/Field/tests/ScalarCode.cpp 18 Dec 2003 19:31:05 -0000
@@ -42,7 +42,7 @@
#include <math.h>
#include <vector>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/Field/tests/StencilTests.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/StencilTests.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 StencilTests.cpp
--- src/Field/tests/StencilTests.cpp 30 Aug 2001 01:15:18 -0000 1.1
+++ src/Field/tests/StencilTests.cpp 18 Dec 2003 19:31:05 -0000
@@ -54,7 +54,7 @@
#include <iostream>
#include <math.h>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/Field/tests/VectorTest.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/VectorTest.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 VectorTest.cpp
--- src/Field/tests/VectorTest.cpp 30 Aug 2001 01:15:18 -0000 1.1
+++ src/Field/tests/VectorTest.cpp 18 Dec 2003 19:31:05 -0000
@@ -57,7 +57,7 @@
#include <iostream>
#include <math.h>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/Field/tests/WhereTest.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Field/tests/WhereTest.cpp,v
retrieving revision 1.3
diff -u -u -r1.3 WhereTest.cpp
--- src/Field/tests/WhereTest.cpp 21 Nov 2003 21:31:05 -0000 1.3
+++ src/Field/tests/WhereTest.cpp 18 Dec 2003 19:31:06 -0000
@@ -57,7 +57,7 @@
#include <iostream>
#include <math.h>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/IO/tests/FileSetWriterTest1.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/IO/tests/FileSetWriterTest1.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 FileSetWriterTest1.cpp
--- src/IO/tests/FileSetWriterTest1.cpp 3 Oct 2001 03:25:08 -0000 1.1
+++ src/IO/tests/FileSetWriterTest1.cpp 18 Dec 2003 19:31:07 -0000
@@ -45,7 +45,7 @@
const int dim = 3;
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/IO/tests/FileSetWriterTest2.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/IO/tests/FileSetWriterTest2.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 FileSetWriterTest2.cpp
--- src/IO/tests/FileSetWriterTest2.cpp 3 Oct 2001 03:53:32 -0000 1.1
+++ src/IO/tests/FileSetWriterTest2.cpp 18 Dec 2003 19:31:07 -0000
@@ -46,7 +46,7 @@
const int dim = 3;
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef DistributedTag LayoutTag_t;
typedef Remote<Brick> BrickTag_t;
#else
Index: src/Particles/Attribute.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/Attribute.h,v
retrieving revision 1.12
diff -u -u -r1.12 Attribute.h
--- src/Particles/Attribute.h 26 Oct 2003 12:27:36 -0000 1.12
+++ src/Particles/Attribute.h 18 Dec 2003 19:31:07 -0000
@@ -127,7 +127,7 @@
*/
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
/// packSize, pack and unpack function interface for particle swapping
@@ -135,7 +135,7 @@
virtual int pack(int, const IndirectionList<int> &, char *) const = 0;
virtual int unpack(int, const Interval<1> &, char *) = 0;
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
};
Index: src/Particles/AttributeWrapper.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/AttributeWrapper.h,v
retrieving revision 1.13
diff -u -u -r1.13 AttributeWrapper.h
--- src/Particles/AttributeWrapper.h 26 Oct 2003 12:27:36 -0000 1.13
+++ src/Particles/AttributeWrapper.h 18 Dec 2003 19:31:08 -0000
@@ -53,8 +53,8 @@
#include "Utilities/Inform.h"
#include "Utilities/PAssert.h"
-#if POOMA_CHEETAH
-#include "MatchingHandler/Serialize.h"
+#if POOMA_MESSAGING
+#include "Tulip/Messaging.h"
#endif
#include <iostream>
@@ -171,7 +171,7 @@
*/
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
// packSize, pack and unpack functions for particle swapping
@@ -193,7 +193,7 @@
return array().engine().localPatch(pid).unpack(dom,buffer);
}
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
private:
// The object that we're wrapping
Index: src/Particles/PatchSwapLayout.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/PatchSwapLayout.h,v
retrieving revision 1.19
diff -u -u -r1.19 PatchSwapLayout.h
--- src/Particles/PatchSwapLayout.h 26 Oct 2003 12:27:36 -0000 1.19
+++ src/Particles/PatchSwapLayout.h 18 Dec 2003 19:31:10 -0000
@@ -719,9 +719,9 @@
};
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
-#include "MatchingHandler/Serialize.h"
+#include "Tulip/Messaging.h"
//-----------------------------------------------------------------------------
//
@@ -901,7 +901,7 @@
patchInfo(pack->patchID_m).msgReceived() += 1;
}
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
// Include out-of-line definitions
Index: src/Particles/tests/attributelist.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/attributelist.cpp,v
retrieving revision 1.10
diff -u -u -r1.10 attributelist.cpp
--- src/Particles/tests/attributelist.cpp 9 Jun 2000 00:41:53 -0000
1.10
+++ src/Particles/tests/attributelist.cpp 18 Dec 2003 19:31:10 -0000
@@ -61,7 +61,7 @@
int blocks = 4;
DynamicLayout layout(D,blocks);
tester.out() << "DynamicLayout object:\n" << layout << std::endl;
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > EngineTag_t;
#else
typedef MultiPatch<DynamicTag,Dynamic> EngineTag_t;
Index: src/Particles/tests/bclist.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/bclist.cpp,v
retrieving revision 1.5
diff -u -u -r1.5 bclist.cpp
--- src/Particles/tests/bclist.cpp 9 Jun 2000 00:41:53 -0000 1.5
+++ src/Particles/tests/bclist.cpp 18 Dec 2003 19:31:11 -0000
@@ -65,7 +65,7 @@
Interval<1> D(10);
int blocks = 4;
DynamicLayout layout(D,blocks);
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > EngineTag_t;
#else
typedef MultiPatch<DynamicTag,Dynamic> EngineTag_t;
Index: src/Particles/tests/bctest1.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/bctest1.cpp,v
retrieving revision 1.7
diff -u -u -r1.7 bctest1.cpp
--- src/Particles/tests/bctest1.cpp 11 Sep 2001 00:27:29 -0000 1.7
+++ src/Particles/tests/bctest1.cpp 18 Dec 2003 19:31:11 -0000
@@ -52,7 +52,7 @@
#include <cfloat>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > EngineTag_t;
#else
typedef MultiPatch<DynamicTag,Dynamic> EngineTag_t;
Index: src/Particles/tests/bctest2.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/bctest2.cpp,v
retrieving revision 1.8
diff -u -u -r1.8 bctest2.cpp
--- src/Particles/tests/bctest2.cpp 11 Sep 2001 00:27:29 -0000 1.8
+++ src/Particles/tests/bctest2.cpp 18 Dec 2003 19:31:11 -0000
@@ -52,7 +52,7 @@
#include <iostream>
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > EngineTag_t;
#else
typedef MultiPatch<DynamicTag,Dynamic> EngineTag_t;
Index: src/Particles/tests/bctest3.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/bctest3.cpp,v
retrieving revision 1.14
diff -u -u -r1.14 bctest3.cpp
--- src/Particles/tests/bctest3.cpp 23 Jan 2003 21:29:49 -0000 1.14
+++ src/Particles/tests/bctest3.cpp 18 Dec 2003 19:31:12 -0000
@@ -92,7 +92,7 @@
tester.out() << "Creating Particles object with DynamicArray attributes ..."
<< std::endl;
UniformLayout pl(Pooma::contexts());
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
MyParticles<MPRemoteDynamicUniform> P(pl);
#else
MyParticles<MPDynamicUniform> P(pl);
@@ -151,7 +151,7 @@
// Let's also try a KillBC on a free-standing DynamicArray.
tester.out() << "Creating a free-standing DynamicArray ..." << std::endl;
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
DynamicArray< Vector<2,int>, MultiPatch< DynamicTag, Remote<Dynamic> > > a3;
#else
DynamicArray< Vector<2,int>, MultiPatch<DynamicTag,Dynamic> > a3;
Index: src/Particles/tests/destroy.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/destroy.cpp,v
retrieving revision 1.20
diff -u -u -r1.20 destroy.cpp
--- src/Particles/tests/destroy.cpp 23 Jan 2003 21:29:49 -0000 1.20
+++ src/Particles/tests/destroy.cpp 18 Dec 2003 19:31:13 -0000
@@ -114,7 +114,7 @@
// Engine tag type for attributes
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
#else
typedef MultiPatch<DynamicTag,Dynamic> AttrEngineTag_t;
@@ -126,7 +126,7 @@
// Field type
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef Field< Mesh_t, double, MultiPatch< UniformTag, Remote<Brick> > >
Field_t;
#else
Index: src/Particles/tests/interpolate.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/interpolate.cpp,v
retrieving revision 1.20
diff -u -u -r1.20 interpolate.cpp
--- src/Particles/tests/interpolate.cpp 13 Jun 2000 00:38:21 -0000 1.20
+++ src/Particles/tests/interpolate.cpp 18 Dec 2003 19:31:14 -0000
@@ -119,7 +119,7 @@
// Engine tag type for attributes
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
#else
typedef MultiPatch<DynamicTag,Dynamic> AttrEngineTag_t;
@@ -140,7 +140,7 @@
// Field type
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef Field< Geometry_t, double, MultiPatch< UniformTag, Remote<Brick> > >
DField_t;
typedef Field< Geometry_t, Vector<PDim,double>,
Index: src/Particles/tests/particle_bench1.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/particle_bench1.cpp,v
retrieving revision 1.8
diff -u -u -r1.8 particle_bench1.cpp
--- src/Particles/tests/particle_bench1.cpp 14 Jul 2000 22:55:19 -0000
1.8
+++ src/Particles/tests/particle_bench1.cpp 18 Dec 2003 19:31:14 -0000
@@ -45,7 +45,7 @@
// Typedefs for what we are simulating here.
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
typedef MultiPatch< UniformTag, Remote<Brick> > FieldEngineTag_t;
#else
@@ -88,7 +88,7 @@
// this example, though, just the layout.
Loc<2> blocks(3, 4);
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
FieldLayout_t flayout(geometry.physicalDomain(), blocks, DistributedTag());
#else
FieldLayout_t flayout(geometry.physicalDomain(), blocks, ReplicatedTag());
Index: src/Particles/tests/particle_bench2.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/particle_bench2.cpp,v
retrieving revision 1.6
diff -u -u -r1.6 particle_bench2.cpp
--- src/Particles/tests/particle_bench2.cpp 14 Jul 2000 22:55:19 -0000
1.6
+++ src/Particles/tests/particle_bench2.cpp 18 Dec 2003 19:31:15 -0000
@@ -45,7 +45,7 @@
// Typedefs for what we are simulating here.
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
typedef MultiPatch< UniformTag, Remote<Brick> > FieldEngineTag_t;
#else
@@ -88,7 +88,7 @@
// this example, though, just the layout.
Loc<2> blocks(3, 4);
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
FieldLayout_t flayout(geometry.physicalDomain(), blocks, DistributedTag());
#else
FieldLayout_t flayout(geometry.physicalDomain(), blocks, ReplicatedTag());
Index: src/Particles/tests/particle_bench3.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/particle_bench3.cpp,v
retrieving revision 1.5
diff -u -u -r1.5 particle_bench3.cpp
--- src/Particles/tests/particle_bench3.cpp 14 Jul 2000 22:55:19 -0000
1.5
+++ src/Particles/tests/particle_bench3.cpp 18 Dec 2003 19:31:15 -0000
@@ -45,7 +45,7 @@
// Typedefs for what we are simulating here.
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
typedef MultiPatch< GridTag, Remote<Brick> > FieldEngineTag_t;
#else
@@ -88,7 +88,7 @@
// this example, though, just the layout.
Loc<2> blocks(3, 4);
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
FieldLayout_t flayout(geometry.physicalDomain(), blocks, DistributedTag());
#else
FieldLayout_t flayout(geometry.physicalDomain(), blocks, ReplicatedTag());
Index: src/Particles/tests/particle_bench4.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/particle_bench4.cpp,v
retrieving revision 1.6
diff -u -u -r1.6 particle_bench4.cpp
--- src/Particles/tests/particle_bench4.cpp 14 Jul 2000 22:55:19 -0000
1.6
+++ src/Particles/tests/particle_bench4.cpp 18 Dec 2003 19:31:15 -0000
@@ -45,7 +45,7 @@
// Typedefs for what we are simulating here.
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
typedef MultiPatch< GridTag, Remote<Brick> > FieldEngineTag_t;
#else
@@ -88,7 +88,7 @@
// this example, though, just the layout.
Loc<2> blocks(3, 4);
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
FieldLayout_t flayout(geometry.physicalDomain(), blocks, DistributedTag());
#else
FieldLayout_t flayout(geometry.physicalDomain(), blocks, ReplicatedTag());
Index: src/Particles/tests/spatial.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/spatial.cpp,v
retrieving revision 1.23
diff -u -u -r1.23 spatial.cpp
--- src/Particles/tests/spatial.cpp 23 Jan 2003 21:29:49 -0000 1.23
+++ src/Particles/tests/spatial.cpp 18 Dec 2003 19:31:16 -0000
@@ -119,7 +119,7 @@
// Engine tag type for attributes
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
#else
typedef MultiPatch<DynamicTag, Dynamic> AttrEngineTag_t;
@@ -131,7 +131,7 @@
// Field type
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef Field< Mesh_t, int, MultiPatch< UniformTag, Remote<Brick> > > Field_t;
#else
typedef Field< Mesh_t, int, MultiPatch<UniformTag,Brick> > Field_t;
Index: src/Particles/tests/uniform.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Particles/tests/uniform.cpp,v
retrieving revision 1.7
diff -u -u -r1.7 uniform.cpp
--- src/Particles/tests/uniform.cpp 23 Jan 2003 21:29:49 -0000 1.7
+++ src/Particles/tests/uniform.cpp 18 Dec 2003 19:31:16 -0000
@@ -103,7 +103,7 @@
// Engine tag type for attributes
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
typedef MultiPatch< DynamicTag, Remote<Dynamic> > AttrEngineTag_t;
#else
typedef MultiPatch<DynamicTag, Dynamic> AttrEngineTag_t;
Index: src/Pooma/Pooma.cmpl.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Pooma/Pooma.cmpl.cpp,v
retrieving revision 1.38
diff -u -u -r1.38 Pooma.cmpl.cpp
--- src/Pooma/Pooma.cmpl.cpp 11 Dec 2001 20:43:30 -0000 1.38
+++ src/Pooma/Pooma.cmpl.cpp 18 Dec 2003 19:31:18 -0000
@@ -45,8 +45,8 @@
#include <fstream>
#include <stdlib.h>
-#if POOMA_CHEETAH
-# include "Cheetah/Cheetah.h"
+#if POOMA_MESSAGING
+# include "Tulip/Messaging.h"
#endif
//-----------------------------------------------------------------------------
Index: src/Pooma/Pooma.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Pooma/Pooma.h,v
retrieving revision 1.33
diff -u -u -r1.33 Pooma.h
--- src/Pooma/Pooma.h 21 Oct 2003 20:57:27 -0000 1.33
+++ src/Pooma/Pooma.h 18 Dec 2003 19:31:19 -0000
@@ -105,9 +105,10 @@
#include "Utilities/Inform.h"
#include "Utilities/Options.h"
-#if POOMA_CHEETAH
-# include "Cheetah/Cheetah.h"
+#if POOMA_MESSAGING
+#include "Tulip/Messaging.h"
#endif
+
//-----------------------------------------------------------------------------
// Macro definitions
Index: src/Tulip/Messaging.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Tulip/Messaging.h,v
retrieving revision 1.7
diff -u -u -r1.7 Messaging.h
--- src/Tulip/Messaging.h 21 Oct 2003 18:47:59 -0000 1.7
+++ src/Tulip/Messaging.h 18 Dec 2003 19:31:20 -0000
@@ -31,8 +31,8 @@
// TagGenerator
//-----------------------------------------------------------------------------
-#ifndef POOMA_CHEETAH_MESSAGING_H
-#define POOMA_CHEETAH_MESSAGING_H
+#ifndef POOMA_TULIP_MESSAGING_H
+#define POOMA_TULIP_MESSAGING_H
/** @file
* @ingroup Tulip
@@ -118,7 +118,7 @@
};
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
namespace Cheetah {
@@ -183,7 +183,7 @@
} // namespace Cheetah
-#endif // #if POOMA_CHEETAH
+#endif // #if POOMA_MESSAGING
namespace Pooma {
@@ -222,7 +222,8 @@
{
return particleSwapHandler_g;
}
-#endif
+
+#endif // #if POOMA_CHEETAH
void initializeCheetahHelpers(int contexts);
void finalizeCheetahHelpers();
@@ -248,7 +249,7 @@
}
-#endif // POOMA_CHEETAH_MESSAGING_H
+#endif // POOMA_TULIP_MESSAGING_H
// ACL:rcsinfo
// ----------------------------------------------------------------------
Index: src/Tulip/PatchSizeSyncer.cmpl.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Tulip/PatchSizeSyncer.cmpl.cpp,v
retrieving revision 1.6
diff -u -u -r1.6 PatchSizeSyncer.cmpl.cpp
--- src/Tulip/PatchSizeSyncer.cmpl.cpp 9 Dec 2003 19:30:07 -0000 1.6
+++ src/Tulip/PatchSizeSyncer.cmpl.cpp 18 Dec 2003 19:31:20 -0000
@@ -90,7 +90,7 @@
void PatchSizeSyncer::calcGlobalGrid(Grid_t &globalGrid)
{
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
Grid<1> result;
@@ -142,11 +142,11 @@
RemoteProxy<Grid<1> > broadcast(result,0);
globalGrid = Grid<1>(broadcast.value());
-#else // POOMA_CHEETAH
+#else // !POOMA_MESSAGING
globalGrid = localGrid_m;
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
}
Index: src/Tulip/PatchSizeSyncer.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Tulip/PatchSizeSyncer.h,v
retrieving revision 1.5
diff -u -u -r1.5 PatchSizeSyncer.h
--- src/Tulip/PatchSizeSyncer.h 21 Oct 2003 18:47:59 -0000 1.5
+++ src/Tulip/PatchSizeSyncer.h 18 Dec 2003 19:31:21 -0000
@@ -96,11 +96,6 @@
void calcGlobalGrid(Grid_t &globalGrid);
- // This is passed to Cheetah and is called when incoming messages
- // are received.
-
- void receiveGrid(std::pair<int,Grid_t> &incoming);
-
private:
//============================================================
@@ -129,25 +124,12 @@
static int tag_s;
- // This is the Cheetah stuff. If we don't have Cheetah, this class should
- // work in serial (it's a no-op) without sending any messages. All
- // Cheetah stuff should compile away.
-
-#if POOMA_CHEETAH
-
- friend void Pooma::initializeCheetahHelpers(int contexts);
- friend void Pooma::finalizeCheetahHelpers();
-
- static Cheetah::MatchingHandler *handler_s;
-
-#endif // POOMA_CHEETAH
-
};
} // namespace Pooma
-#if POOMA_CHEETAH
+#if POOMA_MESSAGING
namespace Cheetah {
@@ -205,7 +187,7 @@
} // namespace Cheetah
-#endif // POOMA_CHEETAH
+#endif // POOMA_MESSAGING
#endif // POOMA_CHEETAH_PATCHSIZESYNCER_H
Index: src/Tulip/tests/CollectFromContextsTest.cpp
===================================================================
RCS file:
/home/pooma/Repository/r2/src/Tulip/tests/CollectFromContextsTest.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 CollectFromContextsTest.cpp
--- src/Tulip/tests/CollectFromContextsTest.cpp 9 Dec 2003 19:27:38 -0000
1.1
+++ src/Tulip/tests/CollectFromContextsTest.cpp 18 Dec 2003 19:31:21 -0000
@@ -60,6 +60,9 @@
tester.check("Collecting ranks", check);
}
+ // We can't do the following test on !MESSAGING, as invalid data on
+ // context 0 is not supported in this case.
+#if POOMA_MESSAGING
CollectFromContexts<int> ranks2(Pooma::context()+1, 0,
Pooma::context() > 0
&& Pooma::context() < Pooma::contexts()-1);
@@ -73,6 +76,7 @@
}
tester.check("Collecting ranks, but not first and last", check);
}
+#endif
int ret = tester.results("CollectFromContextsTest");
Pooma::finalize();
Index: src/Tulip/tests/GridMessageTest.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Tulip/tests/GridMessageTest.cpp,v
retrieving revision 1.6
diff -u -u -r1.6 GridMessageTest.cpp
--- src/Tulip/tests/GridMessageTest.cpp 21 Sep 2001 19:02:18 -0000 1.6
+++ src/Tulip/tests/GridMessageTest.cpp 18 Dec 2003 19:31:21 -0000
@@ -38,8 +38,8 @@
#include "Domain/Grid.h"
#include "Domain/Range.h"
-#if POOMA_CHEETAH
-#include "Cheetah/Cheetah.h"
+#if POOMA_MESSAGING
+#include "Tulip/Messaging.h"
#endif
#define BARRIER
- [PATCH] Introduce POOMA_MESSAGING,
Richard Guenther <=