From patchwork Mon Aug 19 14:09:42 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: 67136 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 7B4C227BBEA; Mon, 19 Aug 2024 15:10:41 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 B2D2727BBE2 for ; Mon, 19 Aug 2024 15:10:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sg35S-0003qE-6z; Mon, 19 Aug 2024 10:10:22 -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 1sg35Q-0003q3-Gh for guix-patches@gnu.org; Mon, 19 Aug 2024 10:10:20 -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 1sg35Q-0007w3-7I for guix-patches@gnu.org; Mon, 19 Aug 2024 10:10:20 -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:Date:References:In-Reply-To:From:To:Subject; bh=lCx0weumdvLXp17qUB1M5CKmepqRfDB35Q2S27EIPHs=; b=lljpoYFb5eLeh6MN6Bhb2sW1V7ar2ym2AkY2fKm1pgfio7iwj3MYqJuDTxE28AFHLOcVvM/5AwhOUXITreJs05HVr1DIK+EhsIfxNbpp6xBNa0Y17eT5CUYNLxPFQYIPpX3DRudLChDMgFS0DCfq8SNSWWahaLR1Moz4hOFT8LeSNR4Jv/EhOK9JV1+0D4mGo9bYmD5VGdKA1sgy1qLQ26rTlMDDiIyZKxZD/bSL9/lSvda7gCj2OLVuwgltSmT9n/++Q6dU7Hgf/v0skzPBQVA3tJBv7CQQjpy3kptt7MmAP+NGMRy97zqiaTBisTQwBPjReT3NbWjtnAYkCl7GTQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sg365-0005bY-SV for guix-patches@gnu.org; Mon, 19 Aug 2024 10:11:01 -0400 Subject: bug#72062: [PATCH v3 0/5] Add OpenMPI 5.x. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 19 Aug 2024 14:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 72062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Romain GARBAGE Cc: 72062-done@debbugs.gnu.org Mail-Followup-To: 72062@debbugs.gnu.org, ludovic.courtes@inria.fr, romain.garbage@inria.fr Received: via spool by 72062-done@debbugs.gnu.org id=D72062.172407663521502 (code D ref 72062); Mon, 19 Aug 2024 14:11:01 +0000 Received: (at 72062-done) by debbugs.gnu.org; 19 Aug 2024 14:10:35 +0000 Received: from localhost ([127.0.0.1]:58887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sg35f-0005aj-7g for submit@debbugs.gnu.org; Mon, 19 Aug 2024 10:10:35 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:6687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sg35c-0005aQ-JJ for 72062-done@debbugs.gnu.org; Mon, 19 Aug 2024 10:10:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=lCx0weumdvLXp17qUB1M5CKmepqRfDB35Q2S27EIPHs=; b=PA6KGUDIORk5DK5lilVH0qmMTc6ghsf3wOwCsEHO2fhH+sc61eVfv9cC szU6Jw0GZiWET68QAkdibtQtycLhssZXMADJOUiHTvQ29Em5+u3Cg+ExX 1wPEDlFJIlGl7YILWu2uUsUxR4UZtnhrDimwqwL8eXtt9B1j6Wkkmcb5r M=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=ludovic.courtes@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.10,159,1719871200"; d="scan'208";a="94310549" Received: from unknown (HELO ribbon) ([193.50.110.123]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2024 16:09:43 +0200 From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: <20240712120140.20391-1-romain.garbage@inria.fr> (Romain GARBAGE's message of "Fri, 12 Jul 2024 14:00:00 +0200") References: <20240711143230.12467-1-romain.garbage@inria.fr> <20240712120140.20391-1-romain.garbage@inria.fr> Date: Mon, 19 Aug 2024 16:09:42 +0200 Message-ID: <87le0svc2h.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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 Hello, Romain GARBAGE skribis: > gnu: Add openpmix. > gnu: Add prrte. > gnu: slurm: Add PMIx support. > gnu: Add openmpi-5. > gnu: openmpi: Set default version to 4.x. I made the change below to ensure that all the versions of the ‘slurm’ package would still build. It took me a while :-) but in the end it’s just about removing ‘openmpix’ from the inputs of older versions. Will push shortly. Thank you! Ludo’. diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index c62402cf5c..440a808f68 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -247,7 +247,10 @@ (define-public slurm (string-append "--with-munge=" #$(this-package-input "munge")) ;; Use PMIx bundled with Open MPI (this is required for Open MPI 5.x). - (string-append "--with-pmix=" #$(this-package-input "openpmix")) + #$(let ((openmpix (this-package-input "openpmix"))) + (if openmpix + #~(string-append "--with-pmix=" #$openmpix) + "--without-pmix")) ;; 32-bit support is marked as deprecated and needs to be ;; explicitly enabled. @@ -310,10 +313,10 @@ (define-public slurm-22.05 (define-public slurm-21.08 (package - (inherit slurm) + (inherit slurm-22.05) (version "21.08.8") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-22.05)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -321,14 +324,19 @@ (define-public slurm-21.08 (patches '()) ;drop 'salloc' patch (sha256 (base32 - "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf")))))) + "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf")))) + + ;; This and older versions of slurm have PMIx support but they seem to + ;; require an older version of openpmix. Disable PMIx support. + (inputs (pk 'x (modify-inputs (package-inputs slurm-22.05) + (delete "openpmix")))))) (define-public slurm-20.11 (package - (inherit slurm) + (inherit slurm-21.08) (version "20.11.9") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-21.08)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -340,10 +348,10 @@ (define-public slurm-20.11 (define-public slurm-20.02 (package - (inherit slurm) + (inherit slurm-20.11) (version "20.02.6-1") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-20.11)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -353,7 +361,7 @@ (define-public slurm-20.02 (base32 "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc")))) (arguments - (substitute-keyword-arguments (package-arguments slurm) + (substitute-keyword-arguments (package-arguments slurm-20.11) ((#:configure-flags flags ''()) #~(append '("CFLAGS=-O2 -g -fcommon" "LDFLAGS=-fcommon") #$flags)))))) @@ -363,7 +371,7 @@ (define-public slurm-19.05 (inherit slurm-20.02) (version "19.05.8") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-20.02)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -376,11 +384,11 @@ (define-public slurm-19.05 ;; Same as Debian 10 (define-public slurm-18.08 (package - (inherit slurm-20.02) + (inherit slurm-19.05) (version "18.08.9") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-20.02)) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))