[Pkg-openmpi-commits] r200 - in /openmpi/trunk/debian: changelog control openmpi-checkpoint.install rules

[manuel at users.alioth.debian.org]

Author: manuel
Date: Mon Oct 12 22:51:57 2009
New Revision: 200

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=200
Log:
Applied and modified Alan's patches for BLCR support

Added:
    openmpi/trunk/debian/openmpi-checkpoint.install
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/control
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=200&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Mon Oct 12 22:51:57 2009
@@ -1,8 +1,11 @@
 openmpi (1.3.3-2) unstable; urgency=low
 
   * Removing ancient mpirun alternatives in preinst. Closes: #534740, #544372.
-
- -- Manuel Prinz <manuel at debian.org>  Mon, 12 Oct 2009 23:01:30 +0200
+  * Build with BLCR support on supported architectures. The openmpi-checkpoint
+    package includes the binaries for checkpointing and documentation. Many
+    thanks to Alan Woodland for the implementation!
+
+ -- Manuel Prinz <manuel at debian.org>  Mon, 12 Oct 2009 23:46:04 +0200
 
 openmpi (1.3.3-1) unstable; urgency=low
 

Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=200&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Mon Oct 12 22:51:57 2009
@@ -4,7 +4,7 @@
 Homepage: http://www.open-mpi.org/
 Maintainer: Debian OpenMPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>
 Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], gfortran, gcc (>= 4:4.1.2), chrpath, quilt
+Build-Depends: debhelper (>= 5.0.0), libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel i386 powerpc]
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
@@ -12,6 +12,7 @@
 Package: openmpi-bin
 Architecture: alpha amd64 i386 ia64 powerpc ppc64 sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
+Recommends: openmpi-checkpoint
 Suggests: gfortran
 Description: high performance message passing library -- binaries
  Open MPI is a project combining technologies and resources from several other
@@ -111,3 +112,15 @@
  and computer science researchers.
  .
  This package contains debugging symbols for Open MPI.
+
+Package: openmpi-checkpoint
+Architecture: amd64 armel i386 powerpc
+Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin (= ${binary:Version})
+Description: high performance message passing library -- checkpoint support
+ Open MPI is a project combining technologies and resources from several other
+ projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
+ MPI library available. A completely new MPI-2 compliant implementation, Open
+ MPI offers advantages for system and software vendors, application developers
+ and computer science researchers.
+ .
+ This package contains binaries needed for checkpointing Open MPI applications.

Added: openmpi/trunk/debian/openmpi-checkpoint.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-checkpoint.install?rev=200&op=file
==============================================================================
--- openmpi/trunk/debian/openmpi-checkpoint.install (added)
+++ openmpi/trunk/debian/openmpi-checkpoint.install Mon Oct 12 22:51:57 2009
@@ -1,0 +1,13 @@
+usr/bin/ompi-restart
+usr/bin/orte-restart
+usr/bin/opal-restart
+usr/bin/ompi-checkpoint
+usr/bin/orte-checkpoint
+usr/bin/opal-checkpoint
+usr/share/man/man1/ompi-checkpoint.1
+usr/share/man/man1/opal-checkpoint.1
+usr/share/man/man1/orte-checkpoint.1
+usr/share/man/man1/ompi-restart.1
+usr/share/man/man1/opal-restart.1
+usr/share/man/man1/orte-restart.1
+usr/lib/openmpi/lib/openmpi/mca_crs_blcr.so

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=200&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Mon Oct 12 22:51:57 2009
@@ -27,8 +27,16 @@
 	CFLAGS += -mcpu=v9
 endif
 
+
+# BLCR checkpointing support
+BLCR_ARCH = "amd64 armel i386 powerpc"
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(BLCR_ARCH)))
+        CHKPT = --with-ft=cr --with-blcr=/usr --with-blcr-libdir=/usr/lib
+endif
+
 COMMON_CONFIG_PARAMS = \
 			$(CROSS)				\
+			$(CHKPT)				\
 			--prefix=/usr 				\
 			--mandir=\$${prefix}/share/man 		\
 			--infodir=\$${prefix}/share/info 	\
@@ -113,6 +121,8 @@
 	sed -i 's/3OpenMPI/3/' debian/openmpi/usr/share/man/man3/*.3
 
 	dh_install -s --sourcedir=$(CURDIR)/debian/openmpi --list-missing
+	# This gets installed by the wildcard, but we want to remove it really, so it's only used for checkpointing
+	-rm -f debian/libopenmpi*/usr/lib/openmpi/lib/openmpi/mca_crs_blcr.so
 
 binary-indep: install-indep
 	dh_testdir -i