[Debian-astro-commits] [gyoto] 40/221: * provide wrapper script directly in the root of the source directory (sets $PATH) * update man page * accept (but ignore) --nprocesses when gyoto was built without MPI
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:32 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 4ebc4d5eed25ad1f9e52368a61e54dd77dd69557
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Sun Oct 12 20:19:07 2014 +0200
* provide wrapper script directly in the root of the source directory (sets $PATH)
* update man page
* accept (but ignore) --nprocesses when gyoto was built without MPI
---
Makefile.in | 9 ++++++---
bin/gyoto.1 | 11 +++++++++--
bin/gyoto.C | 11 ++---------
configure | 4 ++++
configure.ac | 2 ++
5 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 692f0ba..32daddf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,8 +89,9 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(top_srcdir)/yorick/stdplug/Makefile.in \
$(top_srcdir)/yorick/gyoto.info.in \
$(top_srcdir)/yorick/yorick1.in \
- $(top_srcdir)/yorick/setpaths.i.in COPYING compile \
- config.guess config.sub depcomp install-sh missing ltmain.sh
+ $(top_srcdir)/yorick/setpaths.i.in $(srcdir)/gyoto.in COPYING \
+ compile config.guess config.sub depcomp install-sh missing \
+ ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
$(top_srcdir)/m4/ax_append_flag.m4 \
@@ -109,7 +110,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h $(top_builddir)/include/GyotoConfig.h
CONFIG_CLEAN_FILES = doc/Makefile doc/user_guide/Makefile \
yorick/Makefile yorick/stdplug/Makefile yorick/gyoto.info \
- yorick/yorick1 yorick/setpaths.i
+ yorick/yorick1 yorick/setpaths.i gyoto
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -455,6 +456,8 @@ yorick/yorick1: $(top_builddir)/config.status $(top_srcdir)/yorick/yorick1.in
cd $(top_builddir) && $(SHELL) ./config.status $@
yorick/setpaths.i: $(top_builddir)/config.status $(top_srcdir)/yorick/setpaths.i.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+gyoto: $(top_builddir)/config.status $(srcdir)/gyoto.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
diff --git a/bin/gyoto.1 b/bin/gyoto.1
index 64c3bd5..cece1d0 100644
--- a/bin/gyoto.1
+++ b/bin/gyoto.1
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH GYOTO 1 "AUGUST 2013" Science "User Manuals"
+.TH GYOTO 1 "OCTOBER 2014" Science "User Manuals"
.SH NAME
Gyoto \- the General relativitY Orbit Tracer of Observatoire de Paris
.SH SYNOPSIS
@@ -10,7 +10,8 @@ gyoto [\fB\-\-silent\fR|\fB\-\-quiet\fR|\fB\-\-verbose\fR[=\fIN\fR]|\fB\-\-debug
[\fB\-\-time\fR=\fItobs\fR] [\fB\-\-tmin\fR=\fItmin\fR]
[\fB\-\-fov\fR=\fIangle\fR] [\fB\-\-resolution\fR=\fInpix\fR] [\fB\-\-distance\fR=\fIdist\fR]
[\fB\-\-paln\fR=\fIOmega\fR] [\fB\-\-inclination\fR=\fIi\fR] [\fB\-\-argument\fR=\fItheta\fR]
- [\fB\-\-nthreads\fR=\fInth\fR] [\fB\-\-plugins\fR=\fIpluglist\fR]
+ [\fB\-\-nthreads\fR=\fInth\fR] [\fB\-\-nprocesses\fR=\fInprocs\fR]
+ [\fB\-\-plugins\fR=\fIpluglist\fR]
[\fB\-\-impact-coords\fR[=\fIfname.fits\fR]]
[\fB\-\-\fR] \fIinput.xml \fIoutput.fits
.SH DESCRIPTION
@@ -102,6 +103,12 @@ without POSIX threads support. Note that the metric and object are
replicated for each thread which can lead to a decrease in performance
if either is memory-intensive. Setting this option to 0 is equivalent
to setting it to 1.
+.IP \fB\-\-nprocesses\fR=\fInprocs\fR
+Number of MPI processes to spawn for parallel ray-tracing, in addition
+to the main gyoto process which remains for managing the
+computation. Ignored if gyoto was compiled without MPI support. If
+both \-\-nthreads and \-\-nprocesses are specified, \-\-nthreads is
+ignored.
.IP \fB\-\-impact\-coords\fR[=\fIimpactcoords.fits\fR]
In some circumstances, you may want to perform several computations in
which the computed geodesics end up being exactly identical. This is
diff --git a/bin/gyoto.C b/bin/gyoto.C
index d7a18db..0f21e56 100644
--- a/bin/gyoto.C
+++ b/bin/gyoto.C
@@ -91,18 +91,13 @@ int main(int argc, char** argv) {
size_t imin=1, imax=1000000000, jmin=1, jmax=1000000000;
// double tobs, tmin, fov, dist, paln, incl, arg;
double tobs=0., tmin=0., fov=0., dist=0., paln=0., incl=0., arg=0.;
- size_t res=0, nthreads=0;
+ size_t res=0, nthreads=0, nprocs=0;
// bool xtobs=0, xtmin=0, xfov=0, xres=0, xdist=0, xpaln=0, xincl=0, xarg=0;
- bool xtobs=0, xtmin=0, xfov=0, xres=0, xdist=0, xpaln=0, xincl=0, xarg=0, xnthreads=0;
+ bool xtobs=0, xtmin=0, xfov=0, xres=0, xdist=0, xpaln=0, xincl=0, xarg=0, xnthreads=0, xnprocs;
bool ipct=0;
long ipctdims[3]={0, 0, 0};
double ipcttime;
-#ifdef HAVE_MPI
- bool xnprocs=0;
- int nprocs=0;
-#endif
-
string pluglist= getenv("GYOTO_PLUGINS")?
getenv("GYOTO_PLUGINS"):
GYOTO_DEFAULT_PLUGINS;
@@ -185,11 +180,9 @@ int main(int argc, char** argv) {
} else if (param.substr(0,11)=="--nthreads=") {
nthreads=atoi(param.substr(11).c_str());
xnthreads=1;
-#ifdef HAVE_MPI
} else if (param.substr(0,13)=="--nprocesses=") {
nprocs=atoi(param.substr(13).c_str());
xnprocs=1;
-#endif
}
else {
usage();
diff --git a/configure b/configure
index 4bd9a94..a1d1276 100755
--- a/configure
+++ b/configure
@@ -18493,6 +18493,8 @@ if test "x$YORICK" != "x"; then :
ac_config_files="$ac_config_files yorick/gyoto.info yorick/yorick1 yorick/setpaths.i"
+ ac_config_files="$ac_config_files gyoto"
+
fi
@@ -19646,6 +19648,7 @@ do
"yorick/gyoto.info") CONFIG_FILES="$CONFIG_FILES yorick/gyoto.info" ;;
"yorick/yorick1") CONFIG_FILES="$CONFIG_FILES yorick/yorick1" ;;
"yorick/setpaths.i") CONFIG_FILES="$CONFIG_FILES yorick/setpaths.i" ;;
+ "gyoto") CONFIG_FILES="$CONFIG_FILES gyoto" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -21142,6 +21145,7 @@ _LT_EOF
"yorick/gyoto.info":F) chmod a+x yorick/yorick1 ;;
"yorick/yorick1":F) chmod a+x yorick/yorick1 ;;
"yorick/setpaths.i":F) chmod a+x yorick/yorick1 ;;
+ "gyoto":F) chmod a+x gyoto ;;
esac
done # for ac_tag
diff --git a/configure.ac b/configure.ac
index 453cb5a..a0a053d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -695,6 +695,8 @@ AS_IF([test "x$YORICK" != "x"],
yorick/setpaths.i
],
[chmod a+x yorick/yorick1])
+ AC_CONFIG_FILES([gyoto],
+ [chmod a+x gyoto])
]
)
AS_IF([test "x$DOXYGEN" != "x" && test "x$mkdoc" == "xyes"], [mySUBDIRS="$mySUBDIRS doc"])
--
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