02/07: gnu: openmpi: Increase priority of the PSM component.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 68ac34e1209c8ba631aea119a2a547f267a88576
Author: Ludovic Courtès <address@hidden>
Date:   Fri Nov 29 13:51:50 2019 +0100

    gnu: openmpi: Increase priority of the PSM component.
    
    * gnu/packages/patches/openmpi-psm2-priority.patch: Rename to...
    * gnu/packages/patches/openmpi-mtl-priorities.patch: ... this.  Add hunk
    to change the priority of PSM.
    * gnu/packages/mpi.scm (openmpi)[source]: Adjust accordingly.
    * gnu/local.mk (dist_patch_DATA): Likewise.
---
 gnu/local.mk                                               |  2 +-
 gnu/packages/mpi.scm                                       |  2 +-
 ...pi-psm2-priority.patch => openmpi-mtl-priorities.patch} | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 88b0f98..8ad246f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1203,7 +1203,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch      \
   %D%/packages/patches/openfoam-4.1-cleanup.patch                      \
   %D%/packages/patches/openjdk-10-idlj-reproducibility.patch   \
-  %D%/packages/patches/openmpi-psm2-priority.patch             \
+  %D%/packages/patches/openmpi-mtl-priorities.patch            \
   %D%/packages/patches/openocd-nrf52.patch                     \
   %D%/packages/patches/opensmtpd-fix-crash.patch               \
   %D%/packages/patches/openssl-runpath.patch                   \
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 9f6597c..45941df 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -179,7 +179,7 @@ bind processes, and much more.")
                           "/downloads/openmpi-" version ".tar.bz2"))
       (sha256
        (base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh"))
-      (patches (search-patches "openmpi-psm2-priority.patch"))))
+      (patches (search-patches "openmpi-mtl-priorities.patch"))))
     (build-system gnu-build-system)
     (inputs
      `(("hwloc" ,hwloc-2 "lib")
diff --git a/gnu/packages/patches/openmpi-psm2-priority.patch 
b/gnu/packages/patches/openmpi-mtl-priorities.patch
similarity index 59%
rename from gnu/packages/patches/openmpi-psm2-priority.patch
rename to gnu/packages/patches/openmpi-mtl-priorities.patch
index d9dd558..fd76594 100644
--- a/gnu/packages/patches/openmpi-psm2-priority.patch
+++ b/gnu/packages/patches/openmpi-mtl-priorities.patch
@@ -19,3 +19,17 @@ See 
<https://www.mail-archive.com/address@hidden/msg33581.html>.
                                              "priority", "Priority of the PSM2 
MTL component",
                                              MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
 
+Likewise for PSM: we want InfiniPath to be taken care of by PSM, not by UCX,
+since UCX achieves worse performance.
+
+--- openmpi-4.0.2/ompi/mca/mtl/psm/mtl_psm_component.c
++++ openmpi-4.0.2/ompi/mca/mtl/psm/mtl_psm_component.c
+@@ -92,7 +92,7 @@ ompi_mtl_psm_component_register(void)
+ 
+ 
+     /* set priority high enough to beat ob1's default */
+-    param_priority = 30;
++    param_priority = 54;
+     (void) mca_base_component_var_register 
(&mca_mtl_psm_component.super.mtl_version,
+                                             "priority", "Priority of the PSM 
MTL component",
+                                             MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,