r44346 - in /packages/parms2/trunk/debian: ./ patches/ source/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Jan 6 14:42:30 UTC 2012
Author: trophime-guest
Date: Fri Jan 6 14:42:30 2012
New Revision: 44346
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44346
Log:
[svn-inject] Applying Debian modifications (2.2.dfsg-1) to trunk
Added:
packages/parms2/trunk/debian/ (with props)
packages/parms2/trunk/debian/README.Debian
packages/parms2/trunk/debian/README.source
packages/parms2/trunk/debian/changelog
packages/parms2/trunk/debian/compat
packages/parms2/trunk/debian/control
packages/parms2/trunk/debian/copyright
packages/parms2/trunk/debian/docs
packages/parms2/trunk/debian/libparms2-dev.install
packages/parms2/trunk/debian/libparms2-tests.install
packages/parms2/trunk/debian/libparms2.install
packages/parms2/trunk/debian/patches/
packages/parms2/trunk/debian/patches/debian-changes-2.2.dfsg-1
packages/parms2/trunk/debian/patches/dotest.patch
packages/parms2/trunk/debian/patches/examples.patch
packages/parms2/trunk/debian/patches/inputs.patch
packages/parms2/trunk/debian/patches/makefile.patch
packages/parms2/trunk/debian/patches/parmetis.patch
packages/parms2/trunk/debian/patches/series
packages/parms2/trunk/debian/rules (with props)
packages/parms2/trunk/debian/source/
packages/parms2/trunk/debian/source/format
Propchange: packages/parms2/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: packages/parms2/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/README.Debian?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/README.Debian (added)
+++ packages/parms2/trunk/debian/README.Debian Fri Jan 6 14:42:30 2012
@@ -1,0 +1,6 @@
+parms for Debian
+----------------
+
+initial build for squeeze
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Tue, 12 Oct 2010 13:01:21 +0200
Added: packages/parms2/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/README.source?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/README.source (added)
+++ packages/parms2/trunk/debian/README.source Fri Jan 6 14:42:30 2012
@@ -1,0 +1,9 @@
+parms for Debian
+----------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+
Added: packages/parms2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/changelog?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/changelog (added)
+++ packages/parms2/trunk/debian/changelog Fri Jan 6 14:42:30 2012
@@ -1,0 +1,5 @@
+parms2 (2.2.dfsg-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Tue, 12 Oct 2010 13:01:21 +0200
Added: packages/parms2/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/compat?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/compat (added)
+++ packages/parms2/trunk/debian/compat Fri Jan 6 14:42:30 2012
@@ -1,0 +1,1 @@
+7
Added: packages/parms2/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/control?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/control (added)
+++ packages/parms2/trunk/debian/control Fri Jan 6 14:42:30 2012
@@ -1,0 +1,67 @@
+Source: parms2
+Section: libs
+Priority: extra
+Maintainer: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt,
+ libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so, libpetsc3.1-dev,
+ libscotchmetis-dev, libscotchparmetis-dev,
+ mpi-default-dev, tcsh
+Standards-Version: 3.9.1
+Homepage: http://www-users.cs.umn.edu/~saad/software/pARMS/
+#Vcs-Git: git://git.debian.org/collab-maint/parms.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/parms.git;a=summary
+
+Package: libparms2
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: parallel Algebraic Recursive Multilevel Solvers
+ pARMS is a library of parallel solvers for distributed sparse
+ linear systems of equations. It is based on a preconditioned
+ Krylov subspace approach, using a domain decomposition viewpoint.
+ The plural in "Solvers" is due to the fact that pARMS offers a
+ large selection of preconditioners for distributed sparse linear
+ systems and a few of the best known accelerators.
+ The basic methodology used relies on a Recursive Multi-level ILU
+ factorization wich allows one to develop many of the standard
+ domain-decomposition type iterative solvers in a single framework.
+ .
+ This package contains parms 2 version
+
+Package: libparms2-dev
+Architecture: any
+Section: libdevel
+Depends: libparms2 (= ${binary:Version}), ${misc:Depends}
+Description: parallel Algebraic Recursive Multilevel Solvers - dev
+ pARMS is a library of parallel solvers for distributed sparse
+ linear systems of equations. It is based on a preconditioned
+ Krylov subspace approach, using a domain decomposition viewpoint.
+ The plural in "Solvers" is due to the fact that pARMS offers a
+ large selection of preconditioners for distributed sparse linear
+ systems and a few of the best known accelerators.
+ The basic methodology used relies on a Recursive Multi-level ILU
+ factorization wich allows one to develop many of the standard
+ domain-decomposition type iterative solvers in a single framework.
+ .
+ This package contains parms 2 version
+ .
+ This package contains files needed for development
+
+Package: libparms2-tests
+Architecture: all
+Section: doc
+Depends: libparms2-dev, ${shlibs:Depends}, ${misc:Depends}, tcsh
+Description: parallel Algebraic Recursive Multilevel Solvers - doc
+ pARMS is a library of parallel solvers for distributed sparse
+ linear systems of equations. It is based on a preconditioned
+ Krylov subspace approach, using a domain decomposition viewpoint.
+ The plural in "Solvers" is due to the fact that pARMS offers a
+ large selection of preconditioners for distributed sparse linear
+ systems and a few of the best known accelerators.
+ The basic methodology used relies on a Recursive Multi-level ILU
+ factorization wich allows one to develop many of the standard
+ domain-decomposition type iterative solvers in a single framework.
+ .
+ This package contains parms 2 version
+ .
+ This package contains tests for pamrs.
Added: packages/parms2/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/copyright?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/copyright (added)
+++ packages/parms2/trunk/debian/copyright Fri Jan 6 14:42:30 2012
@@ -1,0 +1,50 @@
+This work was packaged for Debian by:
+
+ Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> on Tue, 12 Oct 2010 13:01:21 +0200
+
+It was downloaded from:
+
+ http://www-users.cs.umn.edu/~saad/software/pARMS/
+
+Upstream Authors:
+
+ Masha Sosonkina <masha at scl.ameslab.gov>
+ Daniel Osei Kuffuor <dosei at cs.umn.edu>
+ Zhongze Li (original developer)
+ Yousef Saad <saad at cs.umn.edu>
+
+Copyright:
+
+ Copyright (C) 2004, 2006, the Regents of the University of Minnesota
+
+License:
+
+ Copyright (C) 2004, 2006, the Regents of the University of Minnesota
+
+ pARMS is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; version 2.1 of the License.
+
+ A copy of the licencing agreement is attached in the file LGPL. For
+ additional information contact the Free Software Foundation Inc., 59
+ Temple Place - Suite 330, Boston, MA 02111, USA or visit the web-site
+
+ http://www.gnu.org/copyleft/lesser.html
+
+
+ DISCLAIMER
+ ----------
+
+ pARMS is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ For more information contact saad at cs.umn.edu
+
+ see /usr/share/common-licenses/LGPL-2.1
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+
Added: packages/parms2/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/docs?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/docs (added)
+++ packages/parms2/trunk/debian/docs Fri Jan 6 14:42:30 2012
@@ -1,0 +1,1 @@
+README
Added: packages/parms2/trunk/debian/libparms2-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/libparms2-dev.install?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/libparms2-dev.install (added)
+++ packages/parms2/trunk/debian/libparms2-dev.install Fri Jan 6 14:42:30 2012
@@ -1,0 +1,3 @@
+LIB/libparms2.a usr/lib
+LIB/libparms2.so usr/lib
+INCLUDE/* usr/include/libparms2/
Added: packages/parms2/trunk/debian/libparms2-tests.install
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/libparms2-tests.install?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/libparms2-tests.install (added)
+++ packages/parms2/trunk/debian/libparms2-tests.install Fri Jan 6 14:42:30 2012
@@ -1,0 +1,2 @@
+TESTS usr/share/libparms2
+makefile.in usr/share/libparms2
Added: packages/parms2/trunk/debian/libparms2.install
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/libparms2.install?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/libparms2.install (added)
+++ packages/parms2/trunk/debian/libparms2.install Fri Jan 6 14:42:30 2012
@@ -1,0 +1,1 @@
+LIB/libparms2.so.1 usr/lib
Added: packages/parms2/trunk/debian/patches/debian-changes-2.2.dfsg-1
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/debian-changes-2.2.dfsg-1?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/patches/debian-changes-2.2.dfsg-1 (added)
+++ packages/parms2/trunk/debian/patches/debian-changes-2.2.dfsg-1 Fri Jan 6 14:42:30 2012
@@ -1,0 +1,63 @@
+Description: Upstream changes introduced in version 2.2.dfsg-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ parms2 (2.2.dfsg-1) unstable; urgency=low
+ .
+ * Initial release
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- parms2-2.2.dfsg.orig/TESTS/GRIDS/inputs
++++ parms2-2.2.dfsg/TESTS/GRIDS/inputs
+@@ -1,5 +1,5 @@
+-lsch_arms
+-0 iov (level of overlap)
++sch_sgs
++1 iov (level of overlap)
+ 0.01 eps(tolerance for inner iteration)
+ 0.0001 eps1(tolerance for outer iteration)
+ 4 nlev(number of levels)
+@@ -7,8 +7,8 @@ lsch_arms
+ 0.1 tolind(tolerance used in independent set)
+ 100 im (krylov subspace size for outer iteration)
+ 200 maxits (outer fgmres)
+-5 kim (krylov subspace size for inner iteration)
+-5 itsgmr(inner fgmres)
++0 kim (krylov subspace size for inner iteration)
++0 itsgmr(inner fgmres)
+ 20 lfil0(ilut, iluk and arms for lfil[0-3])
+ 20 lfil4(schur)
+ 20 lfil5(ILUT L, ILUT U)
+@@ -18,4 +18,4 @@ lsch_arms
+ 1 multi-coloring or not(1 multicoloring)
+ 2 mprocx (number of processors in the x direction)
+ 2 mprocy (number of processors in the y direction)
+-40 nmesh, nx = nmesh*mprocx
++100 nmesh, nx = nmesh*mprocx
+--- parms2-2.2.dfsg.orig/TESTS/GENERAL/inputs
++++ parms2-2.2.dfsg/TESTS/GENERAL/inputs
+@@ -2,7 +2,7 @@
+ 0 !iov 1 indicates overlap, 0 = no overlap./.
+ 0 !scale :=0, do not scale system; : = 1, scale system
+ 0 !unsym :=0, symmetric pattern; :=1, nonsym pattern
+-add_arms
++sch_sgs
+ 0.01 !eps(tolerance for inner iteration)
+ 0.000000001 !eps1(tolerance for outer iteration)
+ 4 !nlev(number of levels)
Added: packages/parms2/trunk/debian/patches/dotest.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/dotest.patch?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/patches/dotest.patch (added)
+++ packages/parms2/trunk/debian/patches/dotest.patch Fri Jan 6 14:42:30 2012
@@ -1,0 +1,95 @@
+Index: parms2-2.2.dfsg/TESTS/DOTESTS
+===================================================================
+--- parms2-2.2.dfsg.orig/TESTS/DOTESTS 2011-03-25 15:37:30.000000000 +0100
++++ parms2-2.2.dfsg/TESTS/DOTESTS 2011-03-25 15:41:41.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/csh
++#!/usr/bin/tcsh
+ #-----------------------------------------------------------------------
+ # DOTESTS TESTS ALL PRECONDITIONERS ON TEST CODES IN BOTH GRIDS AND
+ # GENERAL. OUTPUT FILES IN GENERAL_out and GRIDS_out in TESTS/OUTPUTS
+@@ -14,7 +14,7 @@
+ # machines mpirun is called
+ # currently set automatically using uname
+ #-----------------------------------------------------------------------
+-set np=4
++set np=4
+ set part_name=dse
+ set machine=`uname -s`
+ #
+@@ -38,21 +38,6 @@
+ endif
+ echo ' Results will be written in the ./OUTPUTS directory'
+ #
+-if ( $machine != AIX ) then
+- echo ' ---> Make sure you have correct hostfiles in GRIDS and GENERAL.\n Please, edit the file named "hostfile".'
+- while (1)
+- echo -n ' Proceed with testing [yes/no]? '
+- set ans = $<
+- switch ($ans)
+- case no:
+- exit
+- case yes:
+- break
+- default
+- continue
+- endsw
+- end
+-endif
+ echo ' ---> checking whether to make library'
+
+ #
+@@ -154,7 +139,7 @@
+ if ( $machine == AIX ) then
+ poe dd-HB-simple.ex -procs $np >> temp
+ else
+- mpirun -np $np -machinefile hostfile dd-HB-simple.ex >> temp
++ mpirun -np $np dd-HB-simple.ex >> temp
+ endif
+ endif
+ #
+@@ -164,7 +149,7 @@
+ if ( $machine == AIX ) then
+ poe dd-HB-dse.ex -procs $np >> temp
+ else
+- mpirun -np $np -machinefile hostfile dd-HB-dse.ex >> temp
++ mpirun -np $np dd-HB-dse.ex >> temp
+ endif
+ #
+ if($part_name == metis) then
+@@ -187,7 +172,7 @@
+ if ( $machine == AIX ) then
+ poe dd-HB-parmetis.ex -procs $np >> temp
+ else
+- mpirun -np $np -machinefile hostfile dd-HB-parmetis.ex >> temp
++ mpirun -np $np dd-HB-parmetis.ex >> temp
+ endif
+ endif
+ end
+@@ -250,7 +235,7 @@
+ if ( $machine == AIX ) then
+ poe dd-grid.ex -procs $np >> temp
+ else
+- mpirun -np $np -machinefile hostfile dd-grid.ex >> temp
++ mpirun -np $np dd-grid.ex >> temp
+ endif
+ #
+
+@@ -260,7 +245,7 @@
+ if ( $machine == AIX ) then
+ poe dd-grid-edge.ex -procs $np >> temp
+ else
+- mpirun -np $np -machinefile hostfile dd-grid.ex >> temp
++ mpirun -np $np dd-grid.ex >> temp
+ endif
+ #
+ echo ' ' >> temp
+@@ -269,7 +254,7 @@
+ if ( $machine == AIX ) then
+ poe dd-grid-solver.ex -procs $np >> temp
+ else
+- mpirun -np $np -machinefile hostfile dd-grid-solver.ex >> temp
++ mpirun -np $np dd-grid-solver.ex >> temp
+ endif
+ #
+ end
Added: packages/parms2/trunk/debian/patches/examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/examples.patch?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/patches/examples.patch (added)
+++ packages/parms2/trunk/debian/patches/examples.patch Fri Jan 6 14:42:30 2012
@@ -1,0 +1,88 @@
+Index: parms2-2.2/TESTS/GENERAL/makefile
+===================================================================
+--- parms2-2.2.orig/TESTS/GENERAL/makefile 2011-03-18 15:17:00.000000000 +0100
++++ parms2-2.2/TESTS/GENERAL/makefile 2011-03-18 15:17:16.000000000 +0100
+@@ -13,34 +13,34 @@
+
+ default: lib dd-HB-dse.ex
+
+-lib: $(LIB)
+- (cd $(PARMS_ROOT) ; make)
++lib: ../..$(LIB_DIR)/libparms2$(DBG).a
++ (cd ../..$(PARMS_ROOT) ; make)
+
+ dd-HB-simple.ex: $(OBJ0)
+- $(LINKER) $(LINK_OPT) $(OBJ0) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ0) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) -o dd-HB-simple.ex
+
+ dd-HB-dse.ex: lib $(OBJ1)
+- $(LINKER) $(LINK_OPT) $(OBJ1) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ1) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) -o dd-HB-dse.ex
+
+ dd-multiHB-dse.ex: lib $(OBJ11)
+- $(LINKER) $(LINK_OPT) $(OBJ11) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ11) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) -o dd-multiHB-dse.ex
+
+ dd-HB-1dse.ex: lib $(OBJ12)
+- $(LINKER) $(LINK_OPT) $(OBJ12) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ12) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) -o dd-HB-1dse.ex
+
+
+ dd-HB-metis.ex: lib $(OBJ2)
+- $(LINKER) $(LINK_OPT) $(OBJ2) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ2) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(INCLUDE_METIS) $(METIS_HOME) $(LIB_METIS) \
+ $(LFLAGS_BLAS) $(LIBS_BLAS) -o dd-HB-metis.ex
+
+ dd-HB-parmetis.ex: $(OBJ3)
+- $(LINKER) $(LINK_OPT) $(OBJ3) -L$(LIB_DIR) -lparms$(DBG)
+- $(LIBS_MPI) -L$(PARMETIS_HOME) $(INCLUDE_PARMETIS) $(LIB_PARMETIS) \
++ $(LINKER) $(LINK_OPT) $(OBJ3) ../..$(LIB_DIR)/libparms2$(DBG).a \
++ $(LIBS_MPI) $(PARMETIS_HOME) $(INCLUDE_PARMETIS) $(LIB_PARMETIS) \
+ $(LFLAGS_BLAS) $(LIBS_BLAS) -o dd-HB-parmetis.ex
+
+ #
+Index: parms2-2.2/TESTS/GRIDS/makefile
+===================================================================
+--- parms2-2.2.orig/TESTS/GRIDS/makefile 2011-03-18 15:17:00.000000000 +0100
++++ parms2-2.2/TESTS/GRIDS/makefile 2011-03-18 15:17:20.000000000 +0100
+@@ -6,7 +6,7 @@
+ OBJ3 = dd-grid-edge.o setpar.o fdmat.o functs.o
+ OBJ4 = dd-grid-simple.o setpar.o fdmat.o functs.o
+
+-LIB_DIR = $(PARMS_ROOT)/LIB
++LIB_DIR = $(PARMS_ROOT)/LIB
+
+ default: lib dd-grid.ex
+
+@@ -14,22 +14,22 @@
+ (cd $(PARMS_ROOT); make)
+
+ dd-grid.ex :$(OBJ1)
+- $(LINKER) $(LINK_OPT) $(OBJ1) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ1) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) \
+ -o $@
+
+ dd-grid-solver.ex: $(OBJ2)
+- $(LINKER) $(LINK_OPT) $(OBJ2) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ2) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) \
+ -o $@
+
+ dd-grid-edge.ex: $(OBJ3)
+- $(LINKER) $(LINK_OPT) $(OBJ3) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ3) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) \
+ -o $@
+
+ dd-grid-simple.ex: $(OBJ4)
+- $(LINKER) $(LINK_OPT) $(OBJ4) -L$(LIB_DIR) -lparms$(DBG) \
++ $(LINKER) $(LINK_OPT) $(OBJ4) ../..$(LIB_DIR)/libparms2$(DBG).a \
+ $(LIBS_MPI) $(LFLAGS_BLAS) $(LIBS_BLAS) \
+ -o $@
+ clean:
Added: packages/parms2/trunk/debian/patches/inputs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/inputs.patch?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/patches/inputs.patch (added)
+++ packages/parms2/trunk/debian/patches/inputs.patch Fri Jan 6 14:42:30 2012
@@ -1,0 +1,38 @@
+--- parms2-2.2.dfsg.orig/TESTS/GRIDS/inputs
++++ parms2-2.2.dfsg/TESTS/GRIDS/inputs
+@@ -1,5 +1,5 @@
+-lsch_arms
+-0 iov (level of overlap)
++sch_sgs
++1 iov (level of overlap)
+ 0.01 eps(tolerance for inner iteration)
+ 0.0001 eps1(tolerance for outer iteration)
+ 4 nlev(number of levels)
+@@ -7,8 +7,8 @@ lsch_arms
+ 0.1 tolind(tolerance used in independent set)
+ 100 im (krylov subspace size for outer iteration)
+ 200 maxits (outer fgmres)
+-5 kim (krylov subspace size for inner iteration)
+-5 itsgmr(inner fgmres)
++0 kim (krylov subspace size for inner iteration)
++0 itsgmr(inner fgmres)
+ 20 lfil0(ilut, iluk and arms for lfil[0-3])
+ 20 lfil4(schur)
+ 20 lfil5(ILUT L, ILUT U)
+@@ -18,4 +18,4 @@ lsch_arms
+ 1 multi-coloring or not(1 multicoloring)
+ 2 mprocx (number of processors in the x direction)
+ 2 mprocy (number of processors in the y direction)
+-40 nmesh, nx = nmesh*mprocx
++100 nmesh, nx = nmesh*mprocx
+--- parms2-2.2.dfsg.orig/TESTS/GENERAL/inputs
++++ parms2-2.2.dfsg/TESTS/GENERAL/inputs
+@@ -2,7 +2,7 @@
+ 0 !iov 1 indicates overlap, 0 = no overlap./.
+ 0 !scale :=0, do not scale system; : = 1, scale system
+ 0 !unsym :=0, symmetric pattern; :=1, nonsym pattern
+-add_arms
++sch_sgs
+ 0.01 !eps(tolerance for inner iteration)
+ 0.000000001 !eps1(tolerance for outer iteration)
+ 4 !nlev(number of levels)
Added: packages/parms2/trunk/debian/patches/makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/makefile.patch?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/patches/makefile.patch (added)
+++ packages/parms2/trunk/debian/patches/makefile.patch Fri Jan 6 14:42:30 2012
@@ -1,0 +1,86 @@
+Index: parms2-2.2/makefile
+===================================================================
+--- parms2-2.2.orig/makefile 2011-03-18 15:02:34.000000000 +0100
++++ parms2-2.2/makefile 2011-03-18 15:02:35.000000000 +0100
+@@ -4,7 +4,7 @@
+ # TESTS/GRIDS or TESTS/GENERAL and see README files..
+ include makefile.in
+
+-LIB = ./LIB/libparms$(DBG).a
++LIB = ./LIB/libparms2$(DBG).a
+ DIRS = ./ ./INCLUDE ./LIB ./SRC ./SRC/ARMS ./SRC/PSPARSLIB \
+ ./SRC/DGMR ./SRC/SPKIT ./TESTS \
+ ./TESTS/GENERAL ./TESTS/GRIDS \
+@@ -47,9 +47,11 @@
+ if [ ! -d LIB ]; then \
+ mkdir LIB; \
+ fi
+- $(AR) $(ARFLAGS) $(LIB) $(OBJ)
++ $(AR) $(ARFLAGS) $(LIB) $(OBJ)
++ $(CC) -shared $(CFLAGS) -Wl,-soname,libparms2$(DBG).so.1 -o ./LIB/libparms2$(DBG).so.1 $(OBJ)
++ cd ./LIB && ln -s libparms2$(DBG).so.1 libparms2$(DBG).so
+
+-tests: $(LIB)
++tests: $(LIB) metis parmetis
+ (cd TESTS/GRIDS;make dd-grid-simple.ex dd-grid.ex \
+ dd-grid-edge.ex dd-grid-solver.ex)
+ (cd TESTS/GENERAL;make dd-HB-simple.ex dd-HB-dse.ex)
+@@ -60,6 +62,9 @@
+ parmetis: $(LIB)
+ (cd TESTS/GENERAL;make dd-HB-parmetis.ex)
+
++runtest: tests metis parmetis
++ cd TESTS; tcsh ./DOTESTS ALL
++
+ .c.o:
+ $(CC) $(CFLAGS) $(MPI_INC) $< -c -o $@
+
+Index: parms2-2.2/makefile.in
+===================================================================
+--- parms2-2.2.orig/makefile.in 2011-03-18 15:02:34.000000000 +0100
++++ parms2-2.2/makefile.in 2011-03-18 15:04:32.000000000 +0100
+@@ -7,11 +7,11 @@
+
+ # variable to declare optimization level
+ # use '-g' to create libparms for debugging purposes
+-DBG = -g
++DBG =
+
+ # to make pARMS name compatible with other linear algebra software
+ # such as PETSc, assign DCHNAME as: DCHNAME = -DPETSC
+-DCHNAME =
++DCHNAME =
+
+ # archive command
+ AR = ar
+@@ -22,13 +22,15 @@
+ # Options for a generic LINUX configuration
+ #################################
+ CC = mpicc
+- CFLAGS = $(DBG) $(DARCH) $(DCHNAME) -std=c99
+- INCLUDE_METIS = -I$(HOME)/metis-4.0/Lib
+- METIS_HOME = -L$(HOME)/Libs
++ CFLAGS = $(DBG) $(DARCH) $(DCHNAME) -std=c99 -fPIC
++ INCLUDE_METIS = -I/usr/include/metis
++ METIS_HOME = -lscotch
++ INCLUDE_PARMETIS = -I/usr/include/parmetis
++ PARMETIS_HOME = -lscotch -lptscotch
+
+ # fortran compiler / linker
+ FC = mpif77
+- FFLAGS = $(DBG) $(DARCH) -I/usr/include
++ FFLAGS = $(DBG) $(DARCH) -I/usr/include -fPIC
+ #
+ # the directory of MPI library. for example -L/usr/local/mpich/lib
+ LFLAGS_MPI =
+@@ -37,8 +39,8 @@
+ # the directory of BLAS
+ LFLAGS_BLAS =
+ # the BLAS library
+- LIBS_BLAS = -L/scratch/masha/GotoBLAS -lgoto -lpthread
++ LIBS_BLAS = -lblas
+ #LINKER
+ LINKER = $(FC)
+ #LINK OPTION
+- LINK_OPT = -nofor_main
++ LINK_OPT =
Added: packages/parms2/trunk/debian/patches/parmetis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/parmetis.patch?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/patches/parmetis.patch (added)
+++ packages/parms2/trunk/debian/patches/parmetis.patch Fri Jan 6 14:42:30 2012
@@ -1,0 +1,13 @@
+Index: parms2-2.2/TESTS/GENERAL/dd-HB-parmetis.c
+===================================================================
+--- parms2-2.2.orig/TESTS/GENERAL/dd-HB-parmetis.c 2011-03-18 14:59:38.000000000 +0100
++++ parms2-2.2/TESTS/GENERAL/dd-HB-parmetis.c 2011-03-18 14:59:54.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include "../../INCLUDE/psparslib.h"
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../../ParMetis-3.0/METISLib/metis.h"
++#include "parmetis.h"
+ #define BUFLEN 100
+
+ #if defined(SP2) || defined(RS6000)
Added: packages/parms2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/series?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/patches/series (added)
+++ packages/parms2/trunk/debian/patches/series Fri Jan 6 14:42:30 2012
@@ -1,0 +1,5 @@
+makefile.patch
+examples.patch
+dotest.patch
+parmetis.patch
+inputs.patch
Added: packages/parms2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/rules?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/rules (added)
+++ packages/parms2/trunk/debian/rules Fri Jan 6 14:42:30 2012
@@ -1,0 +1,42 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+
+# Add here any variable or target overrides you need.
+CFLAGS += -fPIC -DPETSC
+CFFLAGS += -fPIC -DPETSC
+FFLAGS += -fPIC
+
+# PETSC_DIR is the location of PETSc.
+export PETSC_DIR=/usr/lib/petscdir/3.1
+export PETSC_ARCH=linux-gnu-c-opt
+
+
+# no check for this software
+DEB_MAKE_CHECK_TARGET := runtest
+DEB_MAKE_BUILD_TARGET := all
+
+common-install-prehook-indep::
+ find TESTS -name \*.o | xargs -r rm
+ find TESTS -name \*.ex | xargs -r rm
+ find TESTS -name \*.cmd | xargs -r rm
+ find TESTS -name \*.pbs | xargs -r rm
+ find TESTS -name hostfile\* | xargs -r rm
+
+ find TESTS -name \*.[cfh] | xargs -r chmod ugo-x
+ find TESTS -name \*[iI]nputs\* | xargs -r chmod ugo-x
+ find . -name makefile\* | xargs -r chmod ugo-x
+ find TESTS -name README\* | xargs -r chmod ugo-x
+ find TESTS -name \*.inp | xargs -r chmod ugo-x
+ find TESTS -name SHERMAN\* | xargs -r chmod ugo-x
+ find TESTS -name inHB-\* | xargs -r chmod ugo-x
+ find TESTS -name inmatrix | xargs -r chmod ugo-x
+
+clean::
+ find . -name \*.o | xargs -r rm
+ -rm LIB/libparms2.*
+ -find . -name \*.ex | xargs -r rm
+ -rm -rf TESTS/OUTPUTS
Propchange: packages/parms2/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/parms2/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/source/format?rev=44346&op=file
==============================================================================
--- packages/parms2/trunk/debian/source/format (added)
+++ packages/parms2/trunk/debian/source/format Fri Jan 6 14:42:30 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list