[Debian-astro-commits] [gyoto] 96/221: implement 'make check-lorene' and 'make check-lorene-mpi'
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:37 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 e0b58d5f40e97ee6eee1e4d6708dd232c3561a0c
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Wed Nov 19 17:26:34 2014 +0100
implement 'make check-lorene' and 'make check-lorene-mpi'
---
Makefile.am | 2 +-
Makefile.in | 2 +-
bin/Makefile.am | 48 +++++++++++-----
bin/Makefile.in | 79 +++++++++++++++++---------
doc/examples/example-fixedstar-rotstar3_1.xml | 2 +-
doc/examples/example-movingstar-rotstar3_1.xml | 2 +-
6 files changed, 89 insertions(+), 46 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fdb9772..266ea85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ $(SUBDIRS):
ChangeLog:
git log --no-merges > ChangeLog
-check-mpi check-mpi-clean check-lorene check-lorene-clean:
+check-mpi check-mpi-clean check-lorene check-lorene-clean check-lorene-mpi check-lorene-mpi-clean:
if BUILD_GYOTO
cd bin ; $(MAKE) $@
endif
diff --git a/Makefile.in b/Makefile.in
index d4a7d20..1f77b1d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -893,7 +893,7 @@ $(SUBDIRS):
ChangeLog:
git log --no-merges > ChangeLog
-check-mpi check-mpi-clean check-lorene check-lorene-clean:
+check-mpi check-mpi-clean check-lorene check-lorene-clean check-lorene-mpi check-lorene-mpi-clean:
@BUILD_GYOTO_TRUE@ cd bin ; $(MAKE) $@
@HAVE_YORICK_TRUE@ cd yorick ; $(MAKE) $@
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 16ec552..33c6f92 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -82,30 +82,50 @@ check-mpi: check-mpi-clean check-mpi-compute
check: check-nompi
if HAVE_LORENE
-export HOME_LORENE
-$(HOME_LORENE)/Codes/Nrotstar/nrotstar:
- cd $(HOME_LORENE)/Codes/Nrotstar/ && cp Parameters/GR/Kepler/*.d ./ && $(SED) -i.bak 's/1 graph/0 graph/' par_rot.d && $(MAKE)
-
-$(HOME_LORENE)/Codes/Nrotstar/resu.d: $(HOME_LORENE)/Codes/Nrotstar/nrotstar
- cd $(HOME_LORENE)/Codes/Nrotstar/ && ./nrotstar
+# make check-lorene check-lorene-mpi
+# Will
+# 1- copy the Nrotstar directory from HOME_LORENE into .check-lorene;
+# 2- configure Nrotstar by copying par_eos.d and par_rot.d from GR/Kepler;
+# 3- build Nrotstar/nrotstar;
+# 4- run it to build Nrotstar/resu.d;
+# 5- ray-trace ../doc/examples/example-*-rotstar3_1.xml twice
+# (with and without MPI).
-$(EXAMPLE_DIR)resu.d: $(HOME_LORENE)/Codes/Nrotstar/resu.d
- cp $^ $@
+export HOME_LORENE
+.check-lorene/resu.d:
+ rm -Rf .check-lorene
+ cp -a $(HOME_LORENE)/Codes/Nrotstar ./.check-lorene
+ cd .check-lorene && rm -f nrotstar *.o
+ cd .check-lorene && cp -f Parameters/GR/Kepler/*.d ./
+ cd .check-lorene && $(SED) -i.bak 's/1 graph/0 graph/' par_rot.d
+ cd .check-lorene && $(MAKE)
+ cd .check-lorene && ./nrotstar
CHECK_ROTSTAR_RESULTS = example-movingstar-rotstar3_1.fits example-fixedstar-rotstar3_1.fits
+CHECK_ROTSTAR_MPI_RESULTS = $(CHECK_ROTSTAR_RESULTS:.fits=-mpi.fits)
+CLEANFILES += $(CHECK_ROTSTAR_RESULTS) $(CHECK_ROTSTAR_MPI_RESULTS)
-$(CHECK_ROTSTAR_RESULTS): gyoto $(EXAMPLE_DIR)$(@:.fits=.xml) $(EXAMPLE_DIR)resu.d
- $(CHECK_CMD) $(EXAMPLE_DIR)$(@:.fits=.xml) \!$@
+$(CHECK_ROTSTAR_MPI_RESULTS): gyoto $(EXAMPLE_DIR)$(@:-mpi.fits=.xml) .check-lorene/resu.d
+ $(CHECK_CMD) --nprocesses=4 $(EXAMPLE_DIR)$(@:-mpi.fits=.xml) \!$@
-check-lorene-clean:
- rm -f $(CHECK_ROTSTAR_RESULTS) $(EXAMPLE_DIR)resu.d
+$(CHECK_ROTSTAR_RESULTS): gyoto $(EXAMPLE_DIR)$(@:.fits=.xml) .check-lorene/resu.d
+ $(CHECK_CMD) --nthreads=0 $(EXAMPLE_DIR)$(@:.fits=.xml) \!$@
+check-lorene-clean:
+ rm -f $(CHECK_ROTSTAR_RESULTS)
check-lorene-compute: $(CHECK_ROTSTAR_RESULTS)
-
check-lorene: check-lorene-clean check-lorene-compute
+check-lorene-mpi-clean:
+ rm -f $(CHECK_ROTSTAR_RESULTS)
+check-lorene-mpi-compute: $(CHECK_ROTSTAR_MPI_RESULTS)
+check-lorene-mpi: check-lorene-mpi-clean check-lorene-mpi-compute
+
endif
endif
-.PHONY: check-nompi-compute check-nompi-clean check-nompi check-mpi-clean check-mpi-compute check-mpi check
+clean-local:
+ -rm -rf .check-lorene
+
+.PHONY: check-nompi-compute check-nompi-clean check-nompi check-mpi-clean check-mpi-compute check-mpi check check-lorene-clean check-lorene-compute check-lorene check-lorene-mpi-clean check-lorene-mpi-compute check-lorene-mpi check
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 997f48c..2c18f83 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -89,6 +89,7 @@ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
@HAVE_UDUNITS_TRUE@ example-fixed-star-KS.fits \
@HAVE_UDUNITS_TRUE@ example-polish-doughnut.fits
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at am__append_7 = $(CHECK_ROTSTAR_RESULTS) $(CHECK_ROTSTAR_MPI_RESULTS)
subdir = bin
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp $(dist_man_MANS)
@@ -397,7 +398,8 @@ ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I at top_builddir@/include $(XERCESCPPFLAGS) $(UDUNITS_CPPFLAGS) $(BOOST_CPPFLAGS)
AM_LDFLAGS = $(XERCESLDFLAGS) $(PTHREAD_LIBS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-CLEANFILES = $(am__append_5) $(CHECK_RESULTS) $(CHECK_MPI_RESULTS)
+CLEANFILES = $(am__append_5) $(CHECK_RESULTS) $(CHECK_MPI_RESULTS) \
+ $(am__append_7)
dist_man_MANS = $(am__append_2) $(am__append_4)
gyoto_SOURCES = gyoto.C
gyoto_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la
@@ -422,6 +424,7 @@ CHECK_RESULTS = example-thin-disk.fits example-thin-disk-KS.fits \
CHECK_MPI_RESULTS = $(CHECK_RESULTS:.fits=-mpi.fits)
CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto --resolution=32 --nthreads=8 --nprocesses=0
@BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at CHECK_ROTSTAR_RESULTS = example-movingstar-rotstar3_1.fits example-fixedstar-rotstar3_1.fits
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at CHECK_ROTSTAR_MPI_RESULTS = $(CHECK_ROTSTAR_RESULTS:.fits=-mpi.fits)
all: all-am
.SUFFIXES:
@@ -743,7 +746,8 @@ 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 mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -816,19 +820,20 @@ 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 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
+ clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ 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
gyoto-mpi-worker. at sovers@.1: gyoto-mpi-worker.1
@@ -856,27 +861,45 @@ check-mpi-clean:
@BUILD_GYOTO_TRUE at check: check-nompi
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at export HOME_LORENE
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(HOME_LORENE)/Codes/Nrotstar/nrotstar:
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd $(HOME_LORENE)/Codes/Nrotstar/ && cp Parameters/GR/Kepler/*.d ./ && $(SED) -i.bak 's/1 graph/0 graph/' par_rot.d && $(MAKE)
+# make check-lorene check-lorene-mpi
+# Will
+# 1- copy the Nrotstar directory from HOME_LORENE into .check-lorene;
+# 2- configure Nrotstar by copying par_eos.d and par_rot.d from GR/Kepler;
+# 3- build Nrotstar/nrotstar;
+# 4- run it to build Nrotstar/resu.d;
+# 5- ray-trace ../doc/examples/example-*-rotstar3_1.xml twice
+# (with and without MPI).
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(HOME_LORENE)/Codes/Nrotstar/resu.d: $(HOME_LORENE)/Codes/Nrotstar/nrotstar
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd $(HOME_LORENE)/Codes/Nrotstar/ && ./nrotstar
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at export HOME_LORENE
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at .check-lorene/resu.d:
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ rm -Rf .check-lorene
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cp -a $(HOME_LORENE)/Codes/Nrotstar ./.check-lorene
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd .check-lorene && rm -f nrotstar *.o
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd .check-lorene && cp -f Parameters/GR/Kepler/*.d ./
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd .check-lorene && $(SED) -i.bak 's/1 graph/0 graph/' par_rot.d
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd .check-lorene && $(MAKE)
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cd .check-lorene && ./nrotstar
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(EXAMPLE_DIR)resu.d: $(HOME_LORENE)/Codes/Nrotstar/resu.d
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ cp $^ $@
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(CHECK_ROTSTAR_MPI_RESULTS): gyoto $(EXAMPLE_DIR)$(@:-mpi.fits=.xml) .check-lorene/resu.d
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ $(CHECK_CMD) --nprocesses=4 $(EXAMPLE_DIR)$(@:-mpi.fits=.xml) \!$@
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(CHECK_ROTSTAR_RESULTS): gyoto $(EXAMPLE_DIR)$(@:.fits=.xml) $(EXAMPLE_DIR)resu.d
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ $(CHECK_CMD) $(EXAMPLE_DIR)$(@:.fits=.xml) \!$@
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@$(CHECK_ROTSTAR_RESULTS): gyoto $(EXAMPLE_DIR)$(@:.fits=.xml) .check-lorene/resu.d
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ $(CHECK_CMD) --nthreads=0 $(EXAMPLE_DIR)$(@:.fits=.xml) \!$@
@BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene-clean:
- at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ rm -f $(CHECK_ROTSTAR_RESULTS) $(EXAMPLE_DIR)resu.d
-
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ rm -f $(CHECK_ROTSTAR_RESULTS)
@BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene-compute: $(CHECK_ROTSTAR_RESULTS)
-
@BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene: check-lorene-clean check-lorene-compute
-.PHONY: check-nompi-compute check-nompi-clean check-nompi check-mpi-clean check-mpi-compute check-mpi check
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene-mpi-clean:
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE@ rm -f $(CHECK_ROTSTAR_RESULTS)
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene-mpi-compute: $(CHECK_ROTSTAR_MPI_RESULTS)
+ at BUILD_GYOTO_TRUE@@HAVE_LORENE_TRUE at check-lorene-mpi: check-lorene-mpi-clean check-lorene-mpi-compute
+
+clean-local:
+ -rm -rf .check-lorene
+
+.PHONY: check-nompi-compute check-nompi-clean check-nompi check-mpi-clean check-mpi-compute check-mpi check check-lorene-clean check-lorene-compute check-lorene check-lorene-mpi-clean check-lorene-mpi-compute check-lorene-mpi check
# 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/doc/examples/example-fixedstar-rotstar3_1.xml b/doc/examples/example-fixedstar-rotstar3_1.xml
index d6bc66a..aa1aec9 100644
--- a/doc/examples/example-fixedstar-rotstar3_1.xml
+++ b/doc/examples/example-fixedstar-rotstar3_1.xml
@@ -2,7 +2,7 @@
<Scenery>
<Metric kind = "RotStar3_1">
- <File>resu.d</File>
+ <File>../../bin/.check-lorene/resu.d</File>
<IntegKind>1</IntegKind>
<!--0: integ 4D ; 1: integ 3D -->
</Metric>
diff --git a/doc/examples/example-movingstar-rotstar3_1.xml b/doc/examples/example-movingstar-rotstar3_1.xml
index e546452..9cea441 100644
--- a/doc/examples/example-movingstar-rotstar3_1.xml
+++ b/doc/examples/example-movingstar-rotstar3_1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Scenery>
<Metric kind = "RotStar3_1">
- <File>resu.d</File>
+ <File>../../bin/.check-lorene/resu.d</File>
<IntegKind>1</IntegKind>
<!--0: integ 4D ; 1: integ 3+1 D -->
</Metric>
--
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