From patchwork Fri Oct 18 14:58:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 69090 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 C27A727BBEA; Fri, 18 Oct 2024 16:00:10 +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 69A9F27BBE2 for ; Fri, 18 Oct 2024 16:00:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1oSE-0006OD-Fr; Fri, 18 Oct 2024 10:59:52 -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 1t1oS6-0006ND-QJ for guix-patches@gnu.org; Fri, 18 Oct 2024 10:59:44 -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 1t1oS6-00046M-Bm; Fri, 18 Oct 2024 10:59:42 -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=8Ju7K3FiSglYS8d6QRLlOgxeLEry4Uw1qoWTonVnvLM=; b=k5NDMpo6pg5wiNAk5sSWOiJkfmtk9qFKv61Tn7vxgw/yZyi93/UqGf2RfQHlMT3qIBPoBkx2YFa06zIV1dSDpDIHZoxU/IJwvCZwySR+cwGNOiOSnjx3HL+Kb/OrO1yfpm1mDretX07cs/bypWdcOot4l0CnzuNtJrCi2k1avykC6laElrqAftXqhKbMJgu0EUE+zZh8CVo3bxAP9O9QtPjhC5iUmGWKriCjpr1Kpkn//CuB06h90QML9bkQ0VdwngmMmh+dQP5pNTTHlzR8T6Gxm1GS1dgCI9NUiw3i0cY9gOgMhlx5EfHbCLQqIFGaZD1Iuw2NiyfNfmVbwMRJDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1oSR-0004BJ-0x; Fri, 18 Oct 2024 11:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72766] [PATCH v3 1/2] gnu: slurm: Enable REST API. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: arunisaac@systemreboot.net, ludovic.courtes@inria.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Fri, 18 Oct 2024 15:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72766@debbugs.gnu.org Cc: Arun Isaac , Arun Isaac , Ludovic =?utf-8?q?Court=C3=A8s?= , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Arun Isaac , Ludovic =?utf-8?q?Court=C3=A8s?= , Ludovic =?utf-8?q?Cour?= =?utf-8?q?t=C3=A8s?= Received: via spool by 72766-submit@debbugs.gnu.org id=B72766.172926355115973 (code B ref 72766); Fri, 18 Oct 2024 15:00:02 +0000 Received: (at 72766) by debbugs.gnu.org; 18 Oct 2024 14:59:11 +0000 Received: from localhost ([127.0.0.1]:39705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1oRa-00049X-LA for submit@debbugs.gnu.org; Fri, 18 Oct 2024 10:59:11 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:60730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1oRU-000496-QW for 72766@debbugs.gnu.org; Fri, 18 Oct 2024 10:59:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8Ju7K3FiSglYS8d6QRLlOgxeLEry4Uw1qoWTonVnvLM=; b=oYxXm37A6MJH05wQaKvTwqpSsx IFZ+W3Q32xdpjRJlhkwup1pLvLnlRkxmG1OrIl8tv0idjINcdO/n7VdJsKeMVmikf3B0eT8cqyta5 AX8OnjpzQgTIVG8qCsDgQsxoaG3RFJbSgTE/tgt2a+NnMAxzMvSkRueyF2V+SIPqwm8E3OFlwV+pf Q/8qd0ZftVwcwuvp/d+VxA0PFnUAvpMBEds5545y8TzAtv1p3FHytRR5Q3WPFItLKkYclK7EdbOez wpFjk3CXFSzuwQ9OBWOAHkK9yPcJxf6z9lKxJbT0fwjBuK3IoAGqrTTWyfeA5Yu6e1UJCy9GiTuGW 5/77gEfw==; Received: from [192.168.2.1] (port=47248 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98) (envelope-from ) id 1t1oLB-000000002pT-3dN4; Fri, 18 Oct 2024 15:52:34 +0100 From: Arun Isaac Date: Fri, 18 Oct 2024 15:58:11 +0100 Message-ID: <7aaf17b37cbdfba71f428a24631a7e9e82ed8c0e.1729262403.git.arunisaac@systemreboot.net> X-Mailer: git-send-email 2.45.2 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 * gnu/packages/parallel.scm (slurm)[inputs]: Add dbus, http-parser, libjwt, librdkafka, libtaml and (mariadb "dev"). [arguments]: Add --enable-slurmrestd, --with-bpf, --with-http-parser, --with-rdkafka and --with-yaml to configure flags. Change-Id: Icddaa8f883754129d975e82fccd732a47a467517 --- gnu/packages/parallel.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index fc96136065..522d326ef2 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 David Elsing ;;; Copyright © 2024 Romain Garbage +;;; Copyright © 2024 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,14 +50,17 @@ (define-module (gnu packages parallel) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages check) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages freeipmi) #:use-module (gnu packages gcc) + #:use-module (gnu packages glib) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) + #:use-module (gnu packages networking) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -64,6 +68,7 @@ (define-module (gnu packages parallel) #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages serialization) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages web)) @@ -223,12 +228,17 @@ (define-public slurm (mkdir "contribs") (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 + ;; FIXME: More optional inputs (for example, gtk+) could be added. + (inputs (list dbus + freeipmi + http-parser `(,hwloc-2 "lib") json-c + libjwt + librdkafka + libyaml linux-pam + `(,mariadb "dev") openpmix munge numactl @@ -238,13 +248,22 @@ (define-public slurm (build-system gnu-build-system) (arguments (list #:configure-flags - #~(list "--enable-pam" "--sysconfdir=/etc/slurm" + #~(list "--enable-pam" + "--enable-slurmrestd" + "--sysconfdir=/etc/slurm" "--disable-static" + (string-append "--with-bpf=" + (dirname (dirname (search-input-directory + %build-inputs "include/linux")))) (string-append "--with-freeipmi=" #$(this-package-input "freeipmi")) + (string-append "--with-http-parser=" + #$(this-package-input "http-parser")) (string-append "--with-hwloc=" (ungexp (this-package-input "hwloc") "lib")) (string-append "--with-json=" #$(this-package-input "json-c")) (string-append "--with-munge=" #$(this-package-input "munge")) + (string-append "--with-rdkafka=" #$(this-package-input "librdkafka")) + (string-append "--with-yaml=" #$(this-package-input "libyaml")) ;; Use PMIx bundled with Open MPI (this is required for Open MPI 5.x). ;; Note: Older versions that inherit from this package lack the From patchwork Fri Oct 18 14:58:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 69091 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 0627027BBEA; Fri, 18 Oct 2024 16:00:14 +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 A76F827BBE2 for ; Fri, 18 Oct 2024 16:00:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1oSN-0006Pr-Qq; Fri, 18 Oct 2024 10:59:59 -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 1t1oS6-0006NC-Oq for guix-patches@gnu.org; Fri, 18 Oct 2024 10:59:43 -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 1t1oS6-00046L-A5; Fri, 18 Oct 2024 10:59:42 -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=fTQMQnjPARMm/8t7kqo++wX/Z3fQ4yv1cbtyuAGlKgo=; b=T1QyDuyQmGDNCOzldI07UMkxST7RTqFrkRhX2q244RI8z6XU8x9yUuZ7nsQFa0ZWdTLmd43HiQzbAbR++Is/Tb5b66R192VpXhcZDinM+9hwX1k9ZZc+R/xCFKZyaNrAJFE0QATQH5g/5Mu6QEBak97PWtfeW30aQvT3RGcmxxWN4nHiRgXojzBzRoEjrCEyPYxmqs2pzJIKoJklVM6LAHZRHtAzEmuVxmylvKxVsCS5uyA6NNnyD4iwfNKzz16kI3CdBHVwTF5aLmu9STEsXQfU/EaUn2CaXH4QQNuB8V41qHcPPVJbEwH4xs6Y3LAdvYKTchvoYJtLTaAj4NEqVA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1oSR-0004BR-FG; Fri, 18 Oct 2024 11:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72766] [PATCH v3 2/2] gnu: slurm: Move client executables into separate output. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: arunisaac@systemreboot.net, ludovic.courtes@inria.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Fri, 18 Oct 2024 15:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72766@debbugs.gnu.org Cc: Arun Isaac , Arun Isaac , Ludovic =?utf-8?q?Court=C3=A8s?= , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Arun Isaac , Ludovic =?utf-8?q?Court=C3=A8s?= , Ludovic =?utf-8?q?Cour?= =?utf-8?q?t=C3=A8s?= Received: via spool by 72766-submit@debbugs.gnu.org id=B72766.172926355115980 (code B ref 72766); Fri, 18 Oct 2024 15:00:03 +0000 Received: (at 72766) by debbugs.gnu.org; 18 Oct 2024 14:59:11 +0000 Received: from localhost ([127.0.0.1]:39707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1oRb-00049a-9u for submit@debbugs.gnu.org; Fri, 18 Oct 2024 10:59:11 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:39022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1oRX-00049D-Ck for 72766@debbugs.gnu.org; Fri, 18 Oct 2024 10:59:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=fTQMQnjPARMm/8t7kqo++wX/Z3fQ4yv1cbtyuAGlKgo=; b=ZqJBbtk+YQFw161coiSEG71vy4 zM1txrGvbklkrKwZAD9rtGu7zKex5l5e9OStgQtjBzeDmm97vQ6GX7oEV6FhxDBgkX2zhv2iEkfwY ucLT6Z2Prs11rsnDBRN63/YnhxOuoqD+t10OlnMTsyBIk7GrkWkKUZSSFaBOWHxYz96jAUaF+hkt1 /WVBLsWwxsexbCmrkF1RGdJRSeE77SgnPWr25X484IAUEwBruEoNPL/8BFd7eUNBBI0NYzWxNuqK8 WBpF6BZUVyuQqHp30VNbGYuzlCp0bg4UILPRtH4dUn9Miy15iIce7BcRXRy2er7hWuUjBVUA+tdwh xDnwDY0Q==; Received: from [192.168.2.1] (port=47248 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98) (envelope-from ) id 1t1oLF-000000002pT-2S4J; Fri, 18 Oct 2024 15:52:38 +0100 From: Arun Isaac Date: Fri, 18 Oct 2024 15:58:12 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 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 * gnu/packages/parallel.scm (slurm)[outputs]: Add client. [arguments]: Add move-client-executables phase. Change-Id: Id7441b0b34a5b8433e4c38bd5c56e4ca1fec587c --- gnu/packages/parallel.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 522d326ef2..f27f07ca1e 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -246,6 +246,7 @@ (define-public slurm (native-inputs (list autoconf expect perl pkg-config python-wrapper)) (build-system gnu-build-system) + (outputs '("out" "client")) (arguments (list #:configure-flags #~(list "--enable-pam" @@ -291,7 +292,17 @@ (define-public slurm (invoke "make" "install" "-C" "contribs/pmi") ;; Others expect pmi2. - (invoke "make" "install" "-C" "contribs/pmi2")))))) + (invoke "make" "install" "-C" "contribs/pmi2"))) + (add-after 'install 'move-client-executables + (lambda _ + (let ((client-bin (string-append #$output:client "/bin"))) + (mkdir-p client-bin) + (for-each (lambda (executable) + (rename-file executable + (string-append client-bin + "/" + (basename executable)))) + (find-files (string-append #$output "/bin"))))))))) (home-page "https://slurm.schedmd.com/") (synopsis "Workload manager for cluster computing") (description