r45603 - in /packages/code-aster/aster/trunk/debian: ./ patches/
apalazzi-guest at users.alioth.debian.org
apalazzi-guest at users.alioth.debian.org
Tue Feb 26 14:03:02 UTC 2013
Author: apalazzi-guest
Date: Tue Feb 26 14:03:02 2013
New Revision: 45603
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45603
Log:
Variuos fixes and enhancements.
Added petsc support in mpi engines
Fixed bug that caused FTBFS (Closes: #701688)
Now postinst engine scripts update the file /etc/codeaster/aster
(related to bug #670567)
Support for METIS is now disabled because now it's used as a
library and it would push CA packages out of main; because of
that the default renumerator is 'MD' where it was previously
'METIS'.
Added hardening flags.
Added support for openmp parallelism both in serial and in parallel
version. Removed compile flags -fno-tree-dse (no longer necessary)
Removed compile flag -fno-stack-protector because is contrary to
the hardening flag -fstack-protector.
Postrm scripts now removes all the symlink created by postinst
(Closes: #700537)
Added:
packages/code-aster/aster/trunk/debian/patches/no_metis_default.diff
Modified:
packages/code-aster/aster/trunk/debian/README.Debian
packages/code-aster/aster/trunk/debian/changelog
packages/code-aster/aster/trunk/debian/code-aster-engine.postinst
packages/code-aster/aster/trunk/debian/code-aster-engine.postrm
packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst
packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm
packages/code-aster/aster/trunk/debian/config-mpi_32.txt
packages/code-aster/aster/trunk/debian/config-mpi_64.txt
packages/code-aster/aster/trunk/debian/control
packages/code-aster/aster/trunk/debian/patches/series
Modified: packages/code-aster/aster/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/README.Debian?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/README.Debian (original)
+++ packages/code-aster/aster/trunk/debian/README.Debian Tue Feb 26 14:03:02 2013
@@ -1,8 +1,12 @@
codeaster
---------
-The Code Aster binary has been built with _USE_MED_SHORT_INT;
-METIS, PETSC, ZMAT and HOMARD are not enabled or available
+The Code Aster binary has been built with _USE_MED_SHORT_INT.
+Unfortunately, on 64bit platforms this is bugged and reading
+MED files is impossible - see bug #687383; however it should
+work fine on 32bit platforms.
+
+METIS, ZMAT and HOMARD are not enabled or available
in Debian, so the relative test cases will fail.
By default codeaster is using python2.7
@@ -16,3 +20,7 @@
vers : STA11.3
vers : STA11.3_MPI
+
+There are some convergence problems sometimes when using the MULT_FRONT
+solver (that happens to be the default...); if you experience that you
+can change the solver - e.g. SOLVEUR=_F(... METHODE='MUMPS' ... ).
Modified: packages/code-aster/aster/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/changelog?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/changelog (original)
+++ packages/code-aster/aster/trunk/debian/changelog Tue Feb 26 14:03:02 2013
@@ -1,6 +1,14 @@
aster (11.3.0-2-2) unstable; urgency=low
- * Add hardening flags
+ * Added petsc support in mpi engines
+ * Fixed bug that caused FTBFS (Closes: #701688)
+ * Now postinst engine scripts update the file /etc/codeaster/aster
+ (related to bug #670567)
+ * Support for METIS is now disabled because now it's used as a
+ library and it would push CA packages out of main; because of
+ that the default renumerator is 'MD' where it was previously
+ 'METIS'
+ * Added hardening flags
* Added support for openmp parallelism both in serial and in
parallel version
* Removed compile flags -fno-tree-dse (no longer necessary)
@@ -9,7 +17,7 @@
* Postrm scripts now removes all the symlink created by
postinst (Closes: #700537)
- -- Andrea Palazzi <palazziandrea at yahoo.it> Sun, 17 Feb 2013 17:52:44 +0100
+ -- Andrea Palazzi <palazziandrea at yahoo.it> Tue, 26 Feb 2013 14:33:02 +0100
aster (11.3.0-2-1) unstable; urgency=low
Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.postinst?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postinst Tue Feb 26 14:03:02 2013
@@ -13,5 +13,8 @@
# add numbered version to available versions
ln -sf /var/lib/codeaster/STABLE /var/lib/codeaster/${CODEASTER_VERSION}
-
+
+# update /etc/codeaster/aster
+/usr/sbin/update-codeaster-engines > /etc/codeaster/aster
+
#DEBHELPER#
Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.postrm?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postrm Tue Feb 26 14:03:02 2013
@@ -10,5 +10,8 @@
rm -f /usr/lib/codeaster/${CODEASTER_VERSION}
rm -f /var/lib/codeaster/${CODEASTER_VERSION}
+
+# update /etc/codeaster/aster
+/usr/sbin/update-codeaster-engines > /etc/codeaster/aster
#DEBHELPER#
Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst Tue Feb 26 14:03:02 2013
@@ -13,5 +13,8 @@
# add numbered version to available versions
ln -sf /var/lib/codeaster/STABLE_MPI /var/lib/codeaster/${CODEASTER_VERSION}
-
+
+# update /etc/codeaster/aster
+/usr/sbin/update-codeaster-engines > /etc/codeaster/aster
+
#DEBHELPER#
Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm Tue Feb 26 14:03:02 2013
@@ -10,5 +10,8 @@
rm -f /usr/lib/codeaster/${CODEASTER_VERSION}
rm -f /var/lib/codeaster/${CODEASTER_VERSION}
+
+# update /etc/codeaster/aster
+/usr/sbin/update-codeaster-engines > /etc/codeaster/aster
#DEBHELPER#
Modified: packages/code-aster/aster/trunk/debian/config-mpi_32.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_32.txt?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_32.txt Tue Feb 26 14:03:02 2013
@@ -44,6 +44,7 @@
BIBL | hdf5 | 1.6.5 | -L/usr/lib -lhdf5
BIBL | zmat | 8.4 |
BIBL | mumps | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -lzmumps_ptscotch -lsmumps_ptscotch -lcmumps_ptscotch -lmumps_common_ptscotch -lpord_ptscotch -lesmumps -lscotch -lscotchmetis
+BIBL | petsc | ? | -lpetsc -lblas -llapack
BIBL | scotch | 4.0 | -L/usr/lib -lptscotch -lptscotcherr -lptscotcherrexit
BIBL | scalapack | 1.8 | -lscalapack-openmpi -lblacs-openmpi -lblacsF77init-openmpi
BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
@@ -51,7 +52,7 @@
BIBL | c++ | ? | -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
#
-DEFS | defined | ? | LINUX _USE_OPENMP _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI
+DEFS | defined | ? | LINUX _USE_OPENMP _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI _HAVE_PETSC H5PART_HAS_MPI
#
NOBUILD | option | ? |
#
@@ -73,7 +74,7 @@
F90 | f90 | ? | /usr/bin/gfortran
OPTF90_D | f90 | ? | -c -g -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS LDFLAGS
OPTF90_O | f90 | ? | -c -O2 -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS LDFLAGS
-INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0._mpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include -I/usr/include/mpi
+INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0._mpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include/petsc -I/usr/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
#
Modified: packages/code-aster/aster/trunk/debian/config-mpi_64.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_64.txt?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_64.txt Tue Feb 26 14:03:02 2013
@@ -45,13 +45,14 @@
BIBL | zmat | 8.4 |
BIBL | mumps | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -lzmumps_ptscotch -lsmumps_ptscotch -lcmumps_ptscotch -lmumps_common_ptscotch -lpord_ptscotch -lesmumps -lscotch -lscotchmetis
BIBL | scotch | 4.0 | -L/usr/lib -lptscotch -L/usr/lib -lptscotcherr -L/usr/lib -lptscotcherrexit
+BIBL | petsc | ? | -lpetsc -lblas -llapack
BIBL | scalapack | 1.8 | -lscalapack-openmpi -lblacs-openmpi -lblacsF77init-openmpi
BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
BIBL | mpi | 2 | -L/usr/lib -lmpi -lmpi_f77 -lmpi_f90
BIBL | c++ | ? | -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
#
-DEFS | defined | ? | LINUX64 _USE_OPENMP _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI _USE_MED_SHORT_INT
+DEFS | defined | ? | LINUX64 _USE_OPENMP_USE_MPI_HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI _USE_MED_SHORT_INT _HAVE_PETSC
#
NOBUILD | option | ? |
#
@@ -73,7 +74,7 @@
F90 | f90 | ? | /usr/bin/gfortran
OPTF90_D | f90 | ? | -v -c -g -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS LDFLAGS
OPTF90_O | f90 | ? | -v -c -O2 -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS LDFLAGS
-INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0_mpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include -I/usr/include/mpi
+INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0_mpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include/petsc -I/usr/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
#
Modified: packages/code-aster/aster/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/control?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/control (original)
+++ packages/code-aster/aster/trunk/debian/control Tue Feb 26 14:03:02 2013
@@ -11,6 +11,7 @@
python-all-dev, python-support, python-numpy, code-aster-run (>= 1.11.0),
code-aster-gui (>= 1.11.0),
libmumps-seq-dev (>= 4.10.0), libmumps-ptscotch-dev (>= 4.10.0),
+ libpetsc3.2-dev (>= 3.2),
libscotch-dev, libscotchmetis-dev, libptscotch-dev, libscalapack-mpi-dev,
libblacs-mpi-dev, mpi-default-dev, libscotchparmetis-dev
Homepage: http://www.code-aster.org/
Added: packages/code-aster/aster/trunk/debian/patches/no_metis_default.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/no_metis_default.diff?rev=45603&op=file
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/no_metis_default.diff (added)
+++ packages/code-aster/aster/trunk/debian/patches/no_metis_default.diff Tue Feb 26 14:03:02 2013
@@ -1,0 +1,46 @@
+--- a//STABLE/catapy/commande/assemblage.capy
++++ b//STABLE/catapy/commande/assemblage.capy
+@@ -63,7 +63,7 @@
+ SOLVEUR =FACT(statut='d',
+ METHODE =SIMP(statut='f',typ='TXM',defaut="MULT_FRONT",into=("MULT_FRONT","LDLT","GCPC","MUMPS","PETSC") ),
+ b_mult_front =BLOC(condition="METHODE=='MULT_FRONT'",fr="Paramètres associés à la méthode multifrontale",
+- RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="METIS" ),
++ RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="MD" ),
+ ),
+ b_ldlt =BLOC(condition="METHODE=='LDLT'",fr="Paramètres associés à la méthode LDLT",
+ RENUM =SIMP(statut='f',typ='TXM',into=("RCMK","SANS"),defaut="RCMK" ),
+--- a//STABLE/catapy/commande/macro_elas_mult.capy
++++ b//STABLE/catapy/commande/macro_elas_mult.capy
+@@ -56,7 +56,7 @@
+ METHODE =SIMP(statut='f',typ='TXM',defaut="MULT_FRONT",into=("MULT_FRONT","LDLT") ),
+ b_mult_front = BLOC ( condition = "METHODE == 'MULT_FRONT' ",
+ fr="Paramètres de la méthode multi frontale",
+- RENUM =SIMP(statut='f',typ='TXM',defaut="METIS",into=("MD","MDA","METIS") ),
++ RENUM =SIMP(statut='f',typ='TXM',defaut="MD",into=("MD","MDA","METIS") ),
+ ),
+ b_ldlt =BLOC(condition = "METHODE == 'LDLT' ",fr="Paramètres de la méthode LDLT",
+ RENUM =SIMP(statut='f',typ='TXM',defaut="RCMK",into=("RCMK","SANS") ),
+--- a//STABLE/catapy/commande/nume_ddl.capy
++++ b//STABLE/catapy/commande/nume_ddl.capy
+@@ -29,7 +29,7 @@
+ ),
+ METHODE =SIMP(statut='f',typ='TXM',defaut="MULT_FRONT",into=("MULT_FRONT","LDLT","GCPC","PETSC","MUMPS") ),
+ b_mult_front =BLOC(condition="METHODE=='MULT_FRONT'",fr="paramètres associés à la méthode multifrontale",
+- RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="METIS" ),
++ RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="MD" ),
+ ),
+ b_ldlt =BLOC(condition="METHODE=='LDLT'",fr="paramètres associés à la méthode LDLT",
+ RENUM =SIMP(statut='f',typ='TXM',into=("RCMK","SANS"),defaut="RCMK" ),
+--- a//STABLE/catapy/commun/c_solveur.capy
++++ b//STABLE/catapy/commun/c_solveur.capy
+@@ -229,8 +229,8 @@
+ # ----------------------------------------------------------------------------------------------------------------------------------
+
+ # RENUM
+- _BlocMF['RENUM'] = SIMP(statut='f', typ='TXM', defaut="METIS", into=("MD", "MDA", "METIS", ), )
+- _BlocFE['RENUM'] = SIMP(statut='f', typ='TXM', defaut="METIS", into=("MD", "MDA", "METIS", ), )
++ _BlocMF['RENUM'] = SIMP(statut='f', typ='TXM', defaut="MD", into=("MD", "MDA", "METIS", ), )
++ _BlocFE['RENUM'] = SIMP(statut='f', typ='TXM', defaut="MD", into=("MD", "MDA", "METIS", ), )
+
+ if _rcmk:
+ _into = ("RCMK", "SANS", )
Modified: packages/code-aster/aster/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/series?rev=45603&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/series (original)
+++ packages/code-aster/aster/trunk/debian/patches/series Tue Feb 26 14:03:02 2013
@@ -2,4 +2,4 @@
setup.cfg.diff
debian-install.diff
mpi.diff
-tests_without_homard.patch
+no_metis_default.diff
More information about the debian-science-commits
mailing list