From a92e300f28f463b688ad02d07122863b0461f11a Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Tue, 29 Oct 2024 17:32:53 +0100 Subject: [PATCH 1/4] modifs --- glicid/packages/maths.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/glicid/packages/maths.scm b/glicid/packages/maths.scm index a2e9462..af72089 100644 --- a/glicid/packages/maths.scm +++ b/glicid/packages/maths.scm @@ -10,6 +10,8 @@ #:use-module (gnu packages compression) #:use-module (guix build-system cmake) #:use-module ((guix licenses) #:prefix license:) + #:use-module (srfi srfi-1) ;; for (take + #:use-module (gnu packages maths) #:use-module (glicid utils)) (define-public scalapack-upstream @@ -62,6 +64,27 @@ (prepend gfortran-toolchain))))) +(define-public hdf5-1.10.2 + (package + (inherit hdf5-1.8) + (version "1.10.2") + (source + (origin + (method url-fetch) + (uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/" + "hdf5-" (version-major+minor version) + "/hdf5-" version "/src/hdf5-" + version ".tar.bz2") + (string-append "https://support.hdfgroup.org/ftp/HDF5/" + "current" + (apply string-append + (take (string-split version #\.) 2)) + "/src/hdf5-" version ".tar.bz2"))) + (sha256 + (base32 "0wfb3w6dzi6zr2g1sdswqy9lxbp7yr4blvyi7k2xya7izmxmpb8w")) + (patches (search-patches "hdf5-config-date.patch")))))) + + (define local:openblas openblas-upstream-0.3.15) (define-public scalapack-latest @@ -103,3 +126,4 @@ (license license:bsd-3)) ) +hdf5-1.10.2 \ No newline at end of file From 3b9763cb22d3e97f956fa8d12dccd2451fbb99de Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Wed, 30 Oct 2024 15:00:00 +0100 Subject: [PATCH 2/4] Revert "modifs" This reverts commit a92e300f28f463b688ad02d07122863b0461f11a. --- glicid/packages/maths.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/glicid/packages/maths.scm b/glicid/packages/maths.scm index af72089..a2e9462 100644 --- a/glicid/packages/maths.scm +++ b/glicid/packages/maths.scm @@ -10,8 +10,6 @@ #:use-module (gnu packages compression) #:use-module (guix build-system cmake) #:use-module ((guix licenses) #:prefix license:) - #:use-module (srfi srfi-1) ;; for (take - #:use-module (gnu packages maths) #:use-module (glicid utils)) (define-public scalapack-upstream @@ -64,27 +62,6 @@ (prepend gfortran-toolchain))))) -(define-public hdf5-1.10.2 - (package - (inherit hdf5-1.8) - (version "1.10.2") - (source - (origin - (method url-fetch) - (uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/" - "hdf5-" (version-major+minor version) - "/hdf5-" version "/src/hdf5-" - version ".tar.bz2") - (string-append "https://support.hdfgroup.org/ftp/HDF5/" - "current" - (apply string-append - (take (string-split version #\.) 2)) - "/src/hdf5-" version ".tar.bz2"))) - (sha256 - (base32 "0wfb3w6dzi6zr2g1sdswqy9lxbp7yr4blvyi7k2xya7izmxmpb8w")) - (patches (search-patches "hdf5-config-date.patch")))))) - - (define local:openblas openblas-upstream-0.3.15) (define-public scalapack-latest @@ -126,4 +103,3 @@ (license license:bsd-3)) ) -hdf5-1.10.2 \ No newline at end of file From 4944bc9827a3ae09147f3bcedcf4c5164917aaed Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Wed, 30 Oct 2024 15:07:21 +0100 Subject: [PATCH 3/4] add a multiple rclocal variant --- glicid/services/rc-local.scm | 44 +++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/glicid/services/rc-local.scm b/glicid/services/rc-local.scm index a91ddc7..8de132d 100644 --- a/glicid/services/rc-local.scm +++ b/glicid/services/rc-local.scm @@ -10,7 +10,16 @@ rc-local-configuration rc-local-configuration? rc-local-service - rc-local-service-type)) + rc-local-service-type + + %default-rc-multiplelocal-conf + rc-multiplelocal-configuration + rc-multiplelocal-configuration? + rc-multiplelocal-service + rc-multiplelocal-service-type + + +)) (define %default-rc-local-conf (plain-file "rc-local" " @@ -45,3 +54,36 @@ (extensions (list (service-extension shepherd-root-service-type rc-local-service))) (description "Run a script in a rc-local like form"))) +(define %default-rc-multiplelocal-conf + (plain-file "rc-multiplelocal" " + # Empty file as we do nothing by default + ")) + +(define-record-type* + + rc-multiplelocal-configuration make-rc-multiplelocal-configuration + rc-multiplelocal-configuration? + (config-file rc-multiplelocal-config-file (default %default-rc-multiplelocal-conf)) + (log-file log-file (default "/var/log/rc-multiplelocal.log"))) + +(define rc-multiplelocal-service + (match-lambda + (($ config-file log-file) + (list + (shepherd-service + (provision '(rc-multiplelocal)) + (documentation "Run rc-multiplelocal.") + (requirement '(user-processes udev)) + (respawn? #f) + (one-shot? #t) + (start #~(make-forkexec-constructor + (list #$(file-append bash "/bin/bash") "-l" #$config-file) + #:log-file #$log-file )) + (stop #~(make-kill-destructor))))))) + +(define rc-multiplelocal-service-type + (service-type + (name 'rc-multiplelocal) + (extensions (list (service-extension shepherd-root-service-type rc-multiplelocal-service))) + (description "Run a script in a rc-multiplelocal like form"))) + From 33c50405cf62538f7e819c483849026c4ae177d3 Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Wed, 30 Oct 2024 16:17:54 +0100 Subject: [PATCH 4/4] add dependencies for slurm REST API support --- glicid/packages/parallel.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index 755b3cd..6f4e470 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -21,6 +21,8 @@ #:use-module (glicid packages containers) ;for latest podman #:use-module (gnu packages compression) ;lz4 #:use-module (gnu packages lua) ;lua + #:use-module (gnu packages web) ; json-c, http-parser for slurm REST API + #:use-module (gnu packages serialization) ; libyaml for slurm REST API #:use-module ((guix utils) #:select (target-64bit?)) ) @@ -140,8 +142,10 @@ (inherit slurm-22.05-latest) (name "slurm-glicid-noucx-nopmix") (inputs (modify-inputs (package-inputs slurm-22.05-latest) - (prepend gtk+-2 ucx openpmix-3 - `(,mariadb "dev")))))) + (prepend gtk+-2 ; for sview + ucx openpmix-3 ; for pmix support + json-c libyaml http-parser ; for REST API + `(,mariadb "dev")))))) ; for mariadb/mysql client support