From patchwork Thu Mar 24 15:26:15 2022 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: 38038 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 1DB7427BBE9; Thu, 24 Mar 2022 15:33:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 0704427BBEA for ; Thu, 24 Mar 2022 15:33:20 +0000 (GMT) Received: from localhost ([::1]:40932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXPSg-0003gI-Vs for patchwork@mira.cbaines.net; Thu, 24 Mar 2022 11:33:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXPSR-0003ft-4Y for guix-patches@gnu.org; Thu, 24 Mar 2022 11:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXPSQ-0003aV-QK for guix-patches@gnu.org; Thu, 24 Mar 2022 11:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nXPSQ-0007OZ-5M; Thu, 24 Mar 2022 11:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54547] [PATCH] gnu: slurm: Install libpmi2. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: philippe.swartvagher@inria.fr, guix-patches@gnu.org Resent-Date: Thu, 24 Mar 2022 15:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54547 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54547@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Philippe Swartvagher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Philippe Swartvagher Received: via spool by submit@debbugs.gnu.org id=B.164813592628333 (code B ref -1); Thu, 24 Mar 2022 15:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Mar 2022 15:32:06 +0000 Received: from localhost ([127.0.0.1]:49204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXPRR-0007MN-Hh for submit@debbugs.gnu.org; Thu, 24 Mar 2022 11:32:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:38764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXPRO-0007M7-Mn for submit@debbugs.gnu.org; Thu, 24 Mar 2022 11:32:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXPRN-0003bo-TQ for guix-patches@gnu.org; Thu, 24 Mar 2022 11:31:58 -0400 Received: from [2001:470:142:3::e] (port=58910 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXPRM-0003J2-2F; Thu, 24 Mar 2022 11:31:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=E9HbFo5eCEfdeS2Xsnt5Ad8j+/nRROhdDeBww4CAN/0=; b=hhkbkTHIG95G/w WDjHjggLxLpcgwr04QSSMOE6NG5xqQLnUW05ZmZ6iOnXloBHlUUsSScwro7WVYp6Of81bfQOiWONs qYKEbY5ztCnyVpt822/SyQ1Q+twS/QGpb0hPGq55qtENJHJs/CRt5L9ICVXkl6K+Lr8Ay/Ybo7Z3k yiAZmBDsTY8UGEeIDnr8rsIjFYwYWy5os0xpjJb6iqPQDFxJ4DuMFMgPt9Ru+Eg+cGzIlDHtWnU5d Kq8L9K42jhfMjym84hz0MbAJSBHM6KNsjYJAv8KfhZlGgZCaFcSgP3FKfvr0yNc6MjySIpLE776eH zZo2WyvZk50h97lXCVpQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=38660 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXPM2-0000ga-0p; Thu, 24 Mar 2022 11:26:26 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 24 Mar 2022 16:26:15 +0100 Message-Id: <20220324152615.30374-1-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 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" X-getmail-retrieved-from-mailbox: Patches 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