From 6f629b74f018293add19aa590f04a85e46bebfba Mon Sep 17 00:00:00 2001
From: Mikael Djurfeldt <mikael@djurfeldt.com>
Date: Tue, 19 Jul 2022 20:41:33 +0200
Subject: [PATCH] Convert C++ types to C types
---
examples/waveconsumer.cc | 2 +-
examples/waveproducer.cc | 4 ++--
src/connector.cc | 14 ++++++++------
src/multibuffer.cc | 6 +++---
src/music/subconnector.hh | 6 +++---
src/sampler.cc | 4 ++--
src/subconnector.cc | 16 ++++++++--------
testsuite/sanitytests/clocksource.cc | 2 +-
testsuite/sanitytests/constsource.cc | 2 +-
testsuite/sanitytests/contdelay.cc | 6 +++---
utils/contsink.cc | 2 +-
utils/eventlogger.cc | 2 +-
12 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/examples/waveconsumer.cc b/examples/waveconsumer.cc
index 2f753bd..96ce824 100644
--- a/examples/waveconsumer.cc
+++ b/examples/waveconsumer.cc
@@ -36,7 +36,7 @@ main (int args, char* argv[])
// Declare where in memory to put data
MUSIC::ArrayData dmap (data,
- MPI::DOUBLE,
+ MPI_DOUBLE,
rank * nLocalVars,
nLocalVars);
wavedata->map (&dmap);
diff --git a/examples/waveproducer.cc b/examples/waveproducer.cc
index da57d39..5f0e085 100644
--- a/examples/waveproducer.cc
+++ b/examples/waveproducer.cc
@@ -32,7 +32,7 @@ main (int argc, char* argv[])
// Declare what data we have to export
MUSIC::ArrayData dmap (data,
- MPI::DOUBLE,
+ MPI_DOUBLE,
rank * nLocalVars,
nLocalVars);
wavedata->map (&dmap);
@@ -55,7 +55,7 @@ main (int argc, char* argv[])
}
// Broadcast these data out to all nodes
- MPI_Bcast (data, nLocalVars, MPI::DOUBLE, 0, comm);
+ MPI_Bcast (data, nLocalVars, MPI_DOUBLE, 0, comm);
}
runtime->finalize ();
diff --git a/src/connector.cc b/src/connector.cc
index 45e93ea..94c7d7c 100644
--- a/src/connector.cc
+++ b/src/connector.cc
@@ -213,11 +213,13 @@ namespace MUSIC {
void
OutputConnector::tick ()
{
- std::vector<MPI::Request>requests;
- for (std::vector<Subconnector*>::iterator s = rsubconn.begin (); s != rsubconn.end ();
- ++s){
- (*s)->maybeCommunicate(requests);
- }
+ std::vector<MPI_Request> requests;
+ for (std::vector<Subconnector*>::iterator s = rsubconn.begin ();
+ s != rsubconn.end ();
+ ++s)
+ {
+ (*s)->maybeCommunicate (requests);
+ }
//The spec guarantees vectors store their elements contiguously:
MPI_Waitall(requests.size(), (MPI_Request *)&requests[0], MPI_STATUSES_IGNORE);
}
@@ -745,7 +747,7 @@ error( "LOCAL Indices are not supported with MUSIC_ANYSOURCE");
EventInputConnector::tick ()
{
//SPIKE_BUFFER_MAX size
- //MPI::BYTE type
+ //MPI_BYTE type
//SPIKE_MSG tag
int size = rsubconn.size();
char data[SPIKE_BUFFER_MAX];
diff --git a/src/multibuffer.cc b/src/multibuffer.cc
index 2d4c274..334ef62 100644
--- a/src/multibuffer.cc
+++ b/src/multibuffer.cc
@@ -56,7 +56,7 @@ namespace MUSIC {
setupRankMap (mpi_get_rank (comm), rankMap);
#if 0
std::ostringstream ostr;
- ostr << "Rank " << mpi_get_rank (MPI::COMM_WORLD) << ": rankMap ";
+ ostr << "Rank " << mpi_get_rank (MPI_COMM_WORLD) << ": rankMap ";
for (RankMap::iterator i = rankMap->begin ();
i != rankMap->end ();
++i)
@@ -190,7 +190,7 @@ namespace MUSIC {
#if 0
{
std::ostringstream ostr;
- ostr << "Rank " << mpi_get_rank (MPI::COMM_WORLD) << ": block_ ranks ";
+ ostr << "Rank " << mpi_get_rank (MPI_COMM_WORLD) << ": block_ ranks ";
for (Blocks::iterator b = block_.begin (); b != block_.end (); ++b)
ostr << b->rank () << ' ';
std::cout << ostr.str () << std::endl;
@@ -300,7 +300,7 @@ namespace MUSIC {
// compute required total size
unsigned int summedSize = 0;
unsigned int thisRankSize = 0;
- int thisRank = mpi_get_rank (MPI::COMM_WORLD);
+ int thisRank = mpi_get_rank (MPI_COMM_WORLD);
for (Blocks::iterator b = block_.begin (); b != block_.end (); ++b)
{
unsigned int size;
diff --git a/src/music/subconnector.hh b/src/music/subconnector.hh
index 545ea4d..65fae87 100644
--- a/src/music/subconnector.hh
+++ b/src/music/subconnector.hh
@@ -59,7 +59,7 @@ namespace MUSIC {
public:
//*fixme* should not create subconnectors with uninitialized members
- Subconnector ():type_(MPI::BYTE), flushed(false){};
+ Subconnector () : type_ (MPI_BYTE), flushed (false) {};
Subconnector (MPI_Datatype type):type_ (type), flushed(false) { }
Subconnector (MPI_Datatype type,
MPI_Comm intercomm,
@@ -172,10 +172,10 @@ namespace MUSIC {
int remoteRank,
int receiverPortCode);
void maybeCommunicate ();
- void maybeCommunicate (std::vector<MPI::Request> &);
+ void maybeCommunicate (std::vector<MPI_Request> &);
void send ();
- void send (std::vector<MPI::Request> &);
+ void send (std::vector<MPI_Request> &);
void flush (bool& dataStillFlowing);
};
diff --git a/src/sampler.cc b/src/sampler.cc
index dead797..b274989 100644
--- a/src/sampler.cc
+++ b/src/sampler.cc
@@ -188,10 +188,10 @@ namespace MUSIC {
{
int localIndex = i->begin () - i->local ();
int iSize = i->end () - i->begin ();
- if (dataMap->type () == MPI::DOUBLE)
+ if (dataMap->type () == MPI_DOUBLE)
interpolate (pos, iSize, interpolationCoefficient,
static_cast<double*> (dataMap->base ()) + localIndex);
- else if (dataMap->type () == MPI::FLOAT)
+ else if (dataMap->type () == MPI_FLOAT)
interpolate (pos, iSize, interpolationCoefficient,
static_cast<float*> (dataMap->base ()) + localIndex);
else
diff --git a/src/subconnector.cc b/src/subconnector.cc
index 51b7e4f..3d24305 100644
--- a/src/subconnector.cc
+++ b/src/subconnector.cc
@@ -248,7 +248,7 @@ namespace MUSIC {
int remoteLeader,
int remoteRank,
int receiverPortCode)
- : Subconnector (MPI::BYTE,
+ : Subconnector (MPI_BYTE,
intercomm,
remoteLeader,
remoteRank,
@@ -267,14 +267,14 @@ namespace MUSIC {
void
- EventOutputSubconnector::maybeCommunicate (std::vector<MPI::Request> &requests)
+ EventOutputSubconnector::maybeCommunicate (std::vector<MPI_Request> &requests)
{
send (requests);
}
void
- EventOutputSubconnector::send (std::vector<MPI::Request> &requests)
+ EventOutputSubconnector::send (std::vector<MPI_Request> &requests)
{
MUSIC_LOGRE ("ISend");
void* data;
@@ -355,7 +355,7 @@ namespace MUSIC {
int remoteRank,
int receiverRank,
int receiverPortCode)
- : Subconnector (MPI::BYTE,
+ : Subconnector (MPI_BYTE,
intercomm,
remoteLeader,
remoteRank,
@@ -374,7 +374,7 @@ namespace MUSIC {
int receiverRank,
int receiverPortCode,
EventHandlerGlobalIndex* eh)
- : Subconnector (MPI::BYTE,
+ : Subconnector (MPI_BYTE,
intercomm,
remoteLeader,
remoteRank,
@@ -405,7 +405,7 @@ namespace MUSIC {
int receiverRank,
int receiverPortCode,
EventHandlerLocalIndex* eh)
- : Subconnector (MPI::BYTE,
+ : Subconnector (MPI_BYTE,
intercomm,
remoteLeader,
remoteRank,
@@ -584,7 +584,7 @@ namespace MUSIC {
int remoteRank,
int receiverPortCode,
FIBO* buffer)
- : Subconnector (MPI::BYTE,
+ : Subconnector (MPI_BYTE,
intercomm,
remoteLeader,
remoteRank,
@@ -653,7 +653,7 @@ namespace MUSIC {
int receiverRank,
int receiverPortCode,
MessageHandler* mh)
- : Subconnector (MPI::BYTE,
+ : Subconnector (MPI_BYTE,
intercomm,
remoteLeader,
remoteRank,
diff --git a/testsuite/sanitytests/clocksource.cc b/testsuite/sanitytests/clocksource.cc
index 4366655..0e2d729 100644
--- a/testsuite/sanitytests/clocksource.cc
+++ b/testsuite/sanitytests/clocksource.cc
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
MUSIC::ArrayData dmap (dataarray,
- MPI::DOUBLE,
+ MPI_DOUBLE,
0,
1);
diff --git a/testsuite/sanitytests/constsource.cc b/testsuite/sanitytests/constsource.cc
index 0d86847..e535882 100644
--- a/testsuite/sanitytests/constsource.cc
+++ b/testsuite/sanitytests/constsource.cc
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
MUSIC::ArrayData dmap (dataarray,
- MPI::DOUBLE,
+ MPI_DOUBLE,
rank * localWidth,
myWidth);
diff --git a/testsuite/sanitytests/contdelay.cc b/testsuite/sanitytests/contdelay.cc
index 3010c4b..9b415e1 100644
--- a/testsuite/sanitytests/contdelay.cc
+++ b/testsuite/sanitytests/contdelay.cc
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
}
MUSIC::ArrayData inMap (&inData,
- MPI::DOUBLE,
+ MPI_DOUBLE,
0,
1);
in->map (&inMap, delay, maxbuffered);
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
}
MUSIC::ArrayData outMap (&outData,
- MPI::DOUBLE,
+ MPI_DOUBLE,
0,
1);
out->map (&outMap, maxbuffered);
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
if (aux->isConnected ())
{
MUSIC::ArrayData auxMap (&auxData,
- MPI::DOUBLE,
+ MPI_DOUBLE,
0,
1);
aux->map (&auxMap, delay, maxbuffered);
diff --git a/utils/contsink.cc b/utils/contsink.cc
index e3da7bd..ab916aa 100644
--- a/utils/contsink.cc
+++ b/utils/contsink.cc
@@ -111,7 +111,7 @@ main (int argc, char* argv[])
// Declare where in memory to put data
MUSIC::ArrayData dmap (data,
- MPI::DOUBLE,
+ MPI_DOUBLE,
rank * localWidth,
myWidth);
contdata->map (&dmap, delay, interpolate);
diff --git a/utils/eventlogger.cc b/utils/eventlogger.cc
index 33ceed5..c8532d1 100644
--- a/utils/eventlogger.cc
+++ b/utils/eventlogger.cc
@@ -10,7 +10,7 @@ extern "C" {
const double DEFAULT_TIMESTEP = 0.01;
-MPI::Intracomm comm;
+MPI_Comm comm;
void
usage (int rank)
--
GitLab