From 6571c5b68fb20140710649a72b25c3633faac92d Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 31 Dec 2020 20:26:01 +0100 Subject: [PATCH] arpack-ng: update to 3.8.0. Instead of using standard BLAS (package blas), use OpenBLAS (package openblas) if available for the target architecture. Right now the only package depending on arpack-ng is Octave and it uses OpenBLAS by default, so I see no reason to use the slower standard BLAS on platforms where OpenBLAS is available. Also move headers into the -devel package. --- .../arpack-ng/patches/fix-gcc10-vector.patch | 1118 ----------------- srcpkgs/arpack-ng/template | 25 +- 2 files changed, 20 insertions(+), 1123 deletions(-) delete mode 100644 srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch diff --git a/srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch b/srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch deleted file mode 100644 index 0a9a4048d7e..00000000000 --- a/srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch +++ /dev/null @@ -1,1118 +0,0 @@ -Source: https://github.com/opencollab/arpack-ng/commit/9418632214acf6d387896ab29a8f5bdff2d4e38a - ---- SRC/cgetv0.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/cgetv0.f 2020-09-24 17:26:05.335777763 +0200 -@@ -361,9 +361,9 @@ - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm0, ndigit, -+ call svout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -394,7 +394,7 @@ - 50 continue - c - if (msglvl .gt. 0) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then ---- SRC/cnaitr.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/cnaitr.f 2020-09-24 17:26:05.336777763 +0200 -@@ -378,9 +378,9 @@ - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -400,7 +400,7 @@ - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -729,7 +729,7 @@ - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm ---- SRC/cnapps.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/cnapps.f 2020-09-24 17:26:05.336777763 +0200 -@@ -268,9 +268,9 @@ - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call cvout (logfil, 1, sigma, ndigit, -+ call cvout (logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -291,9 +291,9 @@ - if ( abs(real(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call cvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -307,9 +307,9 @@ - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -485,7 +485,7 @@ - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call cvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call cmout (logfil, kev, kev, h, ldh, ndigit, ---- SRC/cnaup2.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/cnaup2.f 2020-09-24 17:26:05.336777763 +0200 -@@ -389,7 +389,7 @@ - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -402,9 +402,9 @@ - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -430,7 +430,7 @@ - update = .false. - c - if (msglvl .gt. 1) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -658,7 +658,7 @@ - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -698,7 +698,7 @@ - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call cvout (logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -762,7 +762,7 @@ - cnorm = .false. - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call cmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') ---- SRC/cnaupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/cnaupd.f 2020-09-24 17:26:05.336777763 +0200 -@@ -601,9 +601,9 @@ - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call cvout (logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') ---- SRC/cneupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/cneupd.f 2020-09-24 17:26:05.337777763 +0200 -@@ -536,9 +536,9 @@ - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c ---- SRC/cngets.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/cngets.f 2020-09-24 17:26:05.337777763 +0200 -@@ -161,8 +161,8 @@ - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call cvout (logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call cvout (logfil, kev+np, bounds, ndigit, ---- SRC/dgetv0.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dgetv0.f 2020-09-24 17:26:05.337777763 +0200 -@@ -366,9 +366,9 @@ - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm0, ndigit, -+ call dvout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -399,7 +399,7 @@ - 50 continue - c - if (msglvl .gt. 0) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 3) then ---- SRC/dnaitr.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dnaitr.f 2020-09-24 17:26:05.337777763 +0200 -@@ -371,9 +371,9 @@ - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -393,7 +393,7 @@ - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -721,7 +721,7 @@ - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm ---- SRC/dnapps.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dnapps.f 2020-09-24 17:26:05.338777763 +0200 -@@ -266,11 +266,11 @@ - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call dvout (logfil, 1, sigmar, ndigit, -+ call dvout (logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call dvout (logfil, 1, sigmai, ndigit, -+ call dvout (logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -335,9 +335,9 @@ - & tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call dvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -351,9 +351,9 @@ - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -627,7 +627,7 @@ - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call dvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call dmout (logfil, kev, kev, h, ldh, ndigit, ---- SRC/dnaup2.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dnaup2.f 2020-09-24 17:26:05.338777763 +0200 -@@ -388,7 +388,7 @@ - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -401,9 +401,9 @@ - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -435,7 +435,7 @@ - update = .false. - c - if (msglvl .gt. 1) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -689,7 +689,7 @@ - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -741,7 +741,7 @@ - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call dvout (logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -807,7 +807,7 @@ - cnorm = .false. - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call dmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') ---- SRC/dnaupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dnaupd.f 2020-09-24 17:26:05.338777763 +0200 -@@ -628,9 +628,9 @@ - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call dvout (logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') ---- SRC/dneupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dneupd.f 2020-09-24 17:26:05.339777763 +0200 -@@ -601,9 +601,9 @@ - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c ---- SRC/dngets.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dngets.f 2020-09-24 17:26:05.339777763 +0200 -@@ -212,8 +212,8 @@ - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call dvout (logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call dvout (logfil, kev+np, ritzi, ndigit, ---- SRC/dsaitr.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dsaitr.f 2020-09-24 17:26:05.339777763 +0200 -@@ -364,9 +364,9 @@ - 1000 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -384,7 +384,7 @@ - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -735,7 +735,7 @@ - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm ---- SRC/dsapps.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dsapps.f 2020-09-24 17:26:05.339777763 +0200 -@@ -261,9 +261,9 @@ - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call dvout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -432,7 +432,7 @@ - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call dvout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') ---- SRC/dsaup2.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dsaup2.f 2020-09-24 17:26:05.339777763 +0200 -@@ -402,13 +402,13 @@ - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -446,7 +446,7 @@ - update = .false. - c - if (msglvl .gt. 1) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -695,7 +695,7 @@ - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -743,7 +743,7 @@ - if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call dvout (logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -810,7 +810,7 @@ - 130 continue - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call dvout (logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') ---- SRC/dsaupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dsaupd.f 2020-09-24 17:26:05.339777763 +0200 -@@ -628,9 +628,9 @@ - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call dvout (logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') ---- SRC/dseupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dseupd.f 2020-09-24 17:26:05.340777763 +0200 -@@ -513,9 +513,9 @@ - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_seupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_seupd: Number of "converged" eigenvalues') - end if - c ---- SRC/dsgets.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/dsgets.f 2020-09-24 17:26:05.340777763 +0200 -@@ -202,8 +202,8 @@ - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_sgets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_sgets: NP is') - call dvout (logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call dvout (logfil, kev+np, bounds, ndigit, ---- SRC/sgetv0.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/sgetv0.f 2020-09-24 17:26:05.342777763 +0200 -@@ -366,9 +366,9 @@ - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm0, ndigit, -+ call svout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -399,7 +399,7 @@ - 50 continue - c - if (msglvl .gt. 0) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 3) then ---- SRC/snaitr.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/snaitr.f 2020-09-24 17:26:05.342777763 +0200 -@@ -371,9 +371,9 @@ - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -393,7 +393,7 @@ - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -721,7 +721,7 @@ - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm ---- SRC/snapps.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/snapps.f 2020-09-24 17:26:05.342777763 +0200 -@@ -266,11 +266,11 @@ - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call svout (logfil, 1, sigmar, ndigit, -+ call svout (logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call svout (logfil, 1, sigmai, ndigit, -+ call svout (logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -335,9 +335,9 @@ - & tst1 = slanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call svout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -351,9 +351,9 @@ - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -625,7 +625,7 @@ - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call svout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call smout (logfil, kev, kev, h, ldh, ndigit, ---- SRC/snaup2.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/snaup2.f 2020-09-24 17:26:05.342777763 +0200 -@@ -388,7 +388,7 @@ - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -401,9 +401,9 @@ - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -435,7 +435,7 @@ - update = .false. - c - if (msglvl .gt. 1) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -690,7 +690,7 @@ - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -742,7 +742,7 @@ - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call svout (logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -808,7 +808,7 @@ - cnorm = .false. - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call smout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') ---- SRC/snaupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/snaupd.f 2020-09-24 17:26:05.343777763 +0200 -@@ -628,9 +628,9 @@ - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call svout (logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') ---- SRC/sneupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/sneupd.f 2020-09-24 17:26:05.343777763 +0200 -@@ -601,9 +601,9 @@ - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c ---- SRC/sngets.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/sngets.f 2020-09-24 17:26:05.344777764 +0200 -@@ -212,8 +212,8 @@ - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call svout (logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call svout (logfil, kev+np, ritzi, ndigit, ---- SRC/ssaitr.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/ssaitr.f 2020-09-24 17:26:05.344777764 +0200 -@@ -364,9 +364,9 @@ - 1000 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -384,7 +384,7 @@ - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -735,7 +735,7 @@ - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm ---- SRC/ssapps.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/ssapps.f 2020-09-24 17:26:05.344777764 +0200 -@@ -261,9 +261,9 @@ - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call svout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -432,7 +432,7 @@ - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call svout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') ---- SRC/ssaup2.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/ssaup2.f 2020-09-24 17:26:05.344777764 +0200 -@@ -402,13 +402,13 @@ - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -446,7 +446,7 @@ - update = .false. - c - if (msglvl .gt. 1) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -694,7 +694,7 @@ - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -742,7 +742,7 @@ - if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call svout (logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -809,7 +809,7 @@ - 130 continue - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call svout (logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') ---- SRC/ssaupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/ssaupd.f 2020-09-24 17:26:05.344777764 +0200 -@@ -628,9 +628,9 @@ - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call svout (logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') ---- SRC/sseupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/sseupd.f 2020-09-24 17:26:05.345777764 +0200 -@@ -513,9 +513,9 @@ - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_seupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_seupd: Number of "converged" eigenvalues') - end if - c ---- SRC/ssgets.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/ssgets.f 2020-09-24 17:26:05.345777764 +0200 -@@ -202,8 +202,8 @@ - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_sgets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_sgets: NP is') - call svout (logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call svout (logfil, kev+np, bounds, ndigit, ---- SRC/zgetv0.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/zgetv0.f 2020-09-24 17:26:05.346777764 +0200 -@@ -361,9 +361,9 @@ - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm0, ndigit, -+ call dvout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -394,7 +394,7 @@ - 50 continue - c - if (msglvl .gt. 0) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then ---- SRC/znaitr.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/znaitr.f 2020-09-24 17:26:05.347777764 +0200 -@@ -378,9 +378,9 @@ - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -400,7 +400,7 @@ - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -729,7 +729,7 @@ - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm ---- SRC/znapps.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/znapps.f 2020-09-24 17:26:05.347777764 +0200 -@@ -268,9 +268,9 @@ - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call zvout (logfil, 1, sigma, ndigit, -+ call zvout (logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -291,9 +291,9 @@ - if ( abs(dble(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call zvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -307,9 +307,9 @@ - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -485,7 +485,7 @@ - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call zvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call zmout (logfil, kev, kev, h, ldh, ndigit, ---- SRC/znaup2.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/znaup2.f 2020-09-24 17:26:05.347777764 +0200 -@@ -389,7 +389,7 @@ - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -402,9 +402,9 @@ - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -430,7 +430,7 @@ - update = .false. - c - if (msglvl .gt. 1) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -658,7 +658,7 @@ - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -698,7 +698,7 @@ - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call zvout (logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -762,7 +762,7 @@ - cnorm = .false. - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call zmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') ---- SRC/znaupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/znaupd.f 2020-09-24 17:26:05.347777764 +0200 -@@ -601,9 +601,9 @@ - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call zvout (logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') ---- SRC/zneupd.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/zneupd.f 2020-09-24 17:26:05.348777764 +0200 -@@ -536,9 +536,9 @@ - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c ---- SRC/zngets.f 2019-01-12 16:24:12.000000000 +0100 -+++ SRC/zngets.f 2020-09-24 17:26:05.348777764 +0200 -@@ -161,8 +161,8 @@ - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call zvout (logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call zvout (logfil, kev+np, bounds, ndigit, diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template index ce95a267dd8..dc518874152 100644 --- a/srcpkgs/arpack-ng/template +++ b/srcpkgs/arpack-ng/template @@ -1,17 +1,31 @@ # Template file for 'arpack-ng' pkgname=arpack-ng -version=3.7.0 +version=3.8.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool gcc-fortran pkg-config" -makedepends="lapack-devel eigen" +makedepends="eigen" short_desc="Collection of Fortran77 subroutines" maintainer="Diogo Leal " license="BSD-3-Clause" homepage="https://github.com/opencollab/arpack-ng" changelog="https://raw.githubusercontent.com/opencollab/arpack-ng/master/CHANGES" distfiles="https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz" -checksum=972e3fc3cd0b9d6b5a737c9bf6fd07515c0d6549319d4ffb06970e64fa3cc2d6 +checksum=ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d + +# As of 2021-01-03 arpack-ng is only used by octave which includes openblas as +# its BLAS implementation. So if openblas is available for XBPS_TARGET_MACHINE, +# use it and if not fall back to regular blas. +case "$XBPS_TARGET_MACHINE" in + # List of supported architectures copied from openblas. + armv5*|armv6*|armv7*|aarch64*|i686*|x86_64*|ppc64le*|ppc64*) + makedepends+=" openblas-devel" + configure_args=" --with-blas=openblas --with-lapack=openblas" + ;; + *) + makedepends+=" blas-devel lapack-devel" + ;; +esac pre_configure() { ./bootstrap @@ -25,8 +39,9 @@ arpack-ng-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove usr/lib/cmake vmove usr/lib/pkgconfig + vmove usr/include/arpack + vmove "usr/lib/*.so" } }