Commit bcdb1fbc authored by MARAIT Gilles's avatar MARAIT Gilles
Browse files

Merge branch 'master' of gitlab.inria.fr:guix-hpc/guix-hpc

parents b5c0f907 1701e9aa
GNU Guix for High-Performance Computing
===========================================
[![pipeline status](https://gitlab.inria.fr/guix-hpc/guix-hpc/badges/master/pipeline.svg)](https://gitlab.inria.fr/guix-hpc/guix-hpc/commits/master) [![SWH](https://archive.softwareheritage.org/badge/origin/https://gitlab.inria.fr/guix-hpc/guix-hpc/)](https://archive.softwareheritage.org/browse/origin/https://gitlab.inria.fr/guix-hpc/guix-hpc/)
[![pipeline status](https://guix.bordeaux.inria.fr/jobset/guix-hpc/badge.svg)](https://guix.bordeaux.inria.fr/jobset/guix-hpc) [![SWH](https://archive.softwareheritage.org/badge/origin/https://gitlab.inria.fr/guix-hpc/guix-hpc/)](https://archive.softwareheritage.org/browse/origin/https://gitlab.inria.fr/guix-hpc/guix-hpc/)
Hello! This repository contains package recipes and extensions of the
[GNU Guix package manager](https://gnu.org/s/guix) for high-performance
......
......@@ -8,6 +8,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages gl)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages maths)
......@@ -24,6 +25,8 @@
;;;
;;; Code:
(define S specification->package)
(define-public paraview
;; TODO: This should be part of Guix proper, but first, we should try
;; unbundling VTK.
......@@ -53,12 +56,12 @@
;; 'VTK_CXX_COMPILER' as the absolute file name of 'c++'. Remove that so
;; we don't keep a reference to GCC.
(native-inputs
`(("qttools" ,qttools)))
`(("qttools" ,(S "qttools@5"))))
(inputs
`(("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)
`(("qtbase" ,(S "qtbase@5"))
("qtsvg" ,(S "qtsvg@5"))
("qtx11extras" ,(S "qtx11extras@5"))
("qtxmlpatterns" ,(S "qtxmlpatterns@5"))
("libx11" ,libx11)
("libxt" ,libxt)
("mesa" ,mesa)
......
......@@ -136,7 +136,7 @@ kernels are executed as efficiently as possible.")
(package
(inherit starpu-1.2)
(name "starpu")
(version "1.3.7"); for the next release, update also fxt in inria/eztrace.scm
(version "1.3.8"); for the next release, update also fxt in inria/eztrace.scm
(source (origin
(method git-fetch)
(uri (git-reference
......@@ -144,7 +144,7 @@ kernels are executed as efficiently as possible.")
(commit (string-append "starpu-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0819q3qwgzv4py40p6v9qr38cg0qvbhij512i0az6wip2xi1v1gg"))
(base32 "0sgr93czg4799vcdbxli56f65pwyg98xijwsiic8j34njrvy2mdz"))
(patches (search-patches %patch-path))))
(arguments
(substitute-keyword-arguments (package-arguments starpu-1.2)
......
......@@ -20,17 +20,17 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages base))
(define %pm2-home-page "http://pm2.gforge.inria.fr/")
(define %pm2-home-page "https://pm2.gitlabpages.inria.fr/")
(define %pm2-git "https://gitlab.inria.fr/pm2/pm2.git")
(define %pm2-commit "8317021ced771ba585ba78e0d88053aa53436f62")
(define %pm2-hash "0vh830g2j43hzs250pj139550zbh7zg3wkvf6jhrsaia2xfc6air") ; guix hash -rx .
(define %pm2-commit "2765619bd2c77af733778643f369ba086a29715a")
(define %pm2-hash "02fwq63wmljk3d1val4y46jkr6lvdbd6d6qkkkpar51r9qf5n5h1") ; guix hash -rx .
(define %v2020-12-16 "2020-12-16")
(define %v2021-05-21 "2021-05-21")
(define-public puk-2020-12-16
(define-public puk-2021-05-21
(package
(name "puk")
(version %v2020-12-16)
(version %v2021-05-21)
(home-page (string-append %pm2-home-page "/PadicoTM"))
(source (origin
(method git-fetch)
......@@ -67,12 +67,12 @@ hashtables, lock-free queues). It may be used with")
(license license:gpl2)))
(define-public puk
puk-2020-12-16)
puk-2021-05-21)
(define-public pioman-2020-12-16
(define-public pioman-2021-05-21
(package
(name "pioman")
(version %v2020-12-16)
(version %v2021-05-21)
(home-page (string-append %pm2-home-page "/pioman"))
(source (origin
(method git-fetch)
......@@ -119,12 +119,12 @@ supporting MPI_THREAD_MULTIPLE multi-threading level.")
(license license:gpl2)))
(define-public pioman
pioman-2020-12-16)
pioman-2021-05-21)
(define-public pukabi-2020-12-16
(define-public pukabi-2021-05-21
(package
(name "pukabi")
(version %v2020-12-16)
(version %v2021-05-21)
(home-page (string-append %pm2-home-page "/PadicoTM"))
(source (origin
(method git-fetch)
......@@ -162,12 +162,12 @@ than libc pthread; add hooks for memory.")
(license license:gpl2)))
(define-public pukabi
pukabi-2020-12-16)
pukabi-2021-05-21)
(define-public padicotm-2020-12-16
(define-public padicotm-2021-05-21
(package
(name "padicotm")
(version %v2020-12-16)
(version %v2021-05-21)
(home-page (string-append %pm2-home-page "/PadicoTM"))
(source (origin
(method git-fetch)
......@@ -244,9 +244,9 @@ way rather than competitive.")
(license license:gpl2)))
(define-public padicotm
padicotm-2020-12-16)
padicotm-2021-05-21)
(define-public padicotm-mini-2020-12-16
(define-public padicotm-mini-2021-05-21
(package
(inherit padicotm)
(name "padicotm-mini")
......@@ -258,10 +258,10 @@ way rather than competitive.")
`(,@(delete `("pioman" ,pioman) (package-propagated-inputs padicotm))))))
(define-public padicotm-mini
padicotm-mini-2020-12-16)
padicotm-mini-2021-05-21)
;;see comment above nmad*-pukabi packages definition
(define-public padicotm-pukabi-2020-12-16
(define-public padicotm-pukabi-2021-05-21
(package
(inherit padicotm)
(name "padicotm-pukabi")
......@@ -273,9 +273,9 @@ way rather than competitive.")
`(,@(delete `("pukabi" ,pukabi) (package-propagated-inputs padicotm))))))
(define-public padicotm-pukabi
padicotm-pukabi-2020-12-16)
padicotm-pukabi-2021-05-21)
(define-public padicotm-mini-pukabi-2020-12-16
(define-public padicotm-mini-pukabi-2021-05-21
(package
(inherit padicotm-mini)
(name "padicotm-mini-pukabi")
......@@ -287,12 +287,12 @@ way rather than competitive.")
`(,@(delete `("pukabi" ,pukabi) (package-propagated-inputs padicotm-mini))))))
(define-public padicotm-mini-pukabi
padicotm-mini-pukabi-2020-12-16)
padicotm-mini-pukabi-2021-05-21)
(define-public nmad-2020-12-16
(define-public nmad-2021-05-21
(package
(name "nmad")
(version %v2020-12-16)
(version %v2021-05-21)
(home-page (string-append %pm2-home-page "/NewMadeleine"))
(source (origin
(method git-fetch)
......@@ -368,9 +368,9 @@ the MPI_THREAD_MULTIPLE multi-threading level.")
(license license:gpl2)))
(define-public nmad
nmad-2020-12-16)
nmad-2021-05-21)
(define-public nmad-mini-2020-12-16
(define-public nmad-mini-2021-05-21
(package
(inherit nmad)
(name "nmad-mini")
......@@ -383,12 +383,12 @@ the MPI_THREAD_MULTIPLE multi-threading level.")
,@(delete `("padicotm" ,padicotm) (package-propagated-inputs nmad))))))
(define-public nmad-mini
nmad-mini-2020-12-16)
nmad-mini-2021-05-21)
;;nmad-pukabi and nmad-mini-pukabi corresponds to old packages that were not using pukabi
;;they should only be used in case something goes wrong with the default ones
;;they are not meant to be maintained
(define-public nmad-pukabi-2020-12-16
(define-public nmad-pukabi-2021-05-21
(package
(inherit nmad)
(name "nmad-pukabi")
......@@ -400,7 +400,7 @@ the MPI_THREAD_MULTIPLE multi-threading level.")
`(("padicotm" ,padicotm-pukabi)
,@(delete `("padicotm" ,padicotm) (package-propagated-inputs nmad))))))
(define-public nmad-mini-pukabi-2020-12-16
(define-public nmad-mini-pukabi-2021-05-21
(package
(inherit nmad-mini)
(name "nmad-mini-pukabi")
......@@ -412,10 +412,10 @@ the MPI_THREAD_MULTIPLE multi-threading level.")
`(("padicotm" ,padicotm-mini-pukabi)
,@(delete `("padicotm" ,padicotm-mini) (package-propagated-inputs nmad-mini))))))
(define-public mpibenchmark-2020-12-16
(define-public mpibenchmark-2021-05-21
(package
(name "mpibenchmark")
(version %v2020-12-16)
(version %v2021-05-21)
(home-page (string-append %pm2-home-page "/mpibenchmark"))
(source (origin
(method git-fetch)
......@@ -461,12 +461,12 @@ are not benchmarked yet.")
(license license:gpl2)))
(define-public mpibenchmark
mpibenchmark-2020-12-16)
mpibenchmark-2021-05-21)
(define-public mpi_sync_clocks-2020-12-16
(define-public mpi_sync_clocks-2021-05-21
(package
(name "mpi_sync_clocks")
(version %v2020-12-16)
(version %v2021-05-21)
(home-page %pm2-home-page)
(source (origin
(method git-fetch)
......@@ -501,4 +501,4 @@ are not benchmarked yet.")
(license license:lgpl2.1)))
(define-public mpi_sync_clocks
mpi_sync_clocks-2020-12-16)
mpi_sync_clocks-2021-05-21)
;;; This module extends GNU Guix and is licensed under the same terms, those
;;; of the GNU GPL version 3 or (at your option) any later version.
;;;
;;; Copyright © 2019 Inria
;;; Copyright © 2019, 2021 Inria
(define-module (inria vite)
#:use-module (guix packages)
......@@ -9,9 +9,12 @@
#:use-module (guix licenses)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages qt)
#:use-module (gnu packages gl))
(define S specification->package)
(define-public vite
(let ((revision 1610))
(package
......@@ -39,11 +42,11 @@
)
#:tests? #f))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,(S "qtbase@5"))
("mesa" ,mesa)
("glu" ,glu)))
(native-inputs
`(("qttools" ,qttools)))
`(("qttools" ,(S "qttools@5"))))
(home-page "http://vite.gforge.inria.fr/")
(synopsis "Visualize program execution traces")
(description
......
(define-module (utils python-science)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (gnu packages check)
#:use-module (gnu packages gcc)
#:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-science)
#:use-module (guix build-system python)
......@@ -34,3 +38,64 @@
(home-page "https://github.com/pyamg/pyamg")
(license gpl3+)))
(define-public python-ttpy
(package
(name "python-ttpy")
(version "1.0")
(home-page "https://github.com/oseledets/ttpy")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit "b440f6299a6338de4aea67f3d839d613f4ef1374")
(recursive? #t)))
(sha256
(base32
"1bbq3acyxdjf33qj75yxrcz4aqzr8kzzzd70vzdcg3x5z943xi1k"))))
;; (version "1.2.1")
;; (source
;; (origin
;; (method url-fetch)
;; (uri (pypi-uri "ttpy" version))
;; (sha256
;; (base32
;; "1mgdq0g57f7sivl6g36p7qx99hm6zyc5hl8symdrmah1pgdywapq"))))
(build-system python-build-system)
(native-inputs `(("python-pytest" ,python-pytest)
("python-cython",python-cython)
("gfortran" ,gfortran)))
(inputs `(("lapack", lapack)
("gmp", gmp)
("mpfr", mpfr)
("openblas" ,openblas)))
(propagated-inputs `(("python-numpy" ,python-numpy)
("python-scipy" ,python-scipy)
("python-six" ,python-six)))
;; (arguments
;; `(#:phases
;; (modify-phases %standard-phases
;; (add-before 'build 'configure-openblas
;; (lambda* (#:key inputs #:allow-other-keys)
;; (call-with-output-file "site.cfg"
;; (lambda (port)
;; (format port
;; "[blas]
;; libraries = openblas
;; library_dirs = ~a/lib
;; include_dirs = ~a/include
;; # backslash-n to make emacs happy
;; \n[atlas]
;; library_dirs = ~a/lib
;; atlas_libs = openblas
;; "
;; (assoc-ref inputs "openblas")
;; (assoc-ref inputs "openblas")
;; (assoc-ref inputs "openblas"))))
;; #t)))))
(synopsis
"TTPY: Python implementation of the Tensor Train (TT) - Toolbox.")
(description
"Python implementation of the Tensor Train (TT) -Toolbox. It contains several important packages for working with the TT-format in Python. It is able to do TT-interpolation, solve linear systems, eigenproblems, solve dynamical problems. Several computational routines are done in Fortran (which can be used separately), and are wrapped with the f2py tool.")
(license #f))
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment