[Debian-astro-commits] [gyoto] 68/221: yorick: rename gyoto.mpi* to gyoto.MPI_*, matching the normal C language name of the API.
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit 5a357b4860d007163f0c38dd17e2b20741863088
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Wed Oct 22 12:17:14 2014 +0200
yorick: rename gyoto.mpi* to gyoto.MPI_*, matching the normal C language name of the API.
---
yorick/check-mpi.i | 12 ++++++------
yorick/gyoto.i | 32 ++++++++++++++++----------------
yorick/gyoto_namespace.i | 8 ++++----
yorick/gyoto_utils.C | 10 +++++-----
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/yorick/check-mpi.i b/yorick/check-mpi.i
index 328228d..ed1ca88 100644
--- a/yorick/check-mpi.i
+++ b/yorick/check-mpi.i
@@ -27,15 +27,15 @@ have_mpi=haveMPI();
output, (have_mpi?" yes":" no");
doing, "Calling MPI_Initiliazed";
-if (mpiInitialized()) error, "MPI should not be initialized yet";
+if (MPI_Initialized()) error, "MPI should not be initialized yet";
done;
doing, "Calling MPI_Init";
-if (mpiInit() && have_mpi) error, "MPI INIT FAILED";
+if (MPI_Init() && have_mpi) error, "MPI INIT FAILED";
done;
doing, "Calling MPI_Initiliazed again";
-inited=mpiInitialized();
+inited=MPI_Initialized();
if (have_mpi && !inited) error, "MPI should be initialized by now";
if (!have_mpi && inited) error, "MPI should not be initializable";
done;
@@ -101,15 +101,15 @@ sc=[];
done;
doing, "Calling MPI_Finalized";
-if (mpiFinalized()) error, "MPI should not be finalized yet";
+if (MPI_Finalized()) error, "MPI should not be finalized yet";
done;
doing, "Calling MPI_Finalize";
-if (mpiFinalize() && have_mpi) error, "MPI FINALIZE FAILED";
+if (MPI_Finalize() && have_mpi) error, "MPI FINALIZE FAILED";
done;
doing, "Calling MPI_Finalized again";
-finited=mpiFinalized();
+finited=MPI_Finalized();
if (have_mpi && !finited) error, "MPI should be finalized by now";
if (!have_mpi && finited) error, "MPI should not be finalizable";
done;
diff --git a/yorick/gyoto.i b/yorick/gyoto.i
index 7b34928..c924126 100644
--- a/yorick/gyoto.i
+++ b/yorick/gyoto.i
@@ -64,11 +64,11 @@ extern gyoto_haveMPI;
OUTPUT:
HAVE_MPI=1 if compiled with MPI, else 0.
- SEE ALSO: gyoto.mpiInit, .mpiFinalize, .mpiInitialized, .mpiFinalized
+ SEE ALSO: gyoto.MPI_Init, .MPI_Finalize, .MPI_Initialized, .MPI_Finalized
*/
-extern gyoto_mpiInit;
-/* DOCUMENT status = gyoto.mpiInit([argv]);
+extern gyoto_MPI_Init;
+/* DOCUMENT status = gyoto.MPI_Init([argv]);
Initialize MPI.
Wrapper around MPI_Init(numberof(argv), argv). argv may be
@@ -78,36 +78,36 @@ extern gyoto_mpiInit;
If MPI is not compiled-in, returns 1.
- SEE ALSO: gyoto.haveMPI, .mpiFinalize, .mpiInitialized, .mpiFinalized
+ SEE ALSO: gyoto.haveMPI, .MPI_Finalize, .MPI_Initialized, .MPI_Finalized
*/
-extern gyoto_mpiFinalize;
-/* DOCUMENT gyoto.mpiFinalize;
+extern gyoto_MPI_Finalize;
+/* DOCUMENT gyoto.MPI_Finalize;
Finalize MPI.
Wrapper around MPI_Finalize(). Returns 0 for success, non-zero otherwise.
If MPI is not compiled-in, returns 1.
- SEE ALSO: gyoto.haveMPI, .mpiInit, .mpiFinalized, .mpiInitialized
+ SEE ALSO: gyoto.haveMPI, .MPI_Init, .MPI_Finalized, .MPI_Initialized
*/
-extern gyoto_mpiFinalized;
-/* DOCUMENT is_finalized=gyoto.mpiFinalized();
+extern gyoto_MPI_Finalized;
+/* DOCUMENT is_finalized=gyoto.MPI_Finalized();
Tell whether some implemention of MPI_Finalize() was already called.
If MPI support is not present, return 0.
- SEE ALSO: gyoto.haveMPI, .mpiFinalize, .mpiInit, .mpiInitialzed
+ SEE ALSO: gyoto.haveMPI, .MPI_Finalize, .MPI_Init, .MPI_Initialzed
*/
-extern gyoto_mpiInitialized;
-/* DOCUMENT is_initialized=gyoto.mpiInitialized();
+extern gyoto_MPI_Initialized;
+/* DOCUMENT is_initialized=gyoto.MPI_Initialized();
Tell whether some implemention of MPI_Init() was already called.
If MPI support is not present, return 0.
- SEE ALSO: gyoto.haveMPI, .mpiInit, .mpiFinalize, .mpiFinalized
+ SEE ALSO: gyoto.haveMPI, .MPI_Init, .MPI_Finalize, .MPI_Finalized
*/
extern __gyoto_setErrorHandler;
@@ -544,9 +544,9 @@ extern gyoto_Scenery;
You can check whether MPI support is compiled-in using
gyoto.haveMPI(). To benefit from it, you must call
- gyoto.mpiInit() once, before using the following keywords. Before
+ gyoto.MPI_Init() once, before using the following keywords. Before
quitting Yorick, should should also call 'sc, mpispawn=0;
- gyoto.mpiFinalize;'. Failure to do that may lead to helper
+ gyoto.MPI_Finalize;'. Failure to do that may lead to helper
processes lingering around.
nprocesses=number of parallel processes to use. If you just set
@@ -616,7 +616,7 @@ extern gyoto_Scenery;
- calling 'sc, mpiclone=;' once the scenery is ready, before tracing;
- before quitting yorick:
* destroy all of your sceneries with sc[];
- * call gyoto.mpiFinalize().
+ * call gyoto.MPI_Finalize().
libgyoto may automatically initialize MPI, in which case it will
also automatically terminate it. To prevent this behaviour, use
diff --git a/yorick/gyoto_namespace.i b/yorick/gyoto_namespace.i
index 7e9a7fc..d0e37bb 100644
--- a/yorick/gyoto_namespace.i
+++ b/yorick/gyoto_namespace.i
@@ -5,10 +5,10 @@ gyoto=save(
haveUDUNITS=gyoto_haveUDUNITS,
havePTHREAD=gyoto_havePTHREAD,
haveMPI=gyoto_haveMPI,
- mpiInit=gyoto_mpiInit,
- mpiFinalize=gyoto_mpiFinalize,
- mpiInitialized=gyoto_mpiInitialized,
- mpiFinalized=gyoto_mpiFinalized,
+ MPI_Init=gyoto_MPI_Init,
+ MPI_Finalize=gyoto_MPI_Finalize,
+ MPI_Initialized=gyoto_MPI_Initialized,
+ MPI_Finalized=gyoto_MPI_Finalized,
loadPlugin=gyoto_loadPlugin,
Scenery=gyoto_Scenery,
diff --git a/yorick/gyoto_utils.C b/yorick/gyoto_utils.C
index cd51739..331d576 100644
--- a/yorick/gyoto_utils.C
+++ b/yorick/gyoto_utils.C
@@ -189,13 +189,13 @@ extern "C" {
}
void
- Y_gyoto_mpiInit(int argc)
+ Y_gyoto_MPI_Init(int argc)
{
#if defined HAVE_MPI
long int mpiargcl=0;
char **mpiargv=NULL;
long index=-1;
- if (argc>1) y_error("gyoto.mpiInit() takes at most one argument");
+ if (argc>1) y_error("gyoto.MPI_Init() takes at most one argument");
if (argc) {
index=yget_ref(0);
if (!yarg_nil(0)) mpiargv=ygeta_q(0, &mpiargcl, NULL);
@@ -215,7 +215,7 @@ extern "C" {
}
void
- Y_gyoto_mpiInitialized(int argc)
+ Y_gyoto_MPI_Initialized(int argc)
{
#if defined HAVE_MPI
int flag=0;
@@ -227,7 +227,7 @@ extern "C" {
}
void
- Y_gyoto_mpiFinalize(int)
+ Y_gyoto_MPI_Finalize(int)
{
#if defined HAVE_MPI
ypush_long(MPI_Finalize());
@@ -237,7 +237,7 @@ extern "C" {
}
void
- Y_gyoto_mpiFinalized(int argc)
+ Y_gyoto_MPI_Finalized(int argc)
{
#if defined HAVE_MPI
int flag=0;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list