r38492 - in /packages/code-aster/aster/trunk/debian: code-aster-mpi-engine.install config-mpi.txt control rules
apalazzi-guest at users.alioth.debian.org
apalazzi-guest at users.alioth.debian.org
Sun May 15 17:10:04 UTC 2011
Author: apalazzi-guest
Date: Sun May 15 17:10:02 2011
New Revision: 38492
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38492
Log:
Modified files to build mpi parallel packages
Modified:
packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install
packages/code-aster/aster/trunk/debian/config-mpi.txt
packages/code-aster/aster/trunk/debian/control
packages/code-aster/aster/trunk/debian/rules
Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install?rev=38492&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install Sun May 15 17:10:02 2011
@@ -5,7 +5,6 @@
usr/lib/codeaster/STA10.3_mpi/python*/commande
usr/lib/codeaster/STA10.3_mpi/python*/cata_ele.pickled
usr/lib/codeaster/STA10.3_mpi/python*/elements
-usr/lib/codeaster/STA10.3_mpi/config.txt
usr/lib/codeaster/STA10.3_mpi/config-py*.txt
usr/lib/codeaster/STA10.3_mpi/profile_py*.sh
usr/lib/codeaster/STA10.3_mpi/forma01a.export
Modified: packages/code-aster/aster/trunk/debian/config-mpi.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi.txt?rev=38492&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi.txt Sun May 15 17:10:02 2011
@@ -43,11 +43,11 @@
BIBL | med | 2.3.5 | -L/usr/lib -lmed
BIBL | hdf5 | 1.6.5 | -L/usr/lib -lhdf5
BIBL | zmat | 8.4 |
-BIBL | mumps | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -L/usr/lib -lzmumps_ptscotch -L/usr/lib -lsmumps_ptscotch -L/usr/lib -lcmumps_ptscotch -L/usr/lib -lmumps_common_ptscotch -L/usr/lib -lpord_ptscotch -L/usr/lib -lesmumps -lptscotch -lptscotcherr
+BIBL | mumps | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -L/usr/lib -lzmumps_ptscotch -L/usr/lib -lsmumps_ptscotch -L/usr/lib -lcmumps_ptscotch -L/usr/lib -lmumps_common_ptscotch -L/usr/lib -lpord_ptscotch -L/usr/lib -lesmumps -lscotch
BIBL | scotch | 4.0 | -L/usr/lib -lptscotch -L/usr/lib -lptscotcherr -L/usr/lib -lptscotcherrexit
-BIBL | scalapack | 1.8 | -lscalapack_openmpi -lblacs_openmpi -lblacsF77init_openmpi -lblacs_openmpi
+BIBL | scalapack | 1.8 | -lscalapack-openmpi -lblacs-openmpi -lblacsF77init-openmpi
BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lgfortran
-BIBL | mpi | 2 |
+BIBL | mpi | 2 | -L/usr/lib -lmpi -lmpi_f77 -lmpi_f90
BIBL | c++ | ? | -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
#
@@ -57,23 +57,23 @@
#
PYTHON | python | 2.4 | /usr/bin/pythonPYVER
#
-LINK | link | ? | /usr/bin/mpif90
-OPTL | link | ? |
+LINK | link | ? | /usr/bin/mpicc
+OPTL | link | ? | -fopenmp
#
CC | cc | ? | /usr/bin/mpicc
OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC
OPTC_O | cc | ? | -c -O2 -fno-stack-protector -fPIC
-INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA10.3_mpi/bibc/include -I/usr/include/pythonPYVER -I/usr/include/scotch
+INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA10.3_mpi/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include
#
F77 | f77 | ? | /usr/bin/mpif90
OPTF_D | f77 | ? | -c -g -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
OPTF_O | f77 | ? | -c -O2 -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF | include | ? |
+INCLF | include | ? | -I/usr/include
#
F90 | f90 | ? | /usr/bin/mpif90
OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
OPTF90_O | f90 | ? | -c -O2 -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF90 | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA10.3/bibf90/include_mumps-4.9.2
+INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA10.3_mpi/bibf90/include_mumps-4.9.2 -I/usr/include -I/usr/include
#
G77_AGLA | g77 | ? | unused
#
@@ -94,7 +94,7 @@
BINCMDE | bin | 11-04 | pythonPYVER/commande
BINELE | bin | 11-04 | pythonPYVER/elements
BINPICKLED | bin | 11-04 | pythonPYVER/cata_ele.pickled
-BINLIB_NODBG | bin | 11-04 | pythonPYVER/ib/libaster_mpi.a
+BINLIB_NODBG | bin | 11-04 | pythonPYVER/lib/libaster_mpi.a
BINLIB_DBG | bin | 11-04 | pythonPYVER/lib/libasterd_mpi.a
BINLIBF_NODBG | bin | 02-05 | pythonPYVER/lib/libferm_mpi.a
BINLIBF_DBG | bin | 02-05 | pythonPYVER/lib/libfermd_mpi.a
Modified: packages/code-aster/aster/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/control?rev=38492&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/control (original)
+++ packages/code-aster/aster/trunk/debian/control Sun May 15 17:10:02 2011
@@ -64,43 +64,43 @@
.
This package contains debugging information.
-#Package: code-aster-mpi-engine
-#Architecture: any
-#Section: contrib/science
-#Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, omniidl4
-#Suggests: eficas, gmsh, grace
-#Description: Code_Aster finite element program binary
-# Code_Aster is a finite element solver for partial differential equations. It
-# is particularly suited to problems involving heat transfer, mechanics, fluids,
-# and fluid-structure interactions. It is the product of Electricité de France
-# (EDF) and is ISO 9001-certified.
-# .
-# This package contains MPI aster version.
+Package: code-aster-mpi-engine
+Architecture: any
+Section: contrib/science
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, omniidl4
+Suggests: eficas, gmsh, grace
+Description: Code_Aster finite element program binary
+ Code_Aster is a finite element solver for partial differential equations. It
+ is particularly suited to problems involving heat transfer, mechanics, fluids,
+ and fluid-structure interactions. It is the product of Electricité de France
+ (EDF) and is ISO 9001-certified.
+ .
+ This package contains MPI aster version.
-#Package: code-aster-mpi-engine-dbg
-#Architecture: any
-#Section: contrib/debug
-#Depends: code-aster-mpi-engine (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-#Suggests: eficas, gmsh, grace
-#Description: Code_Aster finite element program binary
-# Code_Aster is a finite element solver for partial differential equations. It
-# is particularly suited to problems involving heat transfer, mechanics, fluids,
-# and fluid-structure interactions. It is the product of Electricité de France
-# (EDF) and is ISO 9001-certified.
-# .
-# This package contains debugging information for MPI aster version.
+Package: code-aster-mpi-engine-dbg
+Architecture: any
+Section: contrib/debug
+Depends: code-aster-mpi-engine (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: eficas, gmsh, grace
+Description: Code_Aster finite element program binary
+ Code_Aster is a finite element solver for partial differential equations. It
+ is particularly suited to problems involving heat transfer, mechanics, fluids,
+ and fluid-structure interactions. It is the product of Electricité de France
+ (EDF) and is ISO 9001-certified.
+ .
+ This package contains debugging information for MPI aster version.
-#Package: code-aster-mpi-engine-dev
-#Architecture: any
-#Section: contrib/devel
-#Depends: aster-mpi, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-#Description: Code_Aster finite element program binary
-# Code_Aster is a finite element solver for partial differential equations. It
-# is particularly suited to problems involving heat transfer, mechanics, fluids,
-# and fluid-structure interactions. It is the product of Electricité de France
-# (EDF) and is ISO 9001-certified.
-# .
-# This package contains files needed for aster MPI development.
+Package: code-aster-mpi-engine-dev
+Architecture: any
+Section: contrib/devel
+Depends: code-aster-mpi-engine, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Code_Aster finite element program binary
+ Code_Aster is a finite element solver for partial differential equations. It
+ is particularly suited to problems involving heat transfer, mechanics, fluids,
+ and fluid-structure interactions. It is the product of Electricité de France
+ (EDF) and is ISO 9001-certified.
+ .
+ This package contains files needed for aster MPI development.
Package: code-aster-test
Architecture: all
Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=38492&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Sun May 15 17:10:02 2011
@@ -25,8 +25,8 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/dtag
cp -r $(STA_VERSION) $(DEB_DESTDIR)/$(ASTER_ROOT)
- #mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/dtag
- #cp -r $(STA_VERSION)/* $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)
+ mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/dtag
+ cp -r $(STA_VERSION)/* $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)
# Export file replacements for running tests
sed -i "s:?ASTER_ROOT?:$(ASTER_ROOT):" $(ASTOUT_EXPORT)
sed -i "s:?ASTER_VERSION?:$(STA_VERSION):" $(ASTOUT_EXPORT)
@@ -89,18 +89,20 @@
#
# For MPI version
- #set -e; \
- #for v in $(PYVERS); do \
- # cp -f debian/profile.sh $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/profile_py$$v.sh; \
- # perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/profile_py$$v.sh; \
- # cp -f debian/config-mpi.txt $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
- # perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
- # perl -pi -e "s|DEB_DESTDIR|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
- # python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
- # find $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION) -name \*.o | xargs rm; \
- # perl -pi -e "s|$(DEB_DESTDIR)||g" $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
- # rm -f $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config.txt; \
- #done
+ set -ex; \
+ for v in $(PYVERS); do \
+ cp -f debian/profile.sh $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/profile_py$$v.sh; \
+ perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/profile_py$$v.sh; \
+ cp -f debian/config-mpi.txt $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|DEB_DESTDIR|$(DEB_DESTDIR)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|ASTER_ROOT|$(ASTER_ROOT)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make clean --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/dtag; \
+ python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ find $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION) -name \*.o | xargs rm; \
+ perl -pi -e "s|$(DEB_DESTDIR)||g" $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ done
#
# 4. change mumps_scotch to mumps_ptscotch?
# 5. disable openmp?
@@ -138,12 +140,12 @@
dh_installman -a
dh_installchangelogs -a
dh_strip -pcode-aster-engine --dbg-package=code-aster-engine-dbg
- #dh_strip -pcode-aster-mpi-engine --dbg-package=code-aster-mpi-engine-dbg
+ dh_strip -pcode-aster-mpi-engine --dbg-package=code-aster-mpi-engine-dbg
dh_link -a
dh_compress -a
dh_fixperms -a
dh_pysupport -pcode-aster-engine
- #dh_pysupport -pcode-aster-mpi-engine
+ dh_pysupport -pcode-aster-mpi-engine
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
More information about the debian-science-commits
mailing list