The attached patch builds an extra binary package, openmpi-checkpoint
on architectures which have BLCR available. (Option #3 from the
earlier mail). I think it all works sanely, and shouldn't introduce
any new problems. Not sure if you want to recommend or suggest
openmpi-checkpoint though? I'd say recommend since I think checkpoints
would be useful for the majority of usages for openmpi, but I don't
feel strongly either way really.
Alan
diff -u openmpi-1.3.3/debian/changelog openmpi-1.3.3/debian/changelog
--- openmpi-1.3.3/debian/changelog
+++ openmpi-1.3.3/debian/changelog
@@ -1,7 +1,14 @@
+openmpi (1.3.3-2) unstable; urgency=low
+
+ * Build with BLCR support on i386,amd64,ppc,armel
+ * Adds openmpi-checkpoint package, which includes the binaries for checkpointing
+
+ -- Alan Woodland <awoodl...@debian.org> Wed, 09 Sep 2009 16:41:22 +0100
+
diff -u openmpi-1.3.3/debian/rules openmpi-1.3.3/debian/rules
--- openmpi-1.3.3/debian/rules
+++ openmpi-1.3.3/debian/rules
@@ -27,8 +27,25 @@
CFLAGS += -mcpu=v9
endif
+
+CHKPT =
+
+ifeq "$(DEB_HOST_ARCH)" "amd64"
+ CHKPT += --with-ft=cr --with-blcr=/usr --with-blcr-libdir=/usr/lib
+endif
+ifeq "$(DEB_HOST_ARCH)" "i386"
+ CHKPT += --with-ft=cr --with-blcr=/usr --with-blcr-libdir=/usr/lib
+endif
+ifeq "$(DEB_HOST_ARCH)" "armel"
+ CHKPT += --with-ft=cr --with-blcr=/usr --with-blcr-libdir=/usr/lib
+endif
+ifeq "$(DEB_HOST_ARCH)" "powerpc"
+ 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 \
@@ -116,6 +133,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
diff -u openmpi-1.3.3/debian/control openmpi-1.3.3/debian/control
--- openmpi-1.3.3/debian/control
+++ openmpi-1.3.3/debian/control
@@ -4,7 +4,7 @@
Homepage: http://www.open-mpi.org/
Maintainer: Debian OpenMPI Maintainers <pkg-openmpi-maintain...@lists.alioth.debian.org>
Uploaders: Manuel Prinz <man...@debian.org>, Sylvestre Ledru <sylves...@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 i386 powerpc armel]
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
@@ -113,0 +115,12 @@
+
+Package: openmpi-checkpoint
+Architecture: amd64 i386 powerpc armel
+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 OpenMPI applications
only in patch2:
unchanged:
--- openmpi-1.3.3.orig/debian/openmpi-checkpoint.install
+++ openmpi-1.3.3/debian/openmpi-checkpoint.install
@@ -0,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
