From 15ff5eebb6109159a9ea4afd8cc942d9e0113148 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 31 Oct 2022 17:08:32 -0700 Subject: gnu: Fix various lint issues in synopsis and descriptions. * gnu/packages/android.scm (etc1tool)[synopsis]: Drop trailing period. * gnu/packages/bioinformatics.scm (mudskipper)[synopsis]: Likewise. * gnu/packages/crates-io.scm (rust-async-log-attributes-1)[synopsis]: Likewise. (rust-atomic-polyfill-1)[synopsis]: Likewise. (rust-modifier-0.1)[synopsis]: Likewise. (rust-openssl-macros-0.1)[synopsis]: Likewise. (rust-syn-mid-0.5)[synopsis]: Likewise. (rust-toml-edit-0.14)[synopsis]: Likewise. (rust-valuable-derive-0.1)[synopsis]: Likewise. (rust-inflections-1)[synopsis]: Likewise. * gnu/packages/databases.scm (python-databases)[synopsis]: Likewise. * gnu/packages/games.scm (liquidwar6)[synopsis]: Likewise. * gnu/packages/golang.scm (go-golang.org-x-sync-errgroup)[synopsis]: Likewise. * gnu/packages/guile-xyz.scm (guile-config)[synopsis]: Likewise. * gnu/packages/haskell-web.scm (ghc-hxt-xpath)[synopsis]: Likewise. * gnu/packages/haskell-xyz.scm (ghc-string-qq)[synopsis]: Likewise. * gnu/packages/machine-learning.scm (python-lap)[synopsis]: Likewise. (python-pyro-api)[synopsis]: Likewise. * gnu/packages/messaging.scm (python-librecaptcha)[synopsis]: Likewise. * gnu/packages/python-check.scm (python-pytest-cram)[synopsis]: Likewise. * gnu/packages/python-web.scm (python-jschema-to-python)[synopsis]: Likewise. (python-sarif-om)[synopsis]: Likewise. (python-socksio)[synopsis]: Likewise. (python-msrest)[synopsis]: Likewise. * gnu/packages/tor.scm (torsocks)[synopsis]: Likewise. * gnu/packages/cran.scm (r-rlist)[synopsis]: Remove leading article. * gnu/packages/crates-io.scm (rust-clippy-lints-0.0.153)[synopsis]: Likewise. (rust-simplelog-0.11)[synopsis]: Likewise. * gnu/packages/samba.scm (wsdd)[synopsis]: Likewise. * gnu/packages/crates-io.scm (rust-spki-0.4)[synopsis]: Remove trailing whitespace. * gnu/packages/golang.scm (go-github-com-mattn-go-zglob)[description]: Remove leading whitespace. * gnu/packages/haskell-check.scm (ghc-crypto-cipher-tests)[description]: Likewise. * gnu/packages/lisp-xyz.scm (sbcl-ctype)[synopsis]: Remove trailing whitespace. * gnu/packages/mpi.scm (openmpi-thread-multiple)[description]: Remove leading whitespace. * gnu/packages/node-xyz.scm (node-string-decoder)[synopsis]: Remove trailing whitespace. --- gnu/packages/mpi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index ebf9238906..40f7d30d7e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -359,7 +359,7 @@ (define-public openmpi-thread-multiple (substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) `(cons "--enable-mpi-thread-multiple" ,flags)))) - (description " This version of Open@tie{}MPI has an implementation of + (description "This version of Open@tie{}MPI has an implementation of @code{MPI_Init_thread} that provides @code{MPI_THREAD_MULTIPLE}. This won't work correctly with all transports (such as @code{openib}), and the performance is generally worse than the vanilla @code{openmpi} package, which -- cgit v1.2.3 From e6f5b9f7321925ec3253e1240c4f5606fa65e490 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Nov 2022 21:07:21 +0100 Subject: gnu: java-openmpi: Remove unused module import. * gnu/packages/mpi.scm (java-openmpi)[arguments]: Don't import (guix build syscalls). --- gnu/packages/mpi.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 40f7d30d7e..af2409aeab 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -325,7 +325,6 @@ (define-public java-openmpi ((guix build ant-build-system) #:prefix ant:) (guix build utils)) #:imported-modules ((guix build ant-build-system) - (guix build syscalls) ,@%gnu-build-system-modules) ,@(substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) -- cgit v1.2.3 From 317ea0458927810754ab154228ace04ff7bab717 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Jan 2023 10:02:56 +0100 Subject: gnu: hwloc: Update to 2.9.0. * gnu/packages/mpi.scm (hwloc-2): Update to 2.9.0. [arguments]: Add 'skip-test-that-requires-/sys' phase. (%openmpi-setup): Set 'HWLOC_SYNTHETIC' environment variable. * gnu/packages/opencl.scm (pocl)[arguments]: In 'set-HOME' phase, also set 'HWLOC_SYNTHETIC'. --- gnu/packages/mpi.scm | 19 ++++++++++++++++--- gnu/packages/opencl.scm | 5 ++++- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index af2409aeab..70b14c30b3 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier -;;; Copyright © 2014-2022 Ludovic Courtès +;;; Copyright © 2014-2023 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love @@ -143,7 +143,7 @@ (define-public hwloc-2 ;; Note: 2.x isn't the default yet, see above. (package (inherit hwloc-1) - (version "2.8.0") + (version "2.9.0") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/hwloc/v" @@ -151,7 +151,7 @@ (define-public hwloc-2 "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "1ha23yqfx9kfxm5fcj9m0fnyf0r2k6p4k88xxqishclcsky752il")))) + "11v8hnl6fdsdbm3wnz5gg88f2ghixjyl7jlfmywj293ab5iyjw10")))) ;; libnuma is no longer needed. (inputs (modify-inputs (package-inputs hwloc-1) @@ -167,6 +167,10 @@ (define-public hwloc-2 (substitute* "tests/hwloc/linux-libnuma.c" (("numa_available\\(\\)") "-1")))) + (add-before 'check 'skip-test-that-requires-/sys + (lambda _ + ;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it. + (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0"))) (add-before 'check 'skip-test-that-fails-on-qemu (lambda _ ;; Skip test that fails on emulated hardware due to QEMU bug: @@ -383,6 +387,15 @@ (define-public %openmpi-setup ;; compare stdout, such as that of 'hdf5-parallel-openmpi'. Thus, tell ;; UCX to not emit those warnings. (setenv "UCX_LOG_LEVEL" "error") + + ;; Starting from 2.9.0, hwloc fails when /sys is unavailable: + ;; + ;; [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. + ;; + ;; This in turn breaks Open MPI users. To work around it, define a fake + ;; topology with 4 cores. That silently disables CPU binding, though + ;; 'get_cpubind' will report there's no binding. + (setenv "HWLOC_SYNTHETIC" "4") #t)) (define-public python-mpi4py diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index c2715b498b..847284c427 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -306,7 +306,10 @@ (define-public pocl (add-before 'check 'set-HOME (lambda _ (setenv "HOME" "/tmp") - #t))))) + + ;; Since 2.9.0, hwloc fails when /sys is missing, so provide a + ;; fake topology. + (setenv "HWLOC_SYNTHETIC" "4")))))) (home-page "http://portablecl.org/") (synopsis "Portable Computing Language (pocl), an OpenCL implementation") (description -- cgit v1.2.3