unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings.
@ 2024-01-24  8:46 Romain GARBAGE
  2024-01-24 14:04 ` Andreas Enge
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Romain GARBAGE @ 2024-01-24  8:46 UTC (permalink / raw)
  To: 68682
  Cc: Romain GARBAGE, Andreas Enge, Efraim Flashner, Eric Bavier,
	Sharlatan Hellseher

* gnu/packages/maths.scm (arpack-ng): Add configure flags for building
  the shared library and the iso C bindings.

Change-Id: Iddfd67094ffafc3cabd88353e3839e5e903b804a
---
 gnu/packages/maths.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ada828cb3f..7d92dbcdaf 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1064,6 +1064,8 @@ (define-public arpack-ng
                 "09smxilyn8v9xs3kpx3nlj2s7ql3v8z40mpc09kccbb6smyd35iv"))
               (patches (search-patches "arpack-ng-propagate-rng-state.patch"))))
     (build-system cmake-build-system)
+    (arguments
+     '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DICB=ON")))
     (native-inputs
      (list pkg-config))
     (inputs

base-commit: e3f4ab49b1b756d3356b142db935b684e6877346
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings.
  2024-01-24  8:46 [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings Romain GARBAGE
@ 2024-01-24 14:04 ` Andreas Enge
  2024-01-24 14:07   ` Andreas Enge
  2024-01-24 14:51   ` Ludovic Courtès
  2024-01-24 16:28 ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Andreas Enge
  2024-02-14 13:54 ` bug#68682: Close Andreas Enge
  2 siblings, 2 replies; 11+ messages in thread
From: Andreas Enge @ 2024-01-24 14:04 UTC (permalink / raw)
  To: Romain GARBAGE; +Cc: Eric Bavier, Sharlatan Hellseher, 68682, Efraim Flashner

Hello Romain,

Am Wed, Jan 24, 2024 at 09:46:22AM +0100 schrieb Romain GARBAGE:
> * gnu/packages/maths.scm (arpack-ng): Add configure flags for building
>   the shared library and the iso C bindings.

thanks for sending the patch!

I see that the ISO C binding flag installs additional headers, but I do not
see why the flag for building shared libraries would be needed. In the current
arpack-ng, there is already a shared library in the lib/ subdirectory.

Could you explain how adding the flag makes a difference?

Andreas

PS: Concerning the commit message, we usually do not mention the module
    and just start by "gnu: arpack-ng:" without "maths:".





^ permalink raw reply	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings.
  2024-01-24 14:04 ` Andreas Enge
@ 2024-01-24 14:07   ` Andreas Enge
  2024-01-24 14:51   ` Ludovic Courtès
  1 sibling, 0 replies; 11+ messages in thread
From: Andreas Enge @ 2024-01-24 14:07 UTC (permalink / raw)
  To: Romain GARBAGE; +Cc: Eric Bavier, Sharlatan Hellseher, 68682, Efraim Flashner

PPS: There is a new minor version 3.9.1, maybe we could take the opportunity
     that the QA build farm will build out all dependencies to update in
     a separate commit with a patchset attached to this bug.





^ permalink raw reply	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings.
  2024-01-24 14:04 ` Andreas Enge
  2024-01-24 14:07   ` Andreas Enge
@ 2024-01-24 14:51   ` Ludovic Courtès
  2024-01-24 16:04     ` Romain Garbage
  1 sibling, 1 reply; 11+ messages in thread
From: Ludovic Courtès @ 2024-01-24 14:51 UTC (permalink / raw)
  To: Andreas Enge
  Cc: Romain GARBAGE, Sharlatan Hellseher, 68682, Efraim Flashner,
	Eric Bavier

Hi!  :-)

Andreas Enge <andreas@enge.fr> skribis:

> I see that the ISO C binding flag installs additional headers, but I do not
> see why the flag for building shared libraries would be needed. In the current
> arpack-ng, there is already a shared library in the lib/ subdirectory.
>
> Could you explain how adding the flag makes a difference?

The goal should be to build shared libraries only.  If that’s already
happening without passing ‘-DBUILD_SHARED_LIBS=ON’, I agree we can drop
it, in an effort to keep the package definition minimal.

Romain, could you confirm that ‘-DBUILD_SHARED_LIBS=ON’ is indeed
unnecessary and send a new version without it if it is?

Thanks,
Ludo’.




^ permalink raw reply	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings.
  2024-01-24 14:51   ` Ludovic Courtès
@ 2024-01-24 16:04     ` Romain Garbage
  2024-01-24 16:21       ` Andreas Enge
  0 siblings, 1 reply; 11+ messages in thread
From: Romain Garbage @ 2024-01-24 16:04 UTC (permalink / raw)
  To: Ludovic Courtes
  Cc: Andreas Enge, Sharlatan Hellseher, 68682, Efraim Flashner,
	Eric Bavier

Hello :)

----- Mail original -----
> De: "Ludovic Courtes" <ludovic.courtes@inria.fr>
> À: "Andreas Enge" <andreas@enge.fr>
> Cc: "Romain Garbage" <romain.garbage@inria.fr>, "Eric Bavier" <bavier@posteo.net>, "Sharlatan Hellseher"
> <sharlatanus@gmail.com>, 68682@debbugs.gnu.org, "Efraim Flashner" <efraim@flashner.co.il>
> Envoyé: Mercredi 24 Janvier 2024 14:51:52
> Objet: Re: [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings.

> Hi!  :-)
> 
> Andreas Enge <andreas@enge.fr> skribis:
> 
>> I see that the ISO C binding flag installs additional headers, but I do not
>> see why the flag for building shared libraries would be needed. In the current
>> arpack-ng, there is already a shared library in the lib/ subdirectory.
>>
>> Could you explain how adding the flag makes a difference?
> 
> The goal should be to build shared libraries only.  If that’s already
> happening without passing ‘-DBUILD_SHARED_LIBS=ON’, I agree we can drop
> it, in an effort to keep the package definition minimal.
> 
> Romain, could you confirm that ‘-DBUILD_SHARED_LIBS=ON’ is indeed
> unnecessary and send a new version without it if it is?

I built the package with and without '-DBUILD_SHARED_LIBS=ON' and compared the outputs:
```
$ diff -r /gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0 /gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0
Binary files /gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0/lib/libarpack.so and /gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0/lib/libarpack.so differ
Binary files /gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0/lib/libarpack.so.2 and /gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0/lib/libarpack.so.2 differ
Binary files /gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0/lib/libarpack.so.2.1.0 and /gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0/lib/libarpack.so.2.1.0 differ
diff -r /gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0/lib/pkgconfig/arpack.pc /gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0/lib/pkgconfig/arpack.pc
1c1
< prefix=/gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0
---
> prefix=/gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0
3,4c3,4
< libdir=/gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0/lib
< includedir=/gnu/store/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng-3.9.0/include/arpack-ng
---
> libdir=/gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0/lib
> includedir=/gnu/store/5hbj4pza16d0vbmam0rmyx5h6z50fgqi-arpack-ng-3.9.0/include/arpack-ng

$  diff -u /tmp/*arpack-ng # these files contain the output of 'ldd /gnu/store/*arpack-ng/lib/libarpack.so'
+++ /tmp/wsx55w6bbak6sa3g6c8lwm3bliipkhy1-arpack-ng	2024-01-24 16:53:44.805910227 +0100
@@ -1,9 +1,9 @@
-	linux-vdso.so.1 (0x00007ffe84d4b000)
-	libblas.so.3 => /gnu/store/p34bwhh7lb9lsa8vd5w7bs5v599iayag-lapack-3.9.0/lib/libblas.so.3 (0x00007f9208982000)
-	liblapack.so.3 => /gnu/store/p34bwhh7lb9lsa8vd5w7bs5v599iayag-lapack-3.9.0/lib/liblapack.so.3 (0x00007f9208200000)
-	libgfortran.so.5 => /gnu/store/ldkp6a8cpl35vfs8bgnirhw12f76q414-gfortran-11.3.0-lib/lib/libgfortran.so.5 (0x00007f9207e00000)
-	libm.so.6 => /gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libm.so.6 (0x00007f92088a5000)
-	libgcc_s.so.1 => /gnu/store/ldkp6a8cpl35vfs8bgnirhw12f76q414-gfortran-11.3.0-lib/lib/libgcc_s.so.1 (0x00007f92081e6000)
-	libquadmath.so.0 => /gnu/store/ldkp6a8cpl35vfs8bgnirhw12f76q414-gfortran-11.3.0-lib/lib/libquadmath.so.0 (0x00007f920819d000)
-	libc.so.6 => /gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libc.so.6 (0x00007f9207c04000)
-	/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/ld-linux-x86-64.so.2 (0x00007f9208a22000)
+	linux-vdso.so.1 (0x00007ffdb2fb5000)
+	libblas.so.3 => /gnu/store/p34bwhh7lb9lsa8vd5w7bs5v599iayag-lapack-3.9.0/lib/libblas.so.3 (0x00007f0e9f582000)
+	liblapack.so.3 => /gnu/store/p34bwhh7lb9lsa8vd5w7bs5v599iayag-lapack-3.9.0/lib/liblapack.so.3 (0x00007f0e9ee00000)
+	libgfortran.so.5 => /gnu/store/ldkp6a8cpl35vfs8bgnirhw12f76q414-gfortran-11.3.0-lib/lib/libgfortran.so.5 (0x00007f0e9ea00000)
+	libm.so.6 => /gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libm.so.6 (0x00007f0e9f4a5000)
+	libgcc_s.so.1 => /gnu/store/ldkp6a8cpl35vfs8bgnirhw12f76q414-gfortran-11.3.0-lib/lib/libgcc_s.so.1 (0x00007f0e9ede6000)
+	libquadmath.so.0 => /gnu/store/ldkp6a8cpl35vfs8bgnirhw12f76q414-gfortran-11.3.0-lib/lib/libquadmath.so.0 (0x00007f0e9ed9d000)
+	libc.so.6 => /gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libc.so.6 (0x00007f0e9e804000)
+	/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/ld-linux-x86-64.so.2 (0x00007f0e9f622000)
```

To me, it doesn't seem that the '-DBUILD_SHARED_LIBS=ON' option is necessary, but I might miss something.

What do you think?

Cheers,
Romain




^ permalink raw reply	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings.
  2024-01-24 16:04     ` Romain Garbage
@ 2024-01-24 16:21       ` Andreas Enge
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Enge @ 2024-01-24 16:21 UTC (permalink / raw)
  To: Romain Garbage
  Cc: Ludovic Courtes, Sharlatan Hellseher, 68682, Efraim Flashner,
	Eric Bavier

Am Wed, Jan 24, 2024 at 05:04:50PM +0100 schrieb Romain Garbage:
> To me, it doesn't seem that the '-DBUILD_SHARED_LIBS=ON' option is necessary, but I might miss something.
> What do you think?

I agree it is not necessary; in Changes concerning arpack-ng 3.8.0:
 * Only build shared libraries by default.  To build static libraries, use
   --enable-static (autotools) or -DBUILD_SHARED_LIBS=OFF (cmake).

I will send a modified patch to this bug, and although I think this change
is completely harmless, I would suggest to let QA build the dependent
packages before applying it.

Andreas





^ permalink raw reply	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag.
  2024-01-24  8:46 [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings Romain GARBAGE
  2024-01-24 14:04 ` Andreas Enge
@ 2024-01-24 16:28 ` Andreas Enge
  2024-01-24 16:28   ` [bug#68682] [PATCH v2 2/2] gnu: arpack-ng: Update to 3.9.1 Andreas Enge
  2024-02-10 21:58   ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Ludovic Courtès
  2024-02-14 13:54 ` bug#68682: Close Andreas Enge
  2 siblings, 2 replies; 11+ messages in thread
From: Andreas Enge @ 2024-01-24 16:28 UTC (permalink / raw)
  To: 68682
  Cc: Andreas Enge, Romain GARBAGE, Andreas Enge, Eric Bavier,
	Sharlatan Hellseher

From: Romain GARBAGE <romain.garbage@inria.fr>

* gnu/packages/maths.scm (arpack-ng): Add configure flag for building
  ISO C binding headers.

Change-Id: Iddfd67094ffafc3cabd88353e3839e5e903b804a
Signed-off-by: Andreas Enge <andreas@enge.fr>
---
 gnu/packages/maths.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ada828cb3f..16cd3454ae 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1064,6 +1064,8 @@ (define-public arpack-ng
                 "09smxilyn8v9xs3kpx3nlj2s7ql3v8z40mpc09kccbb6smyd35iv"))
               (patches (search-patches "arpack-ng-propagate-rng-state.patch"))))
     (build-system cmake-build-system)
+    (arguments
+     '(#:configure-flags '("-DICB=ON")))
     (native-inputs
      (list pkg-config))
     (inputs

base-commit: 2c5faa9ab88a2b6415bfb1ddbcdc9f8eb9c88d74
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH v2 2/2] gnu: arpack-ng: Update to 3.9.1.
  2024-01-24 16:28 ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Andreas Enge
@ 2024-01-24 16:28   ` Andreas Enge
  2024-02-10 21:58   ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Ludovic Courtès
  1 sibling, 0 replies; 11+ messages in thread
From: Andreas Enge @ 2024-01-24 16:28 UTC (permalink / raw)
  To: 68682; +Cc: Andreas Enge, Andreas Enge, Eric Bavier, Sharlatan Hellseher

* gnu/packages/maths.scm (arpack-ng): Update to 3.9.1. Drop patch.
* gnu/packages/patches/arpack-ng-propagate-rng-state.patch: Remove file.
* gnu/packages/maths.scm (dist_patch_DATA): Unregister patch.

Change-Id: I33a666c3a88fb2f6791c8d698eeb054a831103fc
---
 gnu/local.mk                                  |   3 +-
 gnu/packages/maths.scm                        |   5 +-
 .../arpack-ng-propagate-rng-state.patch       | 523 ------------------
 3 files changed, 3 insertions(+), 528 deletions(-)
 delete mode 100644 gnu/packages/patches/arpack-ng-propagate-rng-state.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c20e93390d..38a2d8d2e3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1,6 +1,6 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge <andreas@enge.fr>
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge <andreas@enge.fr>
 # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
@@ -927,7 +927,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/apr-skip-getservbyname-test.patch	\
   %D%/packages/patches/aria2-unbundle-wslay.patch		\
   %D%/packages/patches/ark-skip-xar-test.patch			\
-  %D%/packages/patches/arpack-ng-propagate-rng-state.patch	\
   %D%/packages/patches/asli-use-system-libs.patch		\
   %D%/packages/patches/aspell-CVE-2019-25051.patch		\
   %D%/packages/patches/aspell-default-dict-dir.patch		\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 16cd3454ae..a6a2f4aecb 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1053,7 +1053,7 @@ (define-public vinci
 (define-public arpack-ng
   (package
     (name "arpack-ng")
-    (version "3.9.0")
+    (version "3.9.1")
     (home-page "https://github.com/opencollab/arpack-ng")
     (source (origin
               (method git-fetch)
@@ -1061,8 +1061,7 @@ (define-public arpack-ng
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "09smxilyn8v9xs3kpx3nlj2s7ql3v8z40mpc09kccbb6smyd35iv"))
-              (patches (search-patches "arpack-ng-propagate-rng-state.patch"))))
+                "0bbw6a48py9fjlif2n4x75skyjskq2hghffjqzm85wnsnsjdlaqw"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags '("-DICB=ON")))
diff --git a/gnu/packages/patches/arpack-ng-propagate-rng-state.patch b/gnu/packages/patches/arpack-ng-propagate-rng-state.patch
deleted file mode 100644
index 4466bb8e50..0000000000
--- a/gnu/packages/patches/arpack-ng-propagate-rng-state.patch
+++ /dev/null
@@ -1,523 +0,0 @@
-Fix a bug that manifests while running the test suite of 'python-igraph':
-
-  https://github.com/opencollab/arpack-ng/issues/401
-  https://github.com/opencollab/arpack-ng/pull/414
-
-From d885b7be4ecdc9c1496f2d6f256f6c0d34962459 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= <szhorvat@gmail.com>
-Date: Sun, 9 Apr 2023 16:36:35 +0200
-Subject: [PATCH] fix: ensure that LAPACK RNG state is propagated
-
- - fixes #401, #410, #411
- - restores 'inits' variable removed in ce2e69a849da1d10dad5d6d3ec4db6120b3ecf50, ensuring that the RNG state is propagated
- - reverts e0d67054f573da351f12a226f7c7cc65a690ef3d to ensure that seed is different on each parallel thread
- - updates seed initialization of parallel pdgetv0/psgetv0 so that they match that of pzgetv0/pcgetv0
----
- PARPACK/SRC/MPI/pcgetv0.f | 48 +++++++++++++++++++++++----------------
- PARPACK/SRC/MPI/pdgetv0.f | 40 ++++++++++++++++++++++++++------
- PARPACK/SRC/MPI/psgetv0.f | 43 ++++++++++++++++++++++++++---------
- PARPACK/SRC/MPI/pzgetv0.f | 48 +++++++++++++++++++++++----------------
- SRC/cgetv0.f              | 21 ++++++++++++-----
- SRC/dgetv0.f              | 21 ++++++++++++-----
- SRC/sgetv0.f              | 21 ++++++++++++-----
- SRC/zgetv0.f              | 21 ++++++++++++-----
- 8 files changed, 183 insertions(+), 80 deletions(-)
-
-diff --git a/PARPACK/SRC/MPI/pcgetv0.f b/PARPACK/SRC/MPI/pcgetv0.f
-index 59e3d1658..24fe8a0f1 100644
---- a/PARPACK/SRC/MPI/pcgetv0.f
-+++ b/PARPACK/SRC/MPI/pcgetv0.f
-@@ -176,13 +176,13 @@ subroutine pcgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
-+      logical    first, inits, orth
-       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
-       Real
-      &           rnorm0
-       Complex
-      &           cnorm, cnorm2
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
-       Complex
-      &           cnorm_buf, buf2(1)
-@@ -203,6 +203,12 @@ subroutine pcgetv0
-      &           ccdotc
-       external   ccdotc, pscnorm2, slapy2
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
-@@ -213,26 +219,30 @@ subroutine pcgetv0
- c     | random number generator           |
- c     %-----------------------------------%
- c
-+      if (inits) then
- c
--c     %-----------------------------------%
--c     | Generate a seed on each processor |
--c     | using process id (myid).          |
--c     | Note: the seed must be between 1  |
--c     | and 4095.  iseed(4) must be odd.  |
--c     %-----------------------------------%
-+c        %-----------------------------------%
-+c        | Generate a seed on each processor |
-+c        | using process id (myid).          |
-+c        | Note: the seed must be between 1  |
-+c        | and 4095.  iseed(4) must be odd.  |
-+c        %-----------------------------------%
- c
--      call MPI_COMM_RANK(comm, myid, ierr)
--      igen = 1000 + 2*myid + 1
--      if (igen .gt. 4095) then
--         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
--      end if
-+         call MPI_COMM_RANK(comm, myid, ierr)
-+         igen = 1000 + 2*myid + 1
-+         if (igen .gt. 4095) then
-+            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
-+         end if
-+c
-+         iseed(1) = igen/1000
-+         igen     = mod(igen,1000)
-+         iseed(2) = igen/100
-+         igen     = mod(igen,100)
-+         iseed(3) = igen/10
-+         iseed(4) = mod(igen,10)
- c
--      iseed(1) = igen/1000
--      igen     = mod(igen,1000)
--      iseed(2) = igen/100
--      igen     = mod(igen,100)
--      iseed(3) = igen/10
--      iseed(4) = 7
-+         inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-diff --git a/PARPACK/SRC/MPI/pdgetv0.f b/PARPACK/SRC/MPI/pdgetv0.f
-index 0f348b820..5a1956997 100644
---- a/PARPACK/SRC/MPI/pdgetv0.f
-+++ b/PARPACK/SRC/MPI/pdgetv0.f
-@@ -177,11 +177,11 @@ subroutine pdgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
--      integer    idist, iseed(4), iter, msglvl, jj
-+      logical    first, inits, orth
-+      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
-       Double precision
-      &           rnorm0, buf2(1)
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
-       Double precision
-      &           rnorm_buf
-@@ -206,6 +206,12 @@ subroutine pdgetv0
- c
-       intrinsic    abs, sqrt
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
-@@ -216,10 +222,30 @@ subroutine pdgetv0
- c     | random number generator           |
- c     %-----------------------------------%
- c
--      iseed(1) = 1
--      iseed(2) = 3
--      iseed(3) = 5
--      iseed(4) = 7
-+      if (inits) then
-+c
-+c        %-----------------------------------%
-+c        | Generate a seed on each processor |
-+c        | using process id (myid).          |
-+c        | Note: the seed must be between 1  |
-+c        | and 4095.  iseed(4) must be odd.  |
-+c        %-----------------------------------%
-+c
-+         call MPI_COMM_RANK(comm, myid, ierr)
-+         igen = 1000 + 2*myid + 1
-+         if (igen .gt. 4095) then
-+            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
-+         end if
-+c
-+         iseed(1) = igen/1000
-+         igen     = mod(igen,1000)
-+         iseed(2) = igen/100
-+         igen     = mod(igen,100)
-+         iseed(3) = igen/10
-+         iseed(4) = mod(igen,10)
-+c
-+         inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-diff --git a/PARPACK/SRC/MPI/psgetv0.f b/PARPACK/SRC/MPI/psgetv0.f
-index d79a513b2..078e4fa8c 100644
---- a/PARPACK/SRC/MPI/psgetv0.f
-+++ b/PARPACK/SRC/MPI/psgetv0.f
-@@ -177,11 +177,11 @@ subroutine psgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
--      integer    idist, iseed(4), iter, msglvl, jj
-+      logical    first, inits, orth
-+      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
-       Real
-      &           rnorm0
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
-       Real
-      &           rnorm_buf
-@@ -206,20 +206,41 @@ subroutine psgetv0
- c
-       intrinsic    abs, sqrt
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
- c
- c
--c     %-----------------------------------%
--c     | Initialize the seed of the LAPACK |
--c     | random number generator           |
--c     %-----------------------------------%
-+      if (inits) then
- c
--      iseed(1) = 1
--      iseed(2) = 3
--      iseed(3) = 5
--      iseed(4) = 7
-+c        %-----------------------------------%
-+c        | Generate a seed on each processor |
-+c        | using process id (myid).          |
-+c        | Note: the seed must be between 1  |
-+c        | and 4095.  iseed(4) must be odd.  |
-+c        %-----------------------------------%
-+c
-+         call MPI_COMM_RANK(comm, myid, ierr)
-+         igen = 1000 + 2*myid + 1
-+         if (igen .gt. 4095) then
-+            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
-+         end if
-+c
-+         iseed(1) = igen/1000
-+         igen     = mod(igen,1000)
-+         iseed(2) = igen/100
-+         igen     = mod(igen,100)
-+         iseed(3) = igen/10
-+         iseed(4) = mod(igen,10)
-+c
-+         inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-diff --git a/PARPACK/SRC/MPI/pzgetv0.f b/PARPACK/SRC/MPI/pzgetv0.f
-index 731fb319f..94fb705f3 100644
---- a/PARPACK/SRC/MPI/pzgetv0.f
-+++ b/PARPACK/SRC/MPI/pzgetv0.f
-@@ -176,13 +176,13 @@ subroutine pzgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
-+      logical    first, inits, orth
-       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
-       Double precision
-      &           rnorm0
-       Complex*16
-      &           cnorm, cnorm2
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
-       Complex*16
-      &           cnorm_buf, buf2(1)
-@@ -203,6 +203,12 @@ subroutine pzgetv0
-      &           zzdotc
-       external   zzdotc , pdznorm2 , dlapy2
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
-@@ -213,26 +219,30 @@ subroutine pzgetv0
- c     | random number generator           |
- c     %-----------------------------------%
- c
-+      if (inits) then
- c
--c     %-----------------------------------%
--c     | Generate a seed on each processor |
--c     | using process id (myid).          |
--c     | Note: the seed must be between 1  |
--c     | and 4095.  iseed(4) must be odd.  |
--c     %-----------------------------------%
-+c        %-----------------------------------%
-+c        | Generate a seed on each processor |
-+c        | using process id (myid).          |
-+c        | Note: the seed must be between 1  |
-+c        | and 4095.  iseed(4) must be odd.  |
-+c        %-----------------------------------%
- c
--      call MPI_COMM_RANK(comm, myid, ierr)
--      igen = 1000 + 2*myid + 1
--      if (igen .gt. 4095) then
--         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
--      end if
-+         call MPI_COMM_RANK(comm, myid, ierr)
-+         igen = 1000 + 2*myid + 1
-+         if (igen .gt. 4095) then
-+            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
-+         end if
-+c
-+         iseed(1) = igen/1000
-+         igen     = mod(igen,1000)
-+         iseed(2) = igen/100
-+         igen     = mod(igen,100)
-+         iseed(3) = igen/10
-+         iseed(4) = mod(igen,10)
- c
--      iseed(1) = igen/1000
--      igen     = mod(igen,1000)
--      iseed(2) = igen/100
--      igen     = mod(igen,100)
--      iseed(3) = igen/10
--      iseed(4) = 7
-+         inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f
-index b49e66708..c231eadcb 100644
---- a/SRC/cgetv0.f
-+++ b/SRC/cgetv0.f
-@@ -156,13 +156,13 @@ subroutine cgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
-+      logical    first, inits, orth
-       integer    idist, iseed(4), iter, msglvl, jj
-       Real
-      &           rnorm0
-       Complex
-      &           cnorm
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
- c     %----------------------%
- c     | External Subroutines |
-@@ -180,6 +180,12 @@ subroutine cgetv0
-      &           ccdotc
-       external   ccdotc, scnrm2, slapy2
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
-@@ -190,10 +196,13 @@ subroutine cgetv0
- c     | random number generator           |
- c     %-----------------------------------%
- c
--      iseed(1) = 1
--      iseed(2) = 3
--      iseed(3) = 5
--      iseed(4) = 7
-+      if (inits) then
-+          iseed(1) = 1
-+          iseed(2) = 3
-+          iseed(3) = 5
-+          iseed(4) = 7
-+          inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f
-index 8be4fa26d..1d6dc01bd 100644
---- a/SRC/dgetv0.f
-+++ b/SRC/dgetv0.f
-@@ -157,11 +157,11 @@ subroutine dgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
-+      logical    first, inits, orth
-       integer    idist, iseed(4), iter, msglvl, jj
-       Double precision
-      &           rnorm0
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
- c     %----------------------%
- c     | External Subroutines |
-@@ -183,6 +183,12 @@ subroutine dgetv0
- c
-       intrinsic    abs, sqrt
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
-@@ -193,10 +199,13 @@ subroutine dgetv0
- c     | random number generator           |
- c     %-----------------------------------%
- c
--      iseed(1) = 1
--      iseed(2) = 3
--      iseed(3) = 5
--      iseed(4) = 7
-+      if (inits) then
-+          iseed(1) = 1
-+          iseed(2) = 3
-+          iseed(3) = 5
-+          iseed(4) = 7
-+          inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f
-index 26130a014..d861b2d6d 100644
---- a/SRC/sgetv0.f
-+++ b/SRC/sgetv0.f
-@@ -157,11 +157,11 @@ subroutine sgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
-+      logical    first, inits, orth
-       integer    idist, iseed(4), iter, msglvl, jj
-       Real
-      &           rnorm0
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
- c     %----------------------%
- c     | External Subroutines |
-@@ -183,6 +183,12 @@ subroutine sgetv0
- c
-       intrinsic    abs, sqrt
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
-@@ -193,10 +199,13 @@ subroutine sgetv0
- c     | random number generator           |
- c     %-----------------------------------%
- c
--      iseed(1) = 1
--      iseed(2) = 3
--      iseed(3) = 5
--      iseed(4) = 7
-+      if (inits) then
-+          iseed(1) = 1
-+          iseed(2) = 3
-+          iseed(3) = 5
-+          iseed(4) = 7
-+          inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f
-index cc13c3cfb..1fbd50851 100644
---- a/SRC/zgetv0.f
-+++ b/SRC/zgetv0.f
-@@ -156,13 +156,13 @@ subroutine zgetv0
- c     | Local Scalars & Arrays |
- c     %------------------------%
- c
--      logical    first, orth
-+      logical    first, inits, orth
-       integer    idist, iseed(4), iter, msglvl, jj
-       Double precision
-      &           rnorm0
-       Complex*16
-      &           cnorm
--      save       first, iseed, iter, msglvl, orth, rnorm0
-+      save       first, iseed, inits, iter, msglvl, orth, rnorm0
- c
- c     %----------------------%
- c     | External Subroutines |
-@@ -180,6 +180,12 @@ subroutine zgetv0
-      &           zzdotc
-       external   zzdotc, dznrm2, dlapy2
- c
-+c     %-----------------%
-+c     | Data Statements |
-+c     %-----------------%
-+c
-+      data       inits /.true./
-+c
- c     %-----------------------%
- c     | Executable Statements |
- c     %-----------------------%
-@@ -190,10 +196,13 @@ subroutine zgetv0
- c     | random number generator           |
- c     %-----------------------------------%
- c
--      iseed(1) = 1
--      iseed(2) = 3
--      iseed(3) = 5
--      iseed(4) = 7
-+      if (inits) then
-+          iseed(1) = 1
-+          iseed(2) = 3
-+          iseed(3) = 5
-+          iseed(4) = 7
-+          inits = .false.
-+      end if
- c
-       if (ido .eq.  0) then
- c
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag.
  2024-01-24 16:28 ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Andreas Enge
  2024-01-24 16:28   ` [bug#68682] [PATCH v2 2/2] gnu: arpack-ng: Update to 3.9.1 Andreas Enge
@ 2024-02-10 21:58   ` Ludovic Courtès
  2024-02-11  7:55     ` Andreas Enge
  1 sibling, 1 reply; 11+ messages in thread
From: Ludovic Courtès @ 2024-02-10 21:58 UTC (permalink / raw)
  To: Andreas Enge; +Cc: Romain GARBAGE, Sharlatan Hellseher, 68682, Eric Bavier

Andreas Enge <andreas@enge.fr> skribis:

> From: Romain GARBAGE <romain.garbage@inria.fr>
>
> * gnu/packages/maths.scm (arpack-ng): Add configure flag for building
>   ISO C binding headers.
>
> Change-Id: Iddfd67094ffafc3cabd88353e3839e5e903b804a
> Signed-off-by: Andreas Enge <andreas@enge.fr>

[...]

> * gnu/packages/maths.scm (arpack-ng): Update to 3.9.1. Drop patch.
> * gnu/packages/patches/arpack-ng-propagate-rng-state.patch: Remove file.
> * gnu/packages/maths.scm (dist_patch_DATA): Unregister patch.
>
> Change-Id: I33a666c3a88fb2f6791c8d698eeb054a831103fc

Hi Andreas!

This seems to be mostly ready to push:

  https://qa.guix.gnu.org/issue/68682

Ludo’.




^ permalink raw reply	[flat|nested] 11+ messages in thread

* [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag.
  2024-02-10 21:58   ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Ludovic Courtès
@ 2024-02-11  7:55     ` Andreas Enge
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Enge @ 2024-02-11  7:55 UTC (permalink / raw)
  To: Ludovic Courtès
  Cc: Romain GARBAGE, Sharlatan Hellseher, 68682, Eric Bavier

Hello,

Am Sat, Feb 10, 2024 at 10:58:42PM +0100 schrieb Ludovic Courtès:
> This seems to be mostly ready to push:
>   https://qa.guix.gnu.org/issue/68682

it has quite a few dependent packages, so I am waiting for QA to
handle it.

Andreas





^ permalink raw reply	[flat|nested] 11+ messages in thread

* bug#68682: Close
  2024-01-24  8:46 [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings Romain GARBAGE
  2024-01-24 14:04 ` Andreas Enge
  2024-01-24 16:28 ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Andreas Enge
@ 2024-02-14 13:54 ` Andreas Enge
  2 siblings, 0 replies; 11+ messages in thread
From: Andreas Enge @ 2024-02-14 13:54 UTC (permalink / raw)
  To: 68682-done

Indeed the package and its dependencies are fine on most architectures,
just i686 lags behind on QA. So I have just pushed the patch. Thanks!

Andreas





^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2024-02-14 13:56 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-24  8:46 [bug#68682] [PATCH] gnu: maths: arpack-ng: Modify build settings Romain GARBAGE
2024-01-24 14:04 ` Andreas Enge
2024-01-24 14:07   ` Andreas Enge
2024-01-24 14:51   ` Ludovic Courtès
2024-01-24 16:04     ` Romain Garbage
2024-01-24 16:21       ` Andreas Enge
2024-01-24 16:28 ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Andreas Enge
2024-01-24 16:28   ` [bug#68682] [PATCH v2 2/2] gnu: arpack-ng: Update to 3.9.1 Andreas Enge
2024-02-10 21:58   ` [bug#68682] [PATCH v2 1/2] gnu: arpack-ng: Add preprocessor flag Ludovic Courtès
2024-02-11  7:55     ` Andreas Enge
2024-02-14 13:54 ` bug#68682: Close Andreas Enge

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).