From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WCd/Ke6eQWLopAAAgWs5BA (envelope-from ) for ; Mon, 28 Mar 2022 13:41:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wCILJu6eQWJmhgEAauVa8A (envelope-from ) for ; Mon, 28 Mar 2022 13:41:34 +0200 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 35AECA76F for ; Mon, 28 Mar 2022 13:41:34 +0200 (CEST) Received: from localhost ([::1]:50496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYnkW-0003Kw-JV for larch@yhetil.org; Mon, 28 Mar 2022 07:41:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYnk6-0003Ki-5b for guix-patches@gnu.org; Mon, 28 Mar 2022 07:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYnk5-0005jI-QW for guix-patches@gnu.org; Mon, 28 Mar 2022 07:41:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYnk5-0004yG-JQ for guix-patches@gnu.org; Mon, 28 Mar 2022 07:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54547] [PATCH] gnu: slurm: Install libpmi2. Resent-From: Philippe SWARTVAGHER Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Mar 2022 11:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54547 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54547@debbugs.gnu.org Received: via spool by 54547-submit@debbugs.gnu.org id=B54547.164846763219064 (code B ref 54547); Mon, 28 Mar 2022 11:41:01 +0000 Received: (at 54547) by debbugs.gnu.org; 28 Mar 2022 11:40:32 +0000 Received: from localhost ([127.0.0.1]:57385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYnjb-0004xQ-ML for submit@debbugs.gnu.org; Mon, 28 Mar 2022 07:40:32 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:3594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYnjW-0004x9-B3 for 54547@debbugs.gnu.org; Mon, 28 Mar 2022 07:40:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=/usSc/dFDcAg6EaXHX4pLNsqdC4Kly5V/+DAHh8flSI=; b=BcTvKzasBFu5Wlyv81lyOcc3AcAQEJTrWQEPKYC1TKxNANqP9uo11oyh fMRdbXuhYB2/JjwDyOstKC00nS0VMa0SuIGzFuwWhn5OIjKvbqT0Gqjat oCrmAlmZb+1Bp4DYITgCW0h8hBUYj4AQL+jsxbdYGONuNJA8qYS1ngckh w=; X-IronPort-AV: E=Sophos;i="5.90,217,1643670000"; d="scan'208";a="9810835" Received: from unknown (HELO [193.50.110.193]) ([193.50.110.193]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2022 13:40:06 +0200 Message-ID: <1316110e-1d81-1352-6afa-9a9b976ed4a6@inria.fr> Date: Mon, 28 Mar 2022 13:40:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: fr References: <20220324152615.30374-1-ludo@gnu.org> From: Philippe SWARTVAGHER In-Reply-To: <20220324152615.30374-1-ludo@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648467694; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=/usSc/dFDcAg6EaXHX4pLNsqdC4Kly5V/+DAHh8flSI=; b=JRr209tIcZVoFoHgG2U3dghOFNdtxtxEeG/2tyoXtsdZupX1vYOm7JbvvBjzNubSJEmHjL 5bKVrrj8s6IOvCjllkcaXU24Tgd4ddFKqSngISWzWouQ8YnHBb0FPVQMatdLBmRdrBoasa FqGCpeDOracmT2OXlkPzcE3quYNwQwvIqrlz7t3zShjkuBJpF5N+hnNSLZyxTkhTtgUQXF B52UhISMxOvZSyq4k/HI2bUIbehoIiSFZnM1Oe3Ki8LFJF4wuJlHpqL4ORPmzwyQsP5G6Y JV6qd7+zgqU66mdqD79EgqDEUshdsa1Lxf/rE6m+do4MqJ0bYNmzZc+kIa3Png== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648467694; a=rsa-sha256; cv=none; b=uSY87wi6oqXugarI6WcQO4yaO4jL/YBWiAdhhUJfjATY7+fvK6LzPCQ6JBtPvOSRr5l/gB osl7ACijGF2OhRB3KZIiU0fZyf5mJ9DhJw/f/48AeACcS+rEaLnVl71uiLeMAhd/npt5OV zuSQKascvyWFibMW7lhDOBLt8pdbNNCyQZjYu2ovH+DYxsdUttykQe9euOruVAe81P5yEE qkT0XxORvwBuQmYZ9hvnkePA8wmIUF60u2e6hPpYf2gdb/XRP+5veJ8gWlz9LgxMkxEBf1 dTXpSyVKUrvUgDqjBMZWZg1cuBLVDBsyOaJQ/ca7IzhQTudaMkgxaluuIVJdHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=inria.fr header.s=dc header.b=BcTvKzas; dmarc=fail reason="SPF not aligned (relaxed)" header.from=inria.fr (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" X-Migadu-Spam-Score: 5.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=inria.fr header.s=dc header.b=BcTvKzas; dmarc=fail reason="SPF not aligned (relaxed)" header.from=inria.fr (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" X-Migadu-Queue-Id: 35AECA76F X-Spam-Score: 5.73 X-Migadu-Scanner: scn1.migadu.com X-TUID: fFffFx5GG9k9 Hello, Le 24/03/2022 à 16:26, Ludovic Courtès a écrit : > From: Ludovic Courtès > > * gnu/packages/parallel.scm (slurm)[source](snippet): Let PMI2 through. > [arguments]: In phase 'install-libpmi', install "contribs/pmi2". > [license]: Add 'non-copyleft'. > --- > gnu/packages/parallel.scm | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > Hi! > > Previously, we were erroneously excluding libpmi2. It’s actually free, > under a lax non-copyleft license (full text below): > > https://github.com/SchedMD/slurm/blob/master/contribs/pmi2/COPYRIGHT > > That library is in Debian: > > https://packages.debian.org/sid/libpmi2-0-dev > > Tested with slurm 20.11, 20.02, 19, and 18 as currently available. > > Objections? > > Thanks, > Ludo’. > > Full license text: > > --8<---------------cut here---------------start------------->8--- > > COPYRIGHT > > The following is a notice of limited availability of the code, and disclaimer > which must be included in the prologue of the code and in all source listings > of the code. > > Copyright Notice > + 2002 University of Chicago > > Permission is hereby granted to use, reproduce, prepare derivative works, and > to redistribute to others. This software was authored by: > > Mathematics and Computer Science Division > Argonne National Laboratory, Argonne IL 60439 > > (and) > > Department of Computer Science > University of Illinois at Urbana-Champaign > > > GOVERNMENT LICENSE > > Portions of this material resulted from work developed under a U.S. > Government Contract and are subject to the following license: the Government > is granted for itself and others acting on its behalf a paid-up, nonexclusive, > irrevocable worldwide license in this computer software to reproduce, prepare > derivative works, and perform publicly and display publicly. > > DISCLAIMER > > This computer code material was prepared, in part, as an account of work > sponsored by an agency of the United States Government. Neither the United > States, nor the University of Chicago, nor any of their employees, makes any > warranty express or implied, or assumes any legal liability or responsibility > for the accuracy, completeness, or usefulness of any information, apparatus, > product, or process disclosed, or represents that its use would not infringe > privately owned rights. > --8<---------------cut here---------------end--------------->8--- > > > diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm > index 5f84fb6777..d7c3586606 100644 > --- a/gnu/packages/parallel.scm > +++ b/gnu/packages/parallel.scm > @@ -182,19 +182,20 @@ (define-public slurm > ;; > ;; there are non-free bits under contribs/, though it's not > ;; clear which ones. libpmi is clearly free (it used to be > - ;; under src/api/), so remove all of contribs/ except > - ;; contribs/pmi/. > + ;; under src/api/) and so is pmi2 (lax non-copyleft > + ;; license), so remove all of contribs/ except pmi and pmi2. > (substitute* "configure.ac" > (("^[[:space:]]+contribs/(.*)$" all directory) > - (if (and (string-prefix? "pmi" directory) > - (not (string-prefix? "pmi2" directory))) > + (if (string-prefix? "pmi" directory) > all > ""))) > > (rename-file "contribs/pmi" "tmp-pmi") > + (rename-file "contribs/pmi2" "tmp-pmi2") > (delete-file-recursively "contribs") > (mkdir "contribs") > - (rename-file "tmp-pmi" "contribs/pmi"))))) > + (rename-file "tmp-pmi" "contribs/pmi") > + (rename-file "tmp-pmi2" "contribs/pmi2"))))) > ;; FIXME: More optional inputs could be added, > ;; in particular mysql and gtk+. > (inputs (list freeipmi > @@ -231,7 +232,10 @@ (define-public slurm > (add-after 'install 'install-libpmi > (lambda _ > ;; Open MPI expects libpmi to be provided by Slurm so install it. > - (invoke "make" "install" "-C" "contribs/pmi")))))) > + (invoke "make" "install" "-C" "contribs/pmi") > + > + ;; Others expect pmi2. > + (invoke "make" "install" "-C" "contribs/pmi2")))))) > (home-page "https://slurm.schedmd.com/") > (synopsis "Workload manager for cluster computing") > (description > @@ -246,6 +250,8 @@ (define-public slurm > license:isc ; src/common/strlcpy.c > license:lgpl2.1+ ; hilbert.[ch], src/common/slurm_time.h > license:zlib ; src/common/strnatcmp.c > + (license:non-copyleft ;contribs/pmi2, Argonne Natl. Lab. > + "https://github.com/SchedMD/slurm/blob/master/contribs/pmi2/COPYRIGHT") > license:gpl2+)))) ; the rest, often with OpenSSL exception > > ;; The SLURM client/daemon protocol and file format changes from time to time Tested, and works as expected: slurm/pmi2.h is detected by other packages which require it. -- Philippe