[Debian-astro-commits] [gyoto] 58/221: * install gyoto-mpi-worker as ${bindir}/gyoto-mpi-worker.SOVERS * change dots in SOVERS to underscores * make sure MPI support build and works --without-cfitsio * add manpage for gyoto-mpi-worker.SOVERS
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:33 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 e790df753b30ef038308ada1170e8e5ed6121272
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Wed Oct 15 17:53:01 2014 +0200
* install gyoto-mpi-worker as ${bindir}/gyoto-mpi-worker.SOVERS
* change dots in SOVERS to underscores
* make sure MPI support build and works --without-cfitsio
* add manpage for gyoto-mpi-worker.SOVERS
---
bin/Makefile.am | 28 ++++--
bin/Makefile.in | 227 ++++++++++++++++++++-----------------------------
bin/gyoto-mpi-worker.1 | 22 +++++
configure | 28 +++++-
configure.ac | 13 ++-
lib/Scenery.C | 12 +--
6 files changed, 174 insertions(+), 156 deletions(-)
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 5f6a4f4..e62ac61 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -4,24 +4,35 @@ AM_LDFLAGS = $(XERCESLDFLAGS) $(PTHREAD_LIBS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
CLEANFILES=example-*.fits
-bin_PROGRAMS = gyoto
+bin_PROGRAMS =
+dist_man_MANS =
+
+if BUILD_GYOTO
+bin_PROGRAMS += gyoto
+dist_man_MANS += gyoto.1
+endif
+
if HAVE_MPI
- soverdir=$(pkglibdir)/@sovers@
- sover_PROGRAMS = gyoto-mpi-worker
+bin_PROGRAMS += gyoto-mpi-worker. at sovers@
+dist_man_MANS += gyoto-mpi-worker. at sovers@.1
endif
-dist_man_MANS = gyoto.1
+
gyoto_SOURCES = gyoto.C
gyoto_LDADD = @top_builddir@/lib/libgyoto.la
gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
-gyoto_mpi_worker_SOURCES = gyoto-mpi-worker.C
-gyoto_mpi_worker_LDADD = @top_builddir@/lib/libgyoto.la -lboost_mpi -lboost_serialization
-gyoto_mpi_worker_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
-gyoto_mpi_worker_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
+gyoto_mpi_worker_ at sovers@_SOURCES = gyoto-mpi-worker.C
+gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto.la -lboost_mpi -lboost_serialization
+gyoto_mpi_worker_ at sovers@_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
+gyoto_mpi_worker_ at sovers@_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
+
+gyoto-mpi-worker. at sovers@.1: gyoto-mpi-worker.1
+ cp $^ $@
export PATH := .:$(PATH)
+if BUILD_GYOTO
CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto --resolution=32 --nthreads=8
check: gyoto
$(CHECK_CMD) ../doc/examples/example-thin-disk.xml \
@@ -62,3 +73,4 @@ if HAVE_UDUNITS
$(CHECK_CMD) ../doc/examples/example-polish-doughnut.xml \
\!example-polish-doughnut.fits
endif
+endif
diff --git a/bin/Makefile.in b/bin/Makefile.in
index d3a429a..ecd4ece 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -79,8 +79,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = gyoto$(EXEEXT)
- at HAVE_MPI_TRUE@sover_PROGRAMS = gyoto-mpi-worker$(EXEEXT)
+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+ at BUILD_GYOTO_TRUE@am__append_1 = gyoto
+ at BUILD_GYOTO_TRUE@am__append_2 = gyoto.1
+ at HAVE_MPI_TRUE@am__append_3 = gyoto-mpi-worker. at sovers@
+ at HAVE_MPI_TRUE@am__append_4 = gyoto-mpi-worker. at sovers@.1
subdir = bin
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp $(dist_man_MANS)
@@ -101,9 +104,10 @@ CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/include/GyotoConfig.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(soverdir)" \
- "$(DESTDIR)$(man1dir)"
-PROGRAMS = $(bin_PROGRAMS) $(sover_PROGRAMS)
+ at BUILD_GYOTO_TRUE@am__EXEEXT_1 = gyoto$(EXEEXT)
+ at HAVE_MPI_TRUE@am__EXEEXT_2 = gyoto-mpi-worker. at sovers@$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+PROGRAMS = $(bin_PROGRAMS)
am_gyoto_OBJECTS = gyoto-gyoto.$(OBJEXT)
gyoto_OBJECTS = $(am_gyoto_OBJECTS)
gyoto_DEPENDENCIES = @top_builddir@/lib/libgyoto.la
@@ -114,14 +118,16 @@ am__v_lt_1 =
gyoto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(gyoto_LDFLAGS) $(LDFLAGS) -o $@
-am_gyoto_mpi_worker_OBJECTS = \
- gyoto_mpi_worker-gyoto-mpi-worker.$(OBJEXT)
-gyoto_mpi_worker_OBJECTS = $(am_gyoto_mpi_worker_OBJECTS)
-gyoto_mpi_worker_DEPENDENCIES = @top_builddir@/lib/libgyoto.la
-gyoto_mpi_worker_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+am_gyoto_mpi_worker_ at sovers@_OBJECTS = \
+ gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.$(OBJEXT)
+gyoto_mpi_worker_ at sovers@_OBJECTS = \
+ $(am_gyoto_mpi_worker_ at sovers@_OBJECTS)
+gyoto_mpi_worker_ at sovers@_DEPENDENCIES = \
+ @top_builddir@/lib/libgyoto.la
+gyoto_mpi_worker_ at sovers@_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(gyoto_mpi_worker_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(gyoto_mpi_worker_ at sovers@_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -156,8 +162,8 @@ AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
-SOURCES = $(gyoto_SOURCES) $(gyoto_mpi_worker_SOURCES)
-DIST_SOURCES = $(gyoto_SOURCES) $(gyoto_mpi_worker_SOURCES)
+SOURCES = $(gyoto_SOURCES) $(gyoto_mpi_worker_ at sovers@_SOURCES)
+DIST_SOURCES = $(gyoto_SOURCES) $(gyoto_mpi_worker_ at sovers@_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -386,17 +392,16 @@ AM_CPPFLAGS = -I at top_builddir@/include $(XERCESCPPFLAGS) $(UDUNITS_CPPFLAGS) $(B
AM_LDFLAGS = $(XERCESLDFLAGS) $(PTHREAD_LIBS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
CLEANFILES = example-*.fits
- at HAVE_MPI_TRUE@soverdir = $(pkglibdir)/@sovers@
-dist_man_MANS = gyoto.1
+dist_man_MANS = $(am__append_2) $(am__append_4)
gyoto_SOURCES = gyoto.C
gyoto_LDADD = @top_builddir@/lib/libgyoto.la
gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
-gyoto_mpi_worker_SOURCES = gyoto-mpi-worker.C
-gyoto_mpi_worker_LDADD = @top_builddir@/lib/libgyoto.la -lboost_mpi -lboost_serialization
-gyoto_mpi_worker_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
-gyoto_mpi_worker_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
-CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto --resolution=32 --nthreads=8
+gyoto_mpi_worker_ at sovers@_SOURCES = gyoto-mpi-worker.C
+gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto.la -lboost_mpi -lboost_serialization
+gyoto_mpi_worker_ at sovers@_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
+gyoto_mpi_worker_ at sovers@_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
+ at BUILD_GYOTO_TRUE@CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto --resolution=32 --nthreads=8
all: all-am
.SUFFIXES:
@@ -480,63 +485,14 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-install-soverPROGRAMS: $(sover_PROGRAMS)
- @$(NORMAL_INSTALL)
- @list='$(sover_PROGRAMS)'; test -n "$(soverdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(soverdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(soverdir)" || exit 1; \
- fi; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p \
- || test -f $$p1 \
- ; then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' \
- -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(soverdir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(soverdir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-soverPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(sover_PROGRAMS)'; test -n "$(soverdir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
- `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(soverdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(soverdir)" && rm -f $$files
-
-clean-soverPROGRAMS:
- @list='$(sover_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
gyoto$(EXEEXT): $(gyoto_OBJECTS) $(gyoto_DEPENDENCIES) $(EXTRA_gyoto_DEPENDENCIES)
@rm -f gyoto$(EXEEXT)
$(AM_V_CXXLD)$(gyoto_LINK) $(gyoto_OBJECTS) $(gyoto_LDADD) $(LIBS)
-gyoto-mpi-worker$(EXEEXT): $(gyoto_mpi_worker_OBJECTS) $(gyoto_mpi_worker_DEPENDENCIES) $(EXTRA_gyoto_mpi_worker_DEPENDENCIES)
- @rm -f gyoto-mpi-worker$(EXEEXT)
- $(AM_V_CXXLD)$(gyoto_mpi_worker_LINK) $(gyoto_mpi_worker_OBJECTS) $(gyoto_mpi_worker_LDADD) $(LIBS)
+gyoto-mpi-worker. at sovers@$(EXEEXT): $(gyoto_mpi_worker_ at sovers@_OBJECTS) $(gyoto_mpi_worker_ at sovers@_DEPENDENCIES) $(EXTRA_gyoto_mpi_worker_ at sovers@_DEPENDENCIES)
+ @rm -f gyoto-mpi-worker. at sovers@$(EXEEXT)
+ $(AM_V_CXXLD)$(gyoto_mpi_worker_ at sovers@_LINK) $(gyoto_mpi_worker_ at sovers@_OBJECTS) $(gyoto_mpi_worker_ at sovers@_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -545,7 +501,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gyoto-gyoto.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gyoto_mpi_worker-gyoto-mpi-worker.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.Po at am__quote@
.C.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -582,19 +538,19 @@ gyoto-gyoto.obj: gyoto.C
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gyoto-gyoto.obj `if test -f 'gyoto.C'; then $(CYGPATH_W) 'gyoto.C'; else $(CYGPATH_W) '$(srcdir)/gyoto.C'; fi`
-gyoto_mpi_worker-gyoto-mpi-worker.o: gyoto-mpi-worker.C
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gyoto_mpi_worker-gyoto-mpi-worker.o -MD -MP -MF $(DEPDIR)/gyoto_mpi_worker-gyoto-mpi-worker.Tpo -c -o gyoto_mpi_worker-gyoto-mpi-worker.o `test -f 'gyoto-mpi-worker.C' || echo '$(srcdir)/'`gyoto-mpi-worker.C
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gyoto_mpi_worker-gyoto-mpi-worker.Tpo $(DEPDIR)/gyoto_mpi_worker-gyoto-mpi-worker.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='gyoto-mpi-worker.C' object='gyoto_mpi_worker-gyoto-mpi-worker.o' libtool=no @AMDEPBACKSLASH@
+gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.o: gyoto-mpi-worker.C
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_ at sovers@_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.o -MD -MP -MF $(DEPDIR)/gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.Tpo -c -o gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.o `test -f 'gyoto-mpi-worker.C' || echo '$(srcdir)/'`gyoto-mpi-worker.C
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.Tpo $(DEPDIR)/gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='gyoto-mpi-worker.C' object='gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gyoto_mpi_worker-gyoto-mpi-worker.o `test -f 'gyoto-mpi-worker.C' || echo '$(srcdir)/'`gyoto-mpi-worker.C
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_ at sovers@_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.o `test -f 'gyoto-mpi-worker.C' || echo '$(srcdir)/'`gyoto-mpi-worker.C
-gyoto_mpi_worker-gyoto-mpi-worker.obj: gyoto-mpi-worker.C
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gyoto_mpi_worker-gyoto-mpi-worker.obj -MD -MP -MF $(DEPDIR)/gyoto_mpi_worker-gyoto-mpi-worker.Tpo -c -o gyoto_mpi_worker-gyoto-mpi-worker.obj `if test -f 'gyoto-mpi-worker.C'; then $(CYGPATH_W) 'gyoto-mpi-worker.C'; else $(CYGPATH_W) '$(srcdir)/gyoto-mpi-worker.C'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gyoto_mpi_worker-gyoto-mpi-worker.Tpo $(DEPDIR)/gyoto_mpi_worker-gyoto-mpi-worker.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='gyoto-mpi-worker.C' object='gyoto_mpi_worker-gyoto-mpi-worker.obj' libtool=no @AMDEPBACKSLASH@
+gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.obj: gyoto-mpi-worker.C
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_ at sovers@_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.obj -MD -MP -MF $(DEPDIR)/gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.Tpo -c -o gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.obj `if test -f 'gyoto-mpi-worker.C'; then $(CYGPATH_W) 'gyoto-mpi-worker.C'; else $(CYGPATH_W) '$(srcdir)/gyoto-mpi-worker.C'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.Tpo $(DEPDIR)/gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='gyoto-mpi-worker.C' object='gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gyoto_mpi_worker-gyoto-mpi-worker.obj `if test -f 'gyoto-mpi-worker.C'; then $(CYGPATH_W) 'gyoto-mpi-worker.C'; else $(CYGPATH_W) '$(srcdir)/gyoto-mpi-worker.C'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gyoto_mpi_worker_ at sovers@_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gyoto_mpi_worker_ at sovers@-gyoto-mpi-worker.obj `if test -f 'gyoto-mpi-worker.C'; then $(CYGPATH_W) 'gyoto-mpi-worker.C'; else $(CYGPATH_W) '$(srcdir)/gyoto-mpi-worker.C'; fi`
mostlyclean-libtool:
-rm -f *.lo
@@ -731,7 +687,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(soverdir)" "$(DESTDIR)$(man1dir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -767,8 +723,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool \
- clean-soverPROGRAMS mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -788,7 +743,7 @@ info: info-am
info-am:
-install-data-am: install-man install-soverPROGRAMS
+install-data-am: install-man
install-dvi: install-dvi-am
@@ -834,67 +789,67 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-man \
- uninstall-soverPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool \
- clean-soverPROGRAMS cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-man1 install-pdf \
- install-pdf-am install-ps install-ps-am install-soverPROGRAMS \
+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1 \
- uninstall-soverPROGRAMS
+ uninstall-binPROGRAMS uninstall-man uninstall-man1
+
+gyoto-mpi-worker. at sovers@.1: gyoto-mpi-worker.1
+ cp $^ $@
export PATH := .:$(PATH)
-check: gyoto
- $(CHECK_CMD) ../doc/examples/example-thin-disk.xml \
- \!example-thin-disk.fits
- $(CHECK_CMD) ../doc/examples/example-thin-disk-KS.xml \
- \!example-thin-disk-KS.fits
- $(CHECK_CMD) ../doc/examples/example-thin-disk-minkowski-cartesian.xml \
- \!example-thin-disk-minkowski-cartesian.fits
- $(CHECK_CMD) ../doc/examples/example-thin-disk-minkowski-spherical.xml \
- \!example-thin-disk-minkowski-spherical.fits
- $(CHECK_CMD) ../doc/examples/example-complex-astrobj.xml \
- \!example-complex-astrobj.fits
- $(CHECK_CMD) ../doc/examples/example-fixed-star.xml \
- \!example-fixed-star.fits
- at HAVE_UDUNITS_TRUE@ $(CHECK_CMD) ../doc/examples/example-fixed-star-KS.xml \
- at HAVE_UDUNITS_TRUE@ \!example-fixed-star-KS.fits
- $(CHECK_CMD) ../doc/examples/example-fixed-star-minkowski-cartesian.xml \
- \!example-fixed-star-minkowski-cartesian.fits
- $(CHECK_CMD) ../doc/examples/example-fixed-star-minkowski-spherical.xml \
- \!example-fixed-star-minkowski-spherical.fits
- $(CHECK_CMD) ../doc/examples/example-startrace.xml \
- \!example-startrace.fits
- $(CHECK_CMD) ../doc/examples/example-moving-star.xml \
- \!example-moving-star.fits
- $(CHECK_CMD) ../doc/examples/example-page-thorne-disk-BL.xml \
- \!example-page-thorne-disk-BL.fits
- $(CHECK_CMD) ../doc/examples/example-page-thorne-disk-KS.xml \
- \!example-page-thorne-disk-KS.fits
- $(CHECK_CMD) ../doc/examples/example-page-thorne-disk-BL-with-basis.xml \
- \!example-page-thorne-disk-BL-with-basis.fits
- $(CHECK_CMD) ../doc/examples/example-torus.xml \
- \!example-torus.fits
- $(CHECK_CMD) ../doc/examples/example-torus-KS.xml \
- \!example-torus-KS.fits
- at HAVE_UDUNITS_TRUE@ $(CHECK_CMD) ../doc/examples/example-polish-doughnut.xml \
- at HAVE_UDUNITS_TRUE@ \!example-polish-doughnut.fits
+ at BUILD_GYOTO_TRUE@check: gyoto
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-thin-disk.xml \
+ at BUILD_GYOTO_TRUE@ \!example-thin-disk.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-thin-disk-KS.xml \
+ at BUILD_GYOTO_TRUE@ \!example-thin-disk-KS.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-thin-disk-minkowski-cartesian.xml \
+ at BUILD_GYOTO_TRUE@ \!example-thin-disk-minkowski-cartesian.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-thin-disk-minkowski-spherical.xml \
+ at BUILD_GYOTO_TRUE@ \!example-thin-disk-minkowski-spherical.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-complex-astrobj.xml \
+ at BUILD_GYOTO_TRUE@ \!example-complex-astrobj.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-fixed-star.xml \
+ at BUILD_GYOTO_TRUE@ \!example-fixed-star.fits
+ at BUILD_GYOTO_TRUE@@HAVE_UDUNITS_TRUE@ $(CHECK_CMD) ../doc/examples/example-fixed-star-KS.xml \
+ at BUILD_GYOTO_TRUE@@HAVE_UDUNITS_TRUE@ \!example-fixed-star-KS.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-fixed-star-minkowski-cartesian.xml \
+ at BUILD_GYOTO_TRUE@ \!example-fixed-star-minkowski-cartesian.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-fixed-star-minkowski-spherical.xml \
+ at BUILD_GYOTO_TRUE@ \!example-fixed-star-minkowski-spherical.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-startrace.xml \
+ at BUILD_GYOTO_TRUE@ \!example-startrace.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-moving-star.xml \
+ at BUILD_GYOTO_TRUE@ \!example-moving-star.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-page-thorne-disk-BL.xml \
+ at BUILD_GYOTO_TRUE@ \!example-page-thorne-disk-BL.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-page-thorne-disk-KS.xml \
+ at BUILD_GYOTO_TRUE@ \!example-page-thorne-disk-KS.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-page-thorne-disk-BL-with-basis.xml \
+ at BUILD_GYOTO_TRUE@ \!example-page-thorne-disk-BL-with-basis.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-torus.xml \
+ at BUILD_GYOTO_TRUE@ \!example-torus.fits
+ at BUILD_GYOTO_TRUE@ $(CHECK_CMD) ../doc/examples/example-torus-KS.xml \
+ at BUILD_GYOTO_TRUE@ \!example-torus-KS.fits
+ at BUILD_GYOTO_TRUE@@HAVE_UDUNITS_TRUE@ $(CHECK_CMD) ../doc/examples/example-polish-doughnut.xml \
+ at BUILD_GYOTO_TRUE@@HAVE_UDUNITS_TRUE@ \!example-polish-doughnut.fits
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/bin/gyoto-mpi-worker.1 b/bin/gyoto-mpi-worker.1
new file mode 100644
index 0000000..45b072d
--- /dev/null
+++ b/bin/gyoto-mpi-worker.1
@@ -0,0 +1,22 @@
+.\" Process this file with
+.\" groff -man -Tascii foo.1
+.\"
+.TH GYOTO-MPI-WORKER 1 "OCTOBER 2014" Science "User Manuals"
+.SH NAME
+Gyoto \- the General relativitY Orbit Tracer of Observatoire de Paris
+.SH SYNOPSIS
+gyoto-mpi-worker.\fISOVERS\fR [MPI options]
+.SH DESCRIPTION
+Gyoto is a framework for computing geodesics in curved
+space-times. The \fBgyoto-mpi-worker\fR helper program is not meant to
+be executed directly by the user. It is spawned by the MPI frawework
+when using multi-processing. It does not process any command-line
+parameter, but passes them to MPI_Init(3). \fBgyoto-mpi-worker\fR is
+bound to a specific version of the Gyoto application binary interface
+(ABI). To allow for co-installation of several versions of the Gyoto
+library, the SO information digits are appended to the executable
+name.
+.SH AUTHOR
+Thibaut Paumard <thibaut.paumard at obspm.fr> wrote this manual.
+.SH "SEE ALSO"
+.BR gyoto (1)
diff --git a/configure b/configure
index 5d8ffc4..35ff7a4 100755
--- a/configure
+++ b/configure
@@ -636,6 +636,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
mySUBDIRS
+BUILD_GYOTO_FALSE
+BUILD_GYOTO_TRUE
pkg_libs
pkg_cflags
pkg_requires
@@ -15450,7 +15452,7 @@ ac_config_headers="$ac_config_headers config.h include/GyotoConfig.h"
VERSINFO=3:0:1
-sovers=`echo $VERSINFO | tr : .`
+sovers=`echo $VERSINFO | tr : _`
@@ -18108,6 +18110,9 @@ if test "x$have_xerces" == "xno"; then :
fi
+ if test "x$have_mpi" == "xyes"; then :
+ as_fn_error $? "The MPI feature set requires Xerces. Please reconfigure with --without-mpi or with --with-xerces." "$LINENO" 5
+fi
else
use_xerces=yes
@@ -18480,9 +18485,26 @@ fi
mySUBDIRS="lib"
+build_exec=no
+if test "x$have_mpi" == xyes; then :
+ build_exec=yes
+fi
if test "x$use_xerces" != "x" && test "x$use_cfitsio" != "x"; then :
+ build_exec=yes
+fi
+if test "x$build_exec" == xyes; then :
mySUBDIRS="$mySUBDIRS bin"
fi
+
+ if test "x$use_xerces" != "x" && test "x$use_cfitsio" != "x"; then
+ BUILD_GYOTO_TRUE=
+ BUILD_GYOTO_FALSE='#'
+else
+ BUILD_GYOTO_TRUE='#'
+ BUILD_GYOTO_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile bin/Makefile doc/Makefile doc/user_guide/Makefile lib/Makefile lib/gyoto.pc lib/gyoto-uninstalled.pc"
if test "x$YORICK" != "x"; then :
@@ -18663,6 +18685,10 @@ if test -z "${MKGUIDE_TRUE}" && test -z "${MKGUIDE_FALSE}"; then
as_fn_error $? "conditional \"MKGUIDE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${BUILD_GYOTO_TRUE}" && test -z "${BUILD_GYOTO_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_GYOTO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
diff --git a/configure.ac b/configure.ac
index 0cfb721..f0a9d72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ LT_INIT([dlopen disable-static])
AC_CONFIG_HEADERS([config.h include/GyotoConfig.h])
VERSINFO=3:0:1
-sovers=`echo $VERSINFO | tr : .`
+sovers=`echo $VERSINFO | tr : _`
AC_SUBST([VERSINFO])
AC_SUBST([sovers])
@@ -456,6 +456,8 @@ AS_IF([test "x$have_xerces" == "xno"],
[AC_MSG_ERROR([xerces requested but not found])
]
)
+ AS_IF([test "x$have_mpi" == "xyes"],
+ [AC_MSG_ERROR([The MPI feature set requires Xerces. Please reconfigure with --without-mpi or with --with-xerces.])])
],
[use_xerces=yes
AC_DEFINE([GYOTO_USE_XERCES], [1], [Define to 1 if you have Xerces])]
@@ -666,8 +668,13 @@ AC_SUBST([pkg_requires])
AC_SUBST([pkg_cflags])
AC_SUBST([pkg_libs])
mySUBDIRS="lib"
-AS_IF([test "x$use_xerces" != "x" && test "x$use_cfitsio" != "x"],
- [mySUBDIRS="$mySUBDIRS bin"])
+build_exec=no
+AS_IF([test "x$have_mpi" == xyes], [build_exec=yes])
+AS_IF([test "x$use_xerces" != "x" && test "x$use_cfitsio" != "x"], [build_exec=yes])
+AS_IF([test "x$build_exec" == xyes], [mySUBDIRS="$mySUBDIRS bin"])
+
+AM_CONDITIONAL([BUILD_GYOTO], [test "x$use_xerces" != "x" && test "x$use_cfitsio" != "x"])
+
AC_CONFIG_FILES([Makefile
bin/Makefile
doc/Makefile
diff --git a/lib/Scenery.C b/lib/Scenery.C
index c7f8181..0f800da 100644
--- a/lib/Scenery.C
+++ b/lib/Scenery.C
@@ -882,18 +882,14 @@ void Gyoto::Scenery::mpiSpawn(int nbchildren) {
mpiTerminate();
}
- // Add our SO-versionned directory at the end of the PATH variable.
- string PATH=getenv("PATH");
- PATH += ":";
- PATH += GYOTO_PREFIX ;
- PATH += "/lib/gyoto/" ;
- PATH += GYOTO_SOVERS;
- setenv("PATH", PATH.c_str(), 1);
+
if (nbchildren) {
+ char * exec = const_cast<char*>("gyoto-mpi-worker." GYOTO_SOVERS);
+
MPI_Comm children_c;
- MPI_Comm_spawn(const_cast<char*>("gyoto-mpi-worker"),
+ MPI_Comm_spawn(exec,
MPI_ARGV_NULL, nbchildren,
MPI_INFO_NULL, 0, MPI_COMM_SELF, &children_c,
MPI_ERRCODES_IGNORE);
--
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