From b8476ecb3bf2b9fc21e3937d16b65cb966c1d1ca Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>
Date: Mon, 30 Apr 2018 18:29:32 +0200
Subject: [PATCH] PPIF: remove now unused functions not taking a context object
---
parallel/ppif/MPI/ppif.cc | 90 ---------------------------------------
parallel/ppif/ppif.h | 18 --------
2 files changed, 108 deletions(-)
diff --git a/parallel/ppif/MPI/ppif.cc b/parallel/ppif/MPI/ppif.cc
index f74412555..52e2ad491 100644
--- a/parallel/ppif/MPI/ppif.cc
+++ b/parallel/ppif/MPI/ppif.cc
@@ -317,11 +317,6 @@ int PPIF::Broadcast (const PPIFContext& context, void *data, int size)
return (PPIF_SUCCESS);
}
-int PPIF::Broadcast (void *data, int size)
-{
- return Broadcast(*ppifContext(), data, size);
-}
-
int PPIF::Concentrate (const PPIFContext& context, void *data, int size)
{
if (not context.isMaster())
@@ -330,11 +325,6 @@ int PPIF::Concentrate (const PPIFContext& context, void *data, int size)
return (PPIF_SUCCESS);
}
-int PPIF::Concentrate (void *data, int size)
-{
- return Concentrate(*ppifContext(), data, size);
-}
-
int PPIF::GetConcentrate(const PPIFContext& context, int slave, void *data, int size)
{
if (slave < context.degree())
@@ -343,11 +333,6 @@ int PPIF::GetConcentrate(const PPIFContext& context, int slave, void *data, int
return (PPIF_SUCCESS);
}
-int PPIF::GetConcentrate(int slave, void *data, int size)
-{
- return GetConcentrate(*ppifContext(), slave, data, size);
-}
-
int PPIF::Spread(const PPIFContext& context, int slave, void *data, int size)
{
if (slave < context.degree())
@@ -356,11 +341,6 @@ int PPIF::Spread(const PPIFContext& context, int slave, void *data, int size)
return (PPIF_SUCCESS);
}
-int PPIF::Spread(int slave, void *data, int size)
-{
- return Spread(*ppifContext(), slave, data, size);
-}
-
int PPIF::GetSpread(const PPIFContext& context, void *data, int size)
{
if (not context.isMaster())
@@ -369,11 +349,6 @@ int PPIF::GetSpread(const PPIFContext& context, void *data, int size)
return (PPIF_SUCCESS);
}
-int PPIF::GetSpread(void *data, int size)
-{
- return GetSpread(*ppifContext(), data, size);
-}
-
int PPIF::Synchronize(const PPIFContext& context)
{
if (MPI_SUCCESS != MPI_Barrier (context.comm()) ) return (PPIF_FAILURE);
@@ -381,11 +356,6 @@ int PPIF::Synchronize(const PPIFContext& context)
return (PPIF_SUCCESS);
}
-int PPIF::Synchronize()
-{
- return Synchronize(*ppifContext());
-}
-
/****************************************************************************/
/* */
/* Synchronous communication */
@@ -397,11 +367,6 @@ VChannelPtr PPIF::ConnSync(const PPIFContext&, int p, int id)
return NewVChan(p, id);
}
-VChannelPtr PPIF::ConnSync(int p, int id)
-{
- return ConnSync(*ppifContext(), p, id);
-}
-
int PPIF::DiscSync(const PPIFContext&, VChannelPtr v)
{
DeleteVChan(v);
@@ -409,11 +374,6 @@ int PPIF::DiscSync(const PPIFContext&, VChannelPtr v)
return (0);
}
-int PPIF::DiscSync(VChannelPtr v)
-{
- return DiscSync(*ppifContext(), v);
-}
-
int PPIF::SendSync(const PPIFContext& context, VChannelPtr v, void *data, int size)
{
if (MPI_SUCCESS == MPI_Ssend (data, size, MPI_BYTE,
@@ -423,11 +383,6 @@ int PPIF::SendSync(const PPIFContext& context, VChannelPtr v, void *data, int si
return (-1);
}
-int PPIF::SendSync(VChannelPtr v, void *data, int size)
-{
- return SendSync(*ppifContext(), v, data, size);
-}
-
int PPIF::RecvSync(const PPIFContext& context, VChannelPtr v, void *data, int size)
{
int count = -1;
@@ -440,11 +395,6 @@ int PPIF::RecvSync(const PPIFContext& context, VChannelPtr v, void *data, int si
return (count);
}
-int PPIF::RecvSync(VChannelPtr v, void *data, int size)
-{
- return RecvSync(*ppifContext(), v, data, size);
-}
-
/****************************************************************************/
/* */
/* Asynchronous communication */
@@ -456,42 +406,22 @@ VChannelPtr PPIF::ConnASync(const PPIFContext&, int p, int id)
return NewVChan(p, id);
}
-VChannelPtr PPIF::ConnASync(int p, int id)
-{
- return ConnASync(*ppifContext(), p, id);
-}
-
int PPIF::InfoAConn(const PPIFContext&, VChannelPtr v)
{
return (v ? 1 : -1);
}
-int PPIF::InfoAConn(VChannelPtr v)
-{
- return InfoAConn(*ppifContext(), v);
-}
-
int PPIF::DiscASync(const PPIFContext&, VChannelPtr v)
{
DeleteVChan (v);
return (PPIF_SUCCESS);
}
-int PPIF::DiscASync(VChannelPtr v)
-{
- return DiscASync(*ppifContext(), v);
-}
-
int PPIF::InfoADisc(const PPIFContext&, VChannelPtr v)
{
return (true);
}
-int PPIF::InfoADisc(VChannelPtr v)
-{
- return InfoADisc(*ppifContext(), v);
-}
-
msgid PPIF::SendASync(const PPIFContext& context, VChannelPtr v, void *data, int size, int *error)
{
msgid m = new PPIF::Msg;
@@ -510,11 +440,6 @@ msgid PPIF::SendASync(const PPIFContext& context, VChannelPtr v, void *data, int
return NULL;
}
-msgid PPIF::SendASync(VChannelPtr v, void *data, int size, int *error)
-{
- return SendASync(*ppifContext(), v, data, size, error);
-}
-
msgid PPIF::RecvASync(const PPIFContext& context, VChannelPtr v, void *data, int size, int *error)
{
msgid m = new PPIF::Msg;
@@ -533,11 +458,6 @@ msgid PPIF::RecvASync(const PPIFContext& context, VChannelPtr v, void *data, int
return (NULL);
}
-msgid PPIF::RecvASync(VChannelPtr v, void *data, int size, int *error)
-{
- return RecvASync(*ppifContext(), v, data, size, error);
-}
-
int PPIF::InfoASend(const PPIFContext&, VChannelPtr v, msgid m)
{
int complete;
@@ -556,11 +476,6 @@ int PPIF::InfoASend(const PPIFContext&, VChannelPtr v, msgid m)
return (-1); /* return -1 for FAILURE */
}
-int PPIF::InfoASend(VChannelPtr v, msgid m)
-{
- return InfoASend(*ppifContext(), v, m);
-}
-
int PPIF::InfoARecv(const PPIFContext&, VChannelPtr v, msgid m)
{
int complete;
@@ -578,8 +493,3 @@ int PPIF::InfoARecv(const PPIFContext&, VChannelPtr v, msgid m)
return (-1); /* return -1 for FAILURE */
}
-
-int PPIF::InfoARecv(VChannelPtr v, msgid m)
-{
- return InfoARecv(*ppifContext(), v, m);
-}
diff --git a/parallel/ppif/ppif.h b/parallel/ppif/ppif.h
index abc1cee74..f8bea3b8e 100644
--- a/parallel/ppif/ppif.h
+++ b/parallel/ppif/ppif.h
@@ -94,45 +94,27 @@ int ExitPPIF (void);
/* tree oriented functions */
int Broadcast (const PPIFContext& context, void* data, int size);
-int Broadcast (void *data, int size);
int Concentrate (const PPIFContext& context, void *data, int size);
-int Concentrate (void *data, int size);
int GetConcentrate (const PPIFContext& context, int slave, void *data, int size);
-int GetConcentrate (int slave, void *data, int size);
int Spread (const PPIFContext& context, int slave, void *data, int size);
-int Spread (int slave, void *data, int size);
int GetSpread (const PPIFContext& context, void *data, int size);
-int GetSpread (void *data, int size);
int Synchronize (const PPIFContext& context);
-int Synchronize (void);
/* synchronous communication */
VChannelPtr ConnSync (const PPIFContext& context, int p, int id);
-VChannelPtr ConnSync (int p, int id);
int DiscSync (const PPIFContext& context, VChannelPtr vc);
-int DiscSync (VChannelPtr vc);
int SendSync (const PPIFContext& context, VChannelPtr vc, void *data, int size);
-int SendSync (VChannelPtr vc, void *data, int size);
int RecvSync (const PPIFContext& context, VChannelPtr vc, void *data, int size);
-int RecvSync (VChannelPtr vc, void *data, int size);
/* asynchronous communication */
VChannelPtr ConnASync (const PPIFContext& context, int p, int id);
-VChannelPtr ConnASync (int p, int id);
int DiscASync (const PPIFContext& context, VChannelPtr vc);
-int DiscASync (VChannelPtr vc);
msgid SendASync (const PPIFContext& context, VChannelPtr vc, void *data, int size, int *error);
-msgid SendASync (VChannelPtr vc, void *data, int size, int *error);
msgid RecvASync (const PPIFContext& context, VChannelPtr vc, void *data, int size, int *error);
-msgid RecvASync (VChannelPtr vc, void *data, int size, int *error);
int InfoAConn (const PPIFContext& context, VChannelPtr vc);
-int InfoAConn (VChannelPtr vc);
int InfoADisc (const PPIFContext& context, VChannelPtr vc);
-int InfoADisc (VChannelPtr vc);
int InfoASend (const PPIFContext& context, VChannelPtr vc, msgid m);
-int InfoASend (VChannelPtr vc, msgid m);
int InfoARecv (const PPIFContext& context, VChannelPtr vc, msgid m);
-int InfoARecv (VChannelPtr vc, msgid m);
} // end namespace PPIF
--
GitLab