From patchwork Fri Feb 8 15:06:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 998 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6724B16BCD; Fri, 8 Feb 2019 15:12:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,MIME_QP_LONG_LINE, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id F225116AA5 for ; Fri, 8 Feb 2019 15:12:23 +0000 (GMT) Received: from localhost ([127.0.0.1]:57886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gs7pH-0007Me-23 for patchwork@mira.cbaines.net; Fri, 08 Feb 2019 10:12:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gs7l5-0003UT-Nq for guix-patches@gnu.org; Fri, 08 Feb 2019 10:08:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gs7l4-0005Xs-M0 for guix-patches@gnu.org; Fri, 08 Feb 2019 10:08:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40762) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gs7l4-0005Xj-Ii for guix-patches@gnu.org; Fri, 08 Feb 2019 10:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gs7l4-00089A-D6 for guix-patches@gnu.org; Fri, 08 Feb 2019 10:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34388] [PATCH] gnu: openmpi: Upgrade to 4.0.0. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Feb 2019 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34388 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34388@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154963842931251 (code B ref -1); Fri, 08 Feb 2019 15:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2019 15:07:09 +0000 Received: from localhost ([127.0.0.1]:40043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gs7k7-00087i-25 for submit@debbugs.gnu.org; Fri, 08 Feb 2019 10:07:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gs7k4-00087E-Dk for submit@debbugs.gnu.org; Fri, 08 Feb 2019 10:07:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:51383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gs7jz-0004jI-Ap for submit@debbugs.gnu.org; Fri, 08 Feb 2019 10:06:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gs7jv-0002N0-4e for guix-patches@gnu.org; Fri, 08 Feb 2019 10:06:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gs7ju-0004bT-2Z for guix-patches@gnu.org; Fri, 08 Feb 2019 10:06:51 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:33530 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gs7jt-0004R6-RY for guix-patches@gnu.org; Fri, 08 Feb 2019 10:06:50 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1549638393; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=jJ29nWGIafp2Jmo5z2A82bzkrS8=; b=HoqLpupd9YzrFA++kOMWArknpQXNX/8AK9Kd8UuJblfxRe3gMdzz9lk/mqEY84Ti lE21D4hDNkcdPe3uS9xvSjmxzOCDbrWqKj99nQXjWMfh4wV9tFuzq4LyagfvbhBK k4al9Fu5cWIjG/MJOEMyBqct8ASdqCYvI2qTTwedPgOlp24ulLsxb4ha1HKZOeWg WO8W/oM3sLtnsbMdPVmZ8+7Ojsw5KHZFtYaWcszX0e3YhDZJsksJKRtc7FeT61u/ YePwozpeAggAmm9xWuU2SS3KPgUP5/JPdkV2yhn4FgosiVFvRsPE3wRL0+FbzqfG 6qpAQsh2GUWxK+YVffZorQ==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.3 cv=PIBxBsiC c=1 sm=1 tr=0 a=QyxltsrUb1TgOUMZEPHifA==:117 a=QyxltsrUb1TgOUMZEPHifA==:17 a=KGjhK52YXX0A:10 a=IkcTkHD0fZMA:10 a=CFTnQlWoA9kA:10 a=zSv6zi-ZgakA:10 a=inoG4m36AAAA:8 a=mDV3o1hIAAAA:8 a=l-IQEoNTAAAA:8 a=amw3c8rLHUIdlXkanTEA:9 a=QEXdDO2ut3YA:10 a=_Qgj-RFg6mImvLaOgLPg:22 a=_FVE-zBwftR9WsbkzFJk:22 a=Zd05aFOJ2-iJ9B18dslr:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp01.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.114.155] ([97.116.114.155:37522] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id 51/85-30226-9FA9D5C5; Fri, 08 Feb 2019 10:06:33 -0500 From: ericbavier@centurylink.net Date: Fri, 8 Feb 2019 09:06:22 -0600 Message-Id: <20190208150622.11377-1-ericbavier@centurylink.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Eric Bavier * gnu/packages/linux.scm (psm)[arguments]: Add 'patch-sysmacros phase to fix "undefined reference to `minor'" errors while linking against libinfinipath.so. * gnu/packages/mpi.scm (openmpi): Upgrade to 4.0.0. [inputs]: Add libevent. [arguments]: Simplify configure-flags. Use system libevent. Adjust romio version strings. (%openmpi-setup): Use OMPI_MCA_rmaps_base_mapping_policy for oversubscription. --- gnu/packages/linux.scm | 7 +++++++ gnu/packages/mpi.scm | 29 +++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b1dfb7f701..66a1ad4508 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4717,6 +4717,13 @@ libraries, which are often integrated directly into libfabric.") (string-append %output "/include"))) (substitute* "Makefile" (("/lib64") "/lib")) + #t)) + (add-after 'unpack 'patch-sysmacros + (lambda _ + (substitute* "ipath/ipath_proto.c" + (("#include " m) + (string-append m "\n" + "#include "))) #t))))) (synopsis "Intel Performance Scaled Messaging (PSM) Libraries") (description diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 1f69a04bc9..0a43c55b7a 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2018 Eric Bavier +;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge @@ -33,6 +33,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages gcc) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages pciutils) #:use-module (gnu packages xorg) @@ -157,7 +158,7 @@ bind processes, and much more.") (define-public openmpi (package (name "openmpi") - (version "3.0.1") + (version "4.0.0") (source (origin (method url-fetch) @@ -166,12 +167,13 @@ bind processes, and much more.") "/downloads/openmpi-" version ".tar.bz2")) (sha256 (base32 - "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36")))) + "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg")))) (build-system gnu-build-system) (inputs `(("hwloc" ,hwloc "lib") ("gfortran" ,gfortran) ("libfabric" ,libfabric) + ("libevent" ,libevent) ,@(if (and (not (%current-target-system)) (member (%current-system) (package-supported-systems psm))) `(("psm" ,psm)) @@ -191,16 +193,11 @@ bind processes, and much more.") `(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work "--enable-memchecker" "--with-sge" - - ;; VampirTrace is obsoleted by scorep and disabling - ;; it reduces the closure size considerably. - "--disable-vt" - - ,(string-append "--with-valgrind=" - (assoc-ref %build-inputs "valgrind")) - ,(string-append "--with-hwloc=" - (assoc-ref %build-inputs "hwloc")) - + "--with-psm" + "--with-psm2" + "--with-valgrind" + "--with-hwloc=external" + "--with-libevent" ;; Enable support for SLURM's Process Manager ;; Interface (PMI). ,(string-append "--with-pmi=" @@ -219,8 +216,8 @@ bind processes, and much more.") (("_ABSOLUTE") "")) ;; Avoid valgrind (which pulls in gdb etc.). (substitute* - '("./ompi/mca/io/romio314/src/io_romio314_component.c") - (("MCA_io_romio314_COMPLETE_CONFIGURE_FLAGS") + '("./ompi/mca/io/romio321/src/io_romio321_component.c") + (("MCA_io_romio321_COMPLETE_CONFIGURE_FLAGS") "\"[elided to reduce closure]\"")) #t)) (add-before 'build 'scrub-timestamps ;reproducibility @@ -270,7 +267,7 @@ only provides @code{MPI_THREAD_FUNNELED}."))) (setenv "OMPI_MCA_plm_rsh_agent" (which "false")) ;; Allow oversubscription in case there are less physical cores available ;; in the build environment than the package wants while testing. - (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") + (setenv "OMPI_MCA_rmaps_base_mapping_policy" "core:OVERSUBSCRIBE") #t)) (define-public python-mpi4py