From patchwork Tue Oct 15 12:45:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 32009 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 0A55827BBE9; Tue, 15 Oct 2024 13:46:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9E15B27BBE2 for ; Tue, 15 Oct 2024 13:46:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0gw2-0001S4-OD; Tue, 15 Oct 2024 08:45:58 -0400 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 1t0gvo-0001PO-Kk for guix-patches@gnu.org; Tue, 15 Oct 2024 08:45:45 -0400 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 1t0gvn-0005NX-QE for guix-patches@gnu.org; Tue, 15 Oct 2024 08:45:44 -0400 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=vuKQMDT0JwDu2bJLVucZ4xls5Ts4vK0hEArJTq2UVwE=; b=VKEuYTK51vS5j8hIZjpSy83FLWT+u316NZRN58MR3akFFUkqBGd4sPU/cRBvz/sfBPOtZF9M+7sT9Of3Yt5ycotgGdhzl5dc/zYcC4a7ONFFZtXeZ25YAOy0NTORsl8zHxrUKRSO16FwULgx9wR9cZpc3PrsZ1tw4WsuJCV3CQ/uLw4XWfQPUGg2jYrGjZ8gsjswYRVgyJc9rTNy9lGsHkZVvqw68/aeMZIV6PVlKwCmvXwQA5QOn2fqvwzNBI0IHOUDz7cWd1pF1gLlTOA8RNtixLMD7zjyvu/lOKJeev1JlmGbdkwN5i7U3//QAcXTgAhjCfbgWmUQskXsR3U4mQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t0gw5-0000mu-RY for guix-patches@gnu.org; Tue, 15 Oct 2024 08:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73818] [PATCH 1/2] gnu: openmpi@5: Remove reference to GCC and other build tools. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Oct 2024 12:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73818 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73818@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 73818-submit@debbugs.gnu.org id=B73818.17289963412983 (code B ref 73818); Tue, 15 Oct 2024 12:46:01 +0000 Received: (at 73818) by debbugs.gnu.org; 15 Oct 2024 12:45:41 +0000 Received: from localhost ([127.0.0.1]:54432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0gvk-0000m2-Rh for submit@debbugs.gnu.org; Tue, 15 Oct 2024 08:45:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0gvi-0000le-SC for 73818@debbugs.gnu.org; Tue, 15 Oct 2024 08:45:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0gvL-0005Jz-1O; Tue, 15 Oct 2024 08:45:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=vuKQMDT0JwDu2bJLVucZ4xls5Ts4vK0hEArJTq2UVwE=; b=bMcGpMhrVTfUQy0C1z69 EwywVMMqWesGtqJUaNQU+L9y3AP2FdJwSbWYyi5Q5/Bitp/73VsChhaE3kX4iM80MIzCAj5ZHNUMx xN8H2Bcs4CLtDd9pM6LwL73qqSDfJ7x3frB1fDgHMxc3ujykYmwPBOrSHQfmHTUJ9JVY4wEhm3ZWW sDyED4FfdF7PxCXL6R1Xy4kuVZ4gqVO0yVWm7WQqSUJwtO+rn1sRAW9YtU3jC13fJM7kdYbOKBqgv B+bDEQYKi16Vxw6AZwkcvIV1qs0FgGPEo3f/lBq/LcEJXs+qrN7CtUPZXkCs+03kH7TX8eD8ejRjl 4GIbSO/DcxALdA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 15 Oct 2024 14:45:03 +0200 Message-ID: <40bb05332e8a6af8e964b57e1648ab4c38b8874f.1728996088.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ludovic Courtès This removes GCC from the direct references of openmpi@5. * gnu/packages/mpi.scm (openmpi-5)[arguments]: Replace arguments entirely instead of using ‘substitute-keyword-arguments’. Reintroduce ‘remove-absolute’ phase. Remove ‘find-opensm-headers’ and ‘remove-logs’ phases, which are no longer needed. Change-Id: Ia3b25230488ca13310cd5bb2ae45f6990e906fa5 --- gnu/packages/mpi.scm | 59 +++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 75cfd4af66..6e1f972eb8 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -339,37 +339,46 @@ (define-public openmpi-5 (outputs '("out" "debug")) (arguments - (substitute-keyword-arguments (package-arguments openmpi) - ((#:configure-flags _) - #~(list "--enable-mpi-ext=affinity" ;cr doesn't work - "--with-sge" + (list #:configure-flags + #~(list "--enable-mpi-ext=affinity" ;cr doesn't work + "--with-sge" - #$@(if (package? (this-package-input "valgrind")) - #~("--enable-memchecker" - "--with-valgrind") - #~("--without-valgrind")) + #$@(if (package? (this-package-input "valgrind")) + #~("--enable-memchecker" + "--with-valgrind") + #~("--without-valgrind")) - "--with-hwloc=external" - "--with-libevent" + "--with-hwloc=external" + "--with-libevent" - ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated - ;; since 5.x. - "--enable-prte-prefix-by-default" + ;; 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")) + ;; 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")))) + ;; 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 phases) - #~(modify-phases #$phases - (delete 'remove-absolute) - (delete 'scrub-timestamps))))))) + #: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 From patchwork Tue Oct 15 12:45:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 32008 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 915A627BBEA; Tue, 15 Oct 2024 13:46:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E34227BBE2 for ; Tue, 15 Oct 2024 13:46:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0gvy-0001Qr-4o; Tue, 15 Oct 2024 08:45:55 -0400 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 1t0gvp-0001Pa-9U for guix-patches@gnu.org; Tue, 15 Oct 2024 08:45:45 -0400 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 1t0gvo-0005NY-Ad for guix-patches@gnu.org; Tue, 15 Oct 2024 08:45:44 -0400 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=/igAzYSuHEBcG4pdFtspwGTDAEzyx3fgHbeLjQJ6zyI=; b=hc7UrsnkhG76lVwchogRR6EncX7tABJW4U/Wp8AFHftt7qOKRSH0XUgn95Hk95xzv9d9yZfO9x4WupePUVmzCeKbGyE/thzFFUggdVBzL8wqM+im24LdPUykAR0f85IfgpAkGzIIQWF6q5USynqeTqSWvWEKbWI5Rm7hx2OGqaKuID7SD2vnvDFIU/eQKWwnDEtwEQbCvGbTELxoX+TB7GI6XIKnITPZDoIzL8AIPGf1VAtFjqHvXhpHG9O3+khT7x+72drVlo4+2Pz1xyV/H/oaD2/+DL7p6H2GLDj0mKnicwnkeiYl9eWK8x07OIjVx6eM8yMJPupyi/JElEgsPQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t0gw6-0000n1-Cu for guix-patches@gnu.org; Tue, 15 Oct 2024 08:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73818] [PATCH 2/2] gnu: prrte: Remove reference to GCC and other build tools. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Oct 2024 12:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73818 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73818@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 73818-submit@debbugs.gnu.org id=B73818.17289963432994 (code B ref 73818); Tue, 15 Oct 2024 12:46:02 +0000 Received: (at 73818) by debbugs.gnu.org; 15 Oct 2024 12:45:43 +0000 Received: from localhost ([127.0.0.1]:54434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0gvn-0000mC-Fc for submit@debbugs.gnu.org; Tue, 15 Oct 2024 08:45:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0gvj-0000lg-Qm for 73818@debbugs.gnu.org; Tue, 15 Oct 2024 08:45:40 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0gvM-0005KO-93; Tue, 15 Oct 2024 08:45:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=/igAzYSuHEBcG4pdFtspwGTDAEzyx3fgHbeLjQJ6zyI=; b=BLgGZjBUAUSTUKhml+R8 SpiPx3/Iiz/p+qX9Lpqs/TpOOZY5xgOAGXK5b/GRIEv1aF1qPTvzV40IXQaZO0KYRciikjDk7Oxhm oLb0XjAvb+9RUFSPDbgoVPMwrN5HgLh98CX681BE41X6xUtJdCBIh5lXAFjc+aECfchNC77+pYRRx kOerIVEENKeNPjtl1hCaq/+gEzXctJd2LoBhjbZUH9OfErxQzdCXJ8043ZISITPqA0fHxncr73O19 +5cvlbLAsOqVNp4S2ug8ZUN5QXj7vNHSKNLHl6qAe7x2No1E02IcTYRtKFg5+j8WprDnIxPfSral0 gILmVxCFN8hhVA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 15 Oct 2024 14:45:04 +0200 Message-ID: <3eed0df2217e206b04619ded2debc38213e312ac.1728996088.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ludovic Courtès This reduces the closure of ‘prrte’ from 305 MiB to 99 MiB. * gnu/packages/parallel.scm (prrte)[arguments]: Add #:phases. Change-Id: Idc26cf5899dd5fa8378535fc8530dbdb3e20608d --- gnu/packages/parallel.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index fc96136065..186aebad45 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -711,9 +711,25 @@ (define-public prrte "0wiy0vk37v4db1jgxza8bci0cczcvj34dalzsrlz05dk45zb7dl3")))) (build-system gnu-build-system) (arguments - (list #:configure-flags #~(list (string-append "--with-hwloc=" - (assoc-ref %build-inputs "hwloc")) - (string-append "--with-pmix=" #$(this-package-input "openpmix"))))) + (list #:configure-flags + #~(list (string-append "--with-hwloc=" + (assoc-ref %build-inputs "hwloc")) + (string-append "--with-pmix=" + #$(this-package-input "openpmix"))) + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-absolute-references + (lambda _ + ;; Remove references to GCC, the shell, etc. (shown by + ;; 'prte_info') to reduce the closure size. + (substitute* "src/tools/prte_info/param.c" + (("_ABSOLUTE") + "") + (("PRTE_CONFIGURE_CLI") + "\"[elided to reduce closure]\""))))) + + #:disallowed-references (list (canonical-package gcc)))) (inputs (list libevent `(,hwloc "lib") openpmix))