[Pkg-openmpi-commits] r117 - in /openmpi/trunk/debian: changelog openmpi-bin.README.Debian patches/00list patches/openfabrics.dpatch

Sat May 31 21:43:38 UTC 2008

Author: hauro-guest
Date: Sat May 31 21:43:37 2008
New Revision: 117

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=117
Log:
Integrated Jeff's patch for the OpenFabrics issue

Added:
    openmpi/trunk/debian/patches/openfabrics.dpatch   (with props)
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/openmpi-bin.README.Debian
    openmpi/trunk/debian/patches/00list

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=117&op=diff
==============================================================================

--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Sat May 31 21:43:37 2008
@@ -1,3 +1,15 @@
+openmpi (1.2.6-3) unstable; urgency=low
+
+  [ Manuel Prinz ]
+  * debian/patches/openfabrics.dpatch: Applied patch by Jeff Squyres that
+    deals with the warnings printed when OpenFabrics hardware is not present.
+    Thanks to Jeff for the patch!
+  * debian/patches/10fix_config_infiniband.dpatch: Removed, it's obsoleted
+    by the above mentioned OpenFabrics patch.
+  * Updated README.Debian with information about the OpenFabrics patch.
+
+ -- Manuel Prinz <debian at pinguinkiste.de>  Sat, 31 May 2008 22:15:35 +0200
+
 openmpi (1.2.6-2) unstable; urgency=low
 
   [ Sylvestre Ledru ]

Modified: openmpi/trunk/debian/openmpi-bin.README.Debian
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-bin.README.Debian?rev=117&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-bin.README.Debian (original)
+++ openmpi/trunk/debian/openmpi-bin.README.Debian Sat May 31 21:43:37 2008
@@ -3,6 +3,10 @@
 
 InfiniBand support
 ------------------
+
+This section provides information about warning messages when OpenFabrics
+hardware isn't present. This is fixed since version 1.2.6-3. The information
+provided here is only for historical reasons.
 
 InfiniBand support is build into the package and enabled by default. On
 systems that don't have InfiniBand, a warning like this will be issued:
@@ -14,10 +18,12 @@
   lower performance.
   --------------------------------------------------------------------------
 
-To get rid of the warning, you can either disable the use of the "openib" btl
-in /etc/openmpi/openmpi-mca-params.conf or pass "--mca btl ^openib" to mpirun
-or mpiexec. The configuration file contains a line to disable InfiniBand, you
-just have to comment it out.
+To get rid of the warning, you can either disable the use of the "openib" BTL
+in /etc/openmpi/openmpi-mca-params.conf by adding a line that reads
+
+  btl = ^openib
+
+or pass "--mca btl ^openib" to mpirun or mpiexec.
 
 Please see http://bugs.debian.org/439730 for a discussion on that topic.
 
@@ -59,4 +65,4 @@
 
 This might change in future versions of the package.
 
- -- Debian OpenMPI Team <pkg-openmpi-maintainers at lists.alioth.debian.org>, Thu, 30 Aug 2007 10:40:59 +0200
+ -- Debian OpenMPI Team <pkg-openmpi-maintainers at lists.alioth.debian.org>, Sat, 31 May 2008 22:21:44 +0200

Modified: openmpi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/00list?rev=117&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/00list (original)
+++ openmpi/trunk/debian/patches/00list Sat May 31 21:43:37 2008
@@ -1,1 +1,2 @@
-10fix_config_infiniband
+openfabrics
+

Added: openmpi/trunk/debian/patches/openfabrics.dpatch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/openfabrics.dpatch?rev=117&op=file
==============================================================================
--- openmpi/trunk/debian/patches/openfabrics.dpatch (added)
+++ openmpi/trunk/debian/patches/openfabrics.dpatch Sat May 31 21:43:37 2008
@@ -1,0 +1,69 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01openfabrics.dpatch by Jeff Squyres <jsquyres at cisco.com>
+##
+## DP: This patch was send to us by upstream and fixes the issues with
+## DP: warnings if no OpenFabrics hardware is present.
+## DP: The fix is revision 18553 in upstream's SVN repository and will
+## DP: be included in the next releases. The patch can be removed when
+## DP: release 1.2.7 is packaged.
+
+ at DPATCH@
+diff -urNad openmpi-1.2.6~/ompi/mca/btl/openib/btl_openib_component.c openmpi-1.2.6/ompi/mca/btl/openib/btl_openib_component.c
+--- openmpi-1.2.6~/ompi/mca/btl/openib/btl_openib_component.c	2008-03-05 22:48:25.000000000 +0100
++++ openmpi-1.2.6/ompi/mca/btl/openib/btl_openib_component.c	2008-05-31 22:48:41.000000000 +0200
+@@ -51,8 +51,11 @@
+ #include "ompi/datatype/convertor.h" 
+ #include "ompi/mca/mpool/mpool.h" 
+ #include <infiniband/verbs.h> 
++#include <infiniband/driver.h>
+ #include <errno.h> 
+ #include <string.h>   /* for strerror()*/ 
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ #include "ompi/mca/pml/base/pml_base_module_exchange.h"
+ 
+@@ -160,6 +163,27 @@
+ }
+ 
+ 
++static bool check_basics(void)
++{
++    int rc;
++    char *file;
++    struct stat s;
++
++    /* Check to see if $sysfsdir/class/infiniband/ exists */
++    asprintf(&file, "%s/class/infiniband", ibv_get_sysfs_path());
++    if (NULL == file) {
++        return false;
++    }
++    rc = stat(file, &s);
++    free(file);
++    if (0 != rc || !S_ISDIR(s.st_mode)) {
++        return false;
++    }
++
++    /* It exists and is a directory -- good enough */
++    return true;
++}
++
+ /*
+  *  Register OPENIB  port information. The MCA framework
+  *  will make this available to all peers.
+@@ -616,6 +640,15 @@
+     *num_btl_modules = 0;
+     num_devs = 0; 
+ 
++    /* Per https://svn.open-mpi.org/trac/ompi/ticket/1305, check to
++       see if $sysfsdir/class/infiniband exists.  If it does not,
++       assume that the RDMA hardware drivers are not loaded, and
++       therefore we don't want OpenFabrics verbs support in this OMPI
++       job.  No need to print a warning. */
++    if (!check_basics()) {
++        return NULL;
++    }
++    
+     /* openib BTL does not currently support progress threads, so
+        disable the component if they were requested */
+     if (enable_progress_threads) {

Propchange: openmpi/trunk/debian/patches/openfabrics.dpatch
------------------------------------------------------------------------------
    svn:executable = *


