[scalapack] 18/29: Import Debian changes 1.8.0-8
Muammar El Khatib
muammar at moszumanska.debian.org
Sun Jun 11 16:16:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
muammar pushed a commit to branch master
in repository scalapack.
commit 122d3b25a80c2bb5d6390b2dd2da5bcadfa95414
Author: Muammar El Khatib <muammar at debian.org>
Date: Thu Dec 22 16:58:01 2011 -0500
Import Debian changes 1.8.0-8
scalapack (1.8.0-8) unstable; urgency=low
* Added mpich2 targets in debian/rules. Thanks to Adam C Powell IV for
providing a patch. (Closes: 652313)
---
debian/changelog | 25 ++++++----
debian/control | 12 ++---
debian/patches/01_SLmake.inc.patch | 33 ++++++++++---
debian/rules | 96 ++++++++++++++++++++++++++++++++++----
4 files changed, 135 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 50d426a..abb5f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+scalapack (1.8.0-8) unstable; urgency=low
+
+ * Added mpich2 targets in debian/rules. Thanks to Adam C Powell IV for
+ providing a patch. (Closes: 652313)
+
+ -- Muammar El Khatib <muammar at debian.org> Thu, 22 Dec 2011 16:58:01 -0500
+
scalapack (1.8.0-7) unstable; urgency=low
- * Test command execution failure caused due to incompatible file location in
+ * Test command execution failure caused due to incompatible file location in
package scalapack-test-common has been fixed adding symbolic links pointing
- files to the correct location. (Closes: #588404) Files cannot be moved
+ files to the correct location. (Closes: #588404) Files cannot be moved
directly to /usr/lib/scalapack becasuse they are .dat files. Refer to
- Filesystem Hierarchy Standard | /usr/share : Architecture-independent data
+ Filesystem Hierarchy Standard | /usr/share : Architecture-independent data
for more information.
* Switch to dpkg-source 3.0 (quilt) format.
* Maintainer's mail has been changed.
@@ -15,7 +22,7 @@ scalapack (1.8.0-7) unstable; urgency=low
scalapack (1.8.0-6) unstable; urgency=low
- * debian/rules file has been updated for linking against blas and lapack
+ * debian/rules file has been updated for linking against blas and lapack
instead of blas-3gf and lapack-3. With this change, scalapack does not fail
to build from source. (Closes: #577895)
* debian/source directory has been created for specifying 1.0 version in the
@@ -35,7 +42,7 @@ scalapack (1.8.0-4) unstable; urgency=low
* Bumped standards version to 3.8.3.
* scalapack-pvm-test does not depend on scalapack1-pvm anymore. To accomplish
- this, the debian/shlibs.local file has been updated (Closes: #549707)
+ this, the debian/shlibs.local file has been updated (Closes: #549707)
* Typo in scalapack-test-common's description has been fixed.
(Closes: #557848)
@@ -82,7 +89,7 @@ scalapack (1.8.0-1) unstable; urgency=low
scalapack (1.7.4-2) unstable; urgency=low
- * Problems with symbolic link references the wrong file
+ * Problems with symbolic link references the wrong file
have been fixed. Closes: #380140
* Updated build dependency to debhelper >= 4.
* Moved architecture independent test input data to /usr/share/scalapack.
@@ -184,7 +191,7 @@ scalapack (1.6-16) unstable; urgency=low
scalapack (1.6-15) unstable; urgency=low
- * The previous upload did not contain the data files in
+ * The previous upload did not contain the data files in
scalapack-test-common. Closes: #84703
-- Philipp Frauenfelder <pfrauenf at herodot.math.ethz.ch> Mon, 5 Feb 2001 10:34:46 +0100
@@ -253,7 +260,7 @@ scalapack (1.6-6) unstable; urgency=low
Thanks to Camm Maguire <camm at enhanced.com>
* Removed v2 of PBLAS again. Need to investigate some missing symbols.
* Packages for lam, mpich and pvm can be installed together
-
+
-- Philipp Frauenfelder <pfrauenf at debian.org> Wed, 13 Oct 1999 14:30:29 +0200
scalapack (1.6-5) unstable; urgency=low
@@ -261,7 +268,7 @@ scalapack (1.6-5) unstable; urgency=low
* Changed priority from optional to extra to fix dependency bug.
* Bumped standards version to 3.0.1.
* Moved to debhelper v2.
- * Found a old reference to lam in the Makefile and replaced it
+ * Found a old reference to lam in the Makefile and replaced it
with mpich.
-- Philipp Frauenfelder <pfrauenf at debian.org> Wed, 1 Sep 1999 09:34:31 +0200
diff --git a/debian/control b/debian/control
index d139faf..414190b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.netlib.org/scalapack/
Package: libscalapack-mpi1
Section: libs
Architecture: any
-Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
Conflicts: scalapack1-mpich, scalapack1-lam
Replaces: scalapack1-mpich, scalapack1-lam
Suggests: scalapack-doc
@@ -26,7 +26,7 @@ Description: Scalable Linear Algebra Package - Shared libs. for MPI
Package: libscalapack-mpi-dev
Section: libdevel
Architecture: any
-Depends: libscalapack-mpi1 (= ${binary:Version}), libblacs-mpi-dev, ${misc:Depends}
+Depends: libscalapack-mpi1 (= ${binary:Version}), libblacs-mpi-dev, ${misc:Depends}
Conflicts: scalapack-mpich-dev, scalapack-lam-dev
Replaces: scalapack-mpich-dev, scalapack-lam-dev
Suggests: scalapack-doc
@@ -46,7 +46,7 @@ Description: Scalable Linear Algebra Package - Dev. files for MPICH
Package: scalapack-mpi-test
Section: math
Architecture: any
-Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
Conflicts: scalapack-mpich-test, scalapack-lam-test
Replaces: scalapack-mpich-test, scalapack-lam-test
Suggests: scalapack-doc
@@ -66,7 +66,7 @@ Description: Scalable Linear Algebra Package - Test files for MPICH
Package: libscalapack-pvm1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: scalapack-doc
Conflicts: scalapack1-pvm
Replaces: scalapack1-pvm
@@ -85,7 +85,7 @@ Description: Scalable Linear Algebra Package - Shared libs. for PVM
Package: libscalapack-pvm-dev
Section: libdevel
Architecture: any
-Depends: libscalapack-pvm1 (= ${binary:Version}), blacs-pvm-dev, pvm-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libscalapack-pvm1 (= ${binary:Version}), blacs-pvm-dev, pvm-dev, ${shlibs:Depends}, ${misc:Depends}
Suggests: scalapack-doc
Description: Scalable Linear Algebra Package - Dev. files for PVM
ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
@@ -102,7 +102,7 @@ Description: Scalable Linear Algebra Package - Dev. files for PVM
Package: scalapack-pvm-test
Section: math
Architecture: any
-Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
Suggests: scalapack-doc
Description: Scalable Linear Algebra Package - Test files for PVM
ScaLAPACK is the parallel version of LAPACK and is used on Beowulf type
diff --git a/debian/patches/01_SLmake.inc.patch b/debian/patches/01_SLmake.inc.patch
index cba1403..4010d5c 100644
--- a/debian/patches/01_SLmake.inc.patch
+++ b/debian/patches/01_SLmake.inc.patch
@@ -1,7 +1,7 @@
Index: scalapack-1.8.0/SLmake.inc
===================================================================
---- scalapack-1.8.0.orig/SLmake.inc 2007-04-07 06:37:26.000000000 +0200
-+++ scalapack-1.8.0/SLmake.inc 2011-09-18 15:49:24.971359670 +0200
+--- scalapack-1.8.0.orig/SLmake.inc
++++ scalapack-1.8.0/SLmake.inc
@@ -33,15 +33,30 @@
#
# MPI setup; tailor to your system if using MPIBLACS
@@ -35,7 +35,7 @@ Index: scalapack-1.8.0/SLmake.inc
BLACSFINIT = -lblacsF77init-lam
BLACSCINIT = -lblacsCinit-lam
BLACSLIB = -lblacs-lam
-@@ -56,7 +71,7 @@
+@@ -56,13 +71,28 @@
BLACSCINIT = /usr/lib/libblacsCinit-mpich.a
BLACSLIB = /usr/lib/libblacs-mpich.a
else
@@ -44,7 +44,28 @@ Index: scalapack-1.8.0/SLmake.inc
BLACSFINIT = -lblacsF77init-mpich
BLACSCINIT = -lblacsCinit-mpich
BLACSLIB = -lblacs-mpich
-@@ -96,10 +111,10 @@
+ endif
+ TESTINGdir = $(home)/TESTING
+ endif
++ifeq ($(MPI),mpich2)
++USEMPI = -DUsingMpiBlacs
++ifeq ($(BUILD),static)
++SMPLIB = -L/usr/lib/mpich2/lib/ -lmpich
++BLACSFINIT = /usr/lib/libblacsF77init-mpich2.a
++BLACSCINIT = /usr/lib/libblacsCinit-mpich2.a
++BLACSLIB = /usr/lib/libblacs-mpich2.a
++else
++SMPLIB = -L/usr/lib/mpich2/lib/ -lmpich
++BLACSFINIT = -lblacsF77init-mpich2
++BLACSCINIT = -lblacsCinit-mpich2
++BLACSLIB = -lblacs-mpich2
++endif
++TESTINGdir = $(home)/TESTING
++endif
+ ifeq ($(MPI),pvm)
+ USEMPI =
+ ifeq ($(BUILD),static)
+@@ -96,10 +126,10 @@
#
# The fortran and C compilers, loaders, and their flags
#
@@ -57,7 +78,7 @@ Index: scalapack-1.8.0/SLmake.inc
F77FLAGS = -Wall -O6 -funroll-all-loops -ffast-math $(NOOPT)
CCFLAGS = -Wall $(FPIC) -O6 -funroll-all-loops -ffast-math
SRCFLAG =
-@@ -117,7 +132,7 @@
+@@ -117,7 +147,7 @@
# C preprocessor defs for compilation
# (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C)
#
@@ -66,7 +87,7 @@ Index: scalapack-1.8.0/SLmake.inc
#
# The archiver and the flag(s) to use when building archive (library)
# Also the ranlib routine. If your system has no ranlib, set RANLIB = echo
-@@ -129,7 +144,7 @@
+@@ -129,7 +159,7 @@
# The name of the libraries to be created/linked to
#
SCALAPACKLIB = $(home)/scalapack_$(MPI).a
diff --git a/debian/rules b/debian/rules
index ffb47bf..1a83678 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,8 @@ version_major:=$(shell echo $(version) | cut -d '.' -f 1)
topdir=$(shell pwd)
-# This little hack works on mpich, lam and openmpi as of the lenny release
-SCALAPACK_MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g)
+include /usr/share/mpi-default-dev/debian_defaults
+SCALAPACK_MPI=$(ARCH_DEFAULT_MPI_IMPL)
build: build-$(SCALAPACK_MPI) build-pvm
@@ -22,9 +22,11 @@ build-lam: build-stamp-lam
build-mpich: build-stamp-mpich
+build-mpich2: build-stamp-mpich2
+
build-pvm: build-stamp-pvm
-build-stamp-openmpi:
+build-stamp-openmpi:
dh_testdir
# next is a clean
@@ -73,7 +75,7 @@ build-stamp-openmpi:
touch build-stamp-openmpi
-build-stamp-lam:
+build-stamp-lam:
dh_testdir
# next is a clean
@@ -122,7 +124,7 @@ build-stamp-lam:
touch build-stamp-lam
-build-stamp-mpich:
+build-stamp-mpich:
dh_testdir
# next is a clean
@@ -165,7 +167,56 @@ build-stamp-mpich:
touch build-stamp-mpich
-build-stamp-pvm:
+build-stamp-mpich2:
+ dh_testdir
+
+# next is a clean
+ echo *** cleaning object files ***
+ BASEDIR=$(topdir) make clean
+
+# build the shared libraries
+ echo *** building shared libraries for mpich2 ***
+ BASEDIR=$(topdir) MPI=mpich2 FPIC=-fPIC make lib
+ mkdir -p tmp
+ set -e ;\
+ for i in scalapack ; do \
+ cd tmp ;\
+ ar x ../$${i}_mpich2.a ;\
+ cd .. ;\
+ gcc -shared -Wl,-soname=lib$$i-mpich2.so.$(version_major) -o \
+ lib$$i-mpich2.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-mpich2 -lblacs-mpich2 -lmpich -lgfortran;\
+ ln -snf lib$$i-mpich2.so.$(version) lib$$i-mpich2.so.$(version_major) ;\
+ ln -snf lib$$i-mpich2.so.$(version_major) lib$$i-mpich2.so ;\
+ rm tmp/* ;\
+ done
+ rmdir tmp
+# for i in $$(find -name "*.f"); do \
+# if grep '^[^\*].*TOTMEM *= *' $$i | grep -v 64000000 >/dev/null ; then \
+# cat $$i | sed 's,\(^[^\*].*TOTMEM *= *\)[0-9]*,\164000000,g' >tmp ;\
+# mv tmp $$i;\
+# fi;\
+# done
+
+# the testing binaries
+ echo *** building static testing binaries for mpich2 ***
+ BASEDIR=$(topdir) MPI=mpich2 BUILD=shared make exe
+ set -e ;\
+ cd TESTING ;\
+ for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-openmpi' ! -name 'x*-mpich*' ! -name 'x*-pvm'); do \
+ mv $$i $$i-mpich2 ;\
+ done
+
+# next is a clean
+ echo *** cleaning object files ***
+ BASEDIR=$(topdir) make clean
+
+# build the static libraries
+ echo *** building static libraries for mpich2 ***
+ BASEDIR=$(topdir) MPI=mpich2 make lib
+
+ touch build-stamp-mpich2
+
+build-stamp-pvm:
dh_testdir
# next is a clean
@@ -194,7 +245,7 @@ build-stamp-pvm:
BASEDIR=$(topdir) MPI=pvm BUILD=shared make exe
set -e ;\
cd TESTING ;\
- for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-openmpi' ! -name 'x*-lam' ! -name 'x*-mpich'); do \
+ for i in $$(find -name 'x*' -maxdepth 1 ! -name 'x*-openmpi' ! -name 'x*-lam' ! -name 'x*-mpich*'); do \
mv $$i $$i-pvm ;\
done
@@ -208,7 +259,7 @@ build-stamp-pvm:
touch build-stamp-pvm
-clean:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp-* install-stamp-* install-dirs-stamp
@@ -244,6 +295,8 @@ install-lam: install-stamp-lam
install-mpich: install-stamp-mpich
+install-mpich2: install-stamp-mpich2
+
install-pvm: install-stamp-pvm
install-stamp-openmpi: build-stamp-openmpi
@@ -315,6 +368,29 @@ install-stamp-mpich: build-stamp-mpich
touch install-stamp-mpich
+install-stamp-mpich2: build-stamp-mpich2
+ dh_testdir
+ dh_testroot
+
+ set -e ;\
+ for i in scalapack ; do \
+ cp -a lib$$i-mpich2.so.* \
+ `pwd`/debian/libscalapack-mpi1/usr/lib/ ;\
+ cp -a lib$$i-mpich2.so \
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
+ done
+
+ install TESTING/x*-mpich2 \
+ `pwd`/debian/scalapack-mpi-test/usr/lib/scalapack
+
+ set -e ;\
+ for i in scalapack ; do \
+ install $${i}_mpich2.a \
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-mpich2.a ;\
+ done
+
+ touch install-stamp-mpich2
+
install-stamp-pvm: build-stamp-pvm
dh_testdir
dh_testroot
@@ -341,7 +417,7 @@ install-stamp-pvm: build-stamp-pvm
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdocs README
+ dh_installdocs README
dh_installexamples
dh_installchangelogs
dh_link
@@ -383,7 +459,7 @@ install-stamp-indep:
binary-indep: install-indep
dh_testdir -i
dh_testroot -i
- dh_installdocs -i README
+ dh_installdocs -i README
dh_installchangelogs -i
dh_link -i
dh_compress -i
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scalapack.git
More information about the debian-science-commits
mailing list