From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wKLROc4gSGf3QQAAqHPOHw:P1 (envelope-from ) for ; Thu, 28 Nov 2024 07:50:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id wKLROc4gSGf3QQAAqHPOHw (envelope-from ) for ; Thu, 28 Nov 2024 08:50:39 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TbXjbYa7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=GVCRGZD1; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732780238; a=rsa-sha256; cv=none; b=EbnlO+bXTTwY7MCymDGcut1VQ705Cabj32kny77FyAeFjmNwJdvntteiqXEz8qR+BumAuR Gm/X/01Q/KvllPE/fHFnoH8hvKK0+iA2acTE1y5FLInI8W3zCXLrwXRe0rdDcAL81KAhu7 dmqYxb0a6gQ1YW9/37BCJb0kl/omeoDDVnqd+/8fCAYp6SJXB8XRcR8IQuN5E37N9Bmdof jNhPg5QbdRAOsgdkmEqpC85pqzcKCTtYtuS0t9zngQTS1GmZPRz73agrVuDsZzPQfqkoTW iREOLOZfF9GR4FMkm7EH44lxzrbUZo68eo0mrAVtDvfQ1SHvzr/Lv3ZsfZ4Wlg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TbXjbYa7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=GVCRGZD1; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732780238; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=vdV2bJjfJS6VusF58pqfJS6cg/D81/vsr1qBODdOut4=; b=FA1MZuzNBTN8wuvNhX7xFm2bJpZy+X/eHDqCvN6I414Vpt+0WhsR/CpErGn3IR1XY32NCJ OWL6pLCVKeU88aXxHMskUmHAkQI6TDX/RXBABoVNwMkgj4O6nqSOGztcYwwBqKq4kcpXr4 dfkF/xVxKr0yPZWe8LhnShNxzjypsAHY9MVX9TscRkxz+dWrdKiMJHdDrgVUh65mFFoDPC eYSVag27bt5wmBQNStCDXLecVK+jkvd+n9H/zGOle07K2RWMnoG5qUVvmkO0csQDi7l3zO fIU8HyrmVZK3YCkyxKXcJeTZ0WcaKhxU5C4dkgn9XId6SvSU488RMVC9Vkbk0Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EFB0F7DAA8 for ; Thu, 28 Nov 2024 08:50:37 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGZHr-00076h-Vb; Thu, 28 Nov 2024 02:50:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tGZHp-00075M-5u for guix-patches@gnu.org; Thu, 28 Nov 2024 02:50:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tGZHo-00012I-Sf for guix-patches@gnu.org; Thu, 28 Nov 2024 02:50:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=vdV2bJjfJS6VusF58pqfJS6cg/D81/vsr1qBODdOut4=; b=TbXjbYa7Yc9/HDgO6lmEBioFT+a/QsWmfk/cBpOQ3V18h/TVNB3ixqTwN3IrWYEO3YQCx9T54z7Waw2KEHs0NCq1tc3JLktUGtxleP9LpxvDBVzwLeyvRtGFUMdJMtc4zLGOhyFFulmbEJwsby50QdyQ8rmVu6fvSId12nfCguRCXbYu73H2h1g8aMzuM2zFfp3vm8B7nBP2QLby5FPMxk5qv4TpQwSWzVK/abZ2OC0QnT0wduKZ0cLEBfhROaGdOgl9Fpuv7exVq7oI3Uvo9iHVJEK6WDlp8vyaEEI2zWZem70P1SZM2oNeSo2o5/bChMzB/P+8VPnJ3cZzgr+PBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGZHo-0001FI-Mk; Thu, 28 Nov 2024 02:50:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74572] [PATCH 5/6] gnu: openmpi-5: Reformat. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 28 Nov 2024 07:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74572@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74572-submit@debbugs.gnu.org id=B74572.17327801904713 (code B ref 74572); Thu, 28 Nov 2024 07:50:04 +0000 Received: (at 74572) by debbugs.gnu.org; 28 Nov 2024 07:49:50 +0000 Received: from localhost ([127.0.0.1]:36316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGZHZ-0001Dv-Ro for submit@debbugs.gnu.org; Thu, 28 Nov 2024 02:49:50 -0500 Received: from mail-pj1-f50.google.com ([209.85.216.50]:55326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGZHS-0001D2-6X for 74572@debbugs.gnu.org; Thu, 28 Nov 2024 02:49:45 -0500 Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2ee397a82f6so57822a91.2 for <74572@debbugs.gnu.org>; Wed, 27 Nov 2024 23:49:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732780116; x=1733384916; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vdV2bJjfJS6VusF58pqfJS6cg/D81/vsr1qBODdOut4=; b=GVCRGZD1ZWLBDX1lacleiBcc2dCLwHe46EoX/zbEfTYqdFuC6KfBwU3rnJqkyf+ZWC LdCDvp4v1z92Uez6Dzn6K3j2huhpbF6L8OWaMkC7sJZcLCoGTzKGMcrzkrOqnivhed2A IykZHwUK/KUHiYTG5nv1v7dMf9pYZKya7rOtazkVRv9GMBRkFQh48zTnW3Wr/qxx+2F5 3AKgysyU/EVcQKKsGyXBBFBlWFUhyKNFdOB1rdnqzab1HH4LkAU3gJNVhshcCrSslhxg HWDEpvClJhGDZcubSdaaO/6bg0x4QyVgvrvD9crzMjZqWi6yl0XWjcUU/6WcwBhr2rbl N0Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732780116; x=1733384916; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vdV2bJjfJS6VusF58pqfJS6cg/D81/vsr1qBODdOut4=; b=H/Md5pecApIe1MBzDEGZ9ElhI4YlXqMVphr1FMxYHSsbGNN40wP5Id/sDKzFUYeNbY 9PHp9lrV+79Lv5D5KTIT3eLKylQ1f/HmthKzaDzAmMq1C5SBM8CAsjPMaDkezbGVYn4v 1ELktGPglbVpsa97y4qLTCww5TWe5UOSvN6rWHg/pR625EAZB8RXTd2XhYff8uEjdmHo +i7dY58IWjiGujBvktR42IKay8diXM+FZhLLd+vrAJTldgzCz+RIpoqw3T+Wa5smi1uO yFn1NL6dTCBH5RnES/QWzBiK6Jj4MybX3fpNy8BfbXZwcC+yZYduV2Ylt8ERcTYgZSFv qq2g== X-Gm-Message-State: AOJu0Yz45C/9eEHMLTlycFSH4g9nEK51djvDjYzjNNa/nVgGEcN6qYBA uB5DevloyLQXggT28VolKCK9eJV4NWx7ezQgHip07AOUR2Y7EkJiw1TDxg== X-Gm-Gg: ASbGncv/qj3chF8KgxMLBjV0klexAjHl0NNFwZ8bB/1LeJPcbXjmit6YsZoUNrZnE4q pMEzFjOSY0dj7lQilRDaoHsl5bwG7jynp3CfH34py9O5FWfTBGhOGpNx/W5+/D9rL6ySyiNiduo 5XPid1P6RZb1V9FaXbB/5UR3dbdQlSGkP1hNFvylvA4hViMZYa4/5RT7WJsk8XDKGsDigZXZM61 HVQ3FhADnnhty2i1+1GspKbF1kLNl5nbsSlx73MD8WQp6Lt2OtFODNJKE4UWGljDnaC X-Google-Smtp-Source: AGHT+IG3XiaDFMNPlZH1lqXU9o/81W+FBdylcwmwyplXdFPJC3/zVq33RSTurestO30HjoJZSbZHAg== X-Received: by 2002:a17:90b:4ad1:b0:2ea:2906:a6e8 with SMTP id 98e67ed59e1d1-2ee097c295amr8011967a91.37.1732780116053; Wed, 27 Nov 2024 23:48:36 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ee0fad03bcsm2822393a91.33.2024.11.27.23.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 23:48:35 -0800 (PST) From: Maxim Cournoyer Date: Thu, 28 Nov 2024 16:47:56 +0900 Message-ID: <83f356d678647fca5d92abc24c8c8ac8cd5282c9.1732774966.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.13 X-Spam-Score: -4.13 X-Migadu-Queue-Id: EFB0F7DAA8 X-Migadu-Scanner: mx10.migadu.com X-TUID: JCmT5peux3Zi Better comply to our 80 characters maximum width guideline. * gnu/packages/mpi.scm (openmpi-5): Reformat. Change-Id: Ib164c4d7dae7bece60738787fd950003fb75e057 --- gnu/packages/mpi.scm | 103 ++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 50 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 41e57c3012..67e12657db 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -328,59 +328,62 @@ (define-public openmpi-5 (sha256 (base32 "0mw1z4ppnlvxngwd58kl5q26qmvf3bgjkd4r8wjpqis3pky86hdx")))) - (inputs (modify-inputs (package-inputs openmpi) - ;; As of Open MPI 5.0.X, PMIx is used to communicate - ;; with SLURM, so SLURM'S PMI is no longer needed. - (delete "slurm") - (append ucx) ;for Infiniband support - (append openpmix) ;for PMI support (launching via "srun") - (append prrte))) ;for PMI support (launching via "srun") - (native-inputs (modify-inputs (package-native-inputs openmpi) - (append python))) + (inputs + (modify-inputs (package-inputs openmpi) + ;; As of Open MPI 5.0.X, PMIx is used to communicate with SLURM, so + ;; SLURM'S PMI is no longer needed. + (delete "slurm") + (append ucx) ;for Infiniband support + (append openpmix) ;for PMI support (launching via "srun") + (append prrte))) ;for PMI support (launching via "srun") + (native-inputs + (modify-inputs (package-native-inputs openmpi) + (append python))) (outputs '("out" "debug")) (arguments - (list #:configure-flags - #~(list "--enable-mpi-ext=affinity" ;cr doesn't work - "--with-sge" - "--disable-static" - - #$@(if (package? (this-package-input "valgrind")) - #~("--enable-memchecker" - "--with-valgrind") - #~("--without-valgrind")) - - "--with-hwloc=external" - "--with-libevent" - - ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated - ;; since 5.x. - "--enable-prte-prefix-by-default" - - ;; Enable support for the 'Process Management Interface for Exascale' - ;; (PMIx) used e.g. by Slurm for the management communication and - ;; coordination of MPI processes. - (string-append "--with-pmix=" #$(this-package-input "openpmix")) - (string-append "--with-prrte=" #$(this-package-input "prrte")) - - ;; Since 5.x, Infiniband support is provided by ucx. - ;; See https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes - (string-append "--with-ucx=" #$(this-package-input "ucx"))) - - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'remove-absolute - (lambda _ - ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE - ;; etc.) to reduce the closure size. See - ;; - ;; and - ;; . - (substitute* '("oshmem/tools/oshmem_info/param.c" - "ompi/tools/ompi_info/param.c") - (("_ABSOLUTE") ""))))) - - #:disallowed-references (list (canonical-package gcc)))))) + (list + #:configure-flags + #~(list "--enable-mpi-ext=affinity" ;cr doesn't work + "--with-sge" + "--disable-static" + + #$@(if (package? (this-package-input "valgrind")) + #~("--enable-memchecker" + "--with-valgrind") + #~("--without-valgrind")) + + "--with-hwloc=external" + "--with-libevent" + + ;; This replaces --enable-mpirun-prefix-by-default wich is + ;; deprecated since 5.x. + "--enable-prte-prefix-by-default" + + ;; Enable support for the 'Process Management Interface for + ;; Exascale' (PMIx) used e.g. by Slurm for the management + ;; communication and coordination of MPI processes. + (string-append "--with-pmix=" #$(this-package-input "openpmix")) + (string-append "--with-prrte=" #$(this-package-input "prrte")) + + ;; Since 5.x, Infiniband support is provided by ucx. See + ;; https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes + (string-append "--with-ucx=" #$(this-package-input "ucx"))) + + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'remove-absolute + (lambda _ + ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE etc.) + ;; to reduce the closure size. See + ;; + ;; and + ;; . + (substitute* '("oshmem/tools/oshmem_info/param.c" + "ompi/tools/ompi_info/param.c") + (("_ABSOLUTE") ""))))) + + #:disallowed-references (list (canonical-package gcc)))))) (define-public openmpi-c++ (package/inherit openmpi -- 2.46.0