[116398] trunk/dports/math/arpack
sean at macports.org
sean at macports.org
Thu Jan 23 12:16:10 PST 2014
Revision: 116398
https://trac.macports.org/changeset/116398
Author: sean at macports.org
Date: 2014-01-23 12:16:10 -0800 (Thu, 23 Jan 2014)
Log Message:
-----------
arpack: update to 3.1.4 and use new mpi portgroup
This also makes the change for g95 supporting shared libraries now.
Modified Paths:
--------------
trunk/dports/math/arpack/Portfile
trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff
Removed Paths:
-------------
trunk/dports/math/arpack/files/patch-UTIL-second_NONE.f.diff
Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile 2014-01-23 20:16:05 UTC (rev 116397)
+++ trunk/dports/math/arpack/Portfile 2014-01-23 20:16:10 UTC (rev 116398)
@@ -3,10 +3,13 @@
PortSystem 1.0
PortGroup muniversal 1.0
-PortGroup active_variants 1.1
+PortGroup mpi 1.0
+mpi.setup require_fortran
+
name arpack
-version 3.1.3
+version 3.1.4
+revision 1
categories math
license BSD
platforms darwin
@@ -17,14 +20,18 @@
is included if built with an MPI variant.
homepage http://forge.scilab.org/index.php/p/arpack-ng
master_sites ${homepage}/downloads/get
-distfiles arpack-ng-${version}.tar.gz
-checksums md5 90ba42eae70b517ebdb72921cb4186df \
- sha1 c1ac96663916a4e11618e9557636ba1bd1a7b556 \
- rmd160 30a3b8a707417afeb3f8a794ee3aa0160fa3e745
+distfiles arpack-ng_${version}.tar.gz
worksrcdir ${name}-ng-${version}
+checksums rmd160 58ee298f08390ee56528f3198ccc9887e661504f \
+ sha256 a1b2ca4c30f7027b56f94d42e646df4762944486790da66ce8ffbad386c78c54
+
configure.args home=${worksrcpath} --disable-mpi
+if {![fortran_variant_isset]} {
+ default_variants +gfortran
+}
+
if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.args-append FFLAGS='-O2 -m64'
} else {
@@ -41,11 +48,11 @@
return -code error "incompatible Mac OS X version"
}
- if {[variant_isset openmpi]} {
- # see g95 variant below for explanation
- if { [active_variants openmpi g95] } {
- configure.args-append --disable-shared
- }
+ if {[mpi_variant_isset]} {
+ configure.args-delete --disable-mpi
+ configure.args-append --enable-mpi
+ configure.args-append F77=${mpi.f77} \
+ MPIF77=${mpi.f77}
}
}
@@ -56,56 +63,6 @@
set universal_archs_supported "ppc ppc64"
}
-variant openmpi description {build PARPACK, with OpenMPI} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 g95 mpich universal {
- depends_lib-append port:openmpi
- configure.args-delete --disable-mpi
- configure.args-append --enable-mpi
- configure.env-append F77=${prefix}/bin/openmpif77 MPIF77=${prefix}/bin/openmpif77
-}
-
-variant mpich description {build PARPACK, with MPICH} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 g95 openmpi {
- depends_lib-append path:bin/mpif77-mp:mpich-default
- configure.args-delete --disable-mpi
- configure.args-append --enable-mpi
- configure.env-append F77=${prefix}/bin/mpif77-mp MPIF77=${prefix}/bin/mpif77-mp
-}
-
-variant gcc43 description {build with gfortran-mp-4.3} conflicts gcc44 gcc45 gcc46 gcc47 gcc48 g95 universal openmpi mpich {
- configure.compiler macports-gcc-4.3
-}
-
-variant gcc44 description {build with gfortran-mp-4.4} conflicts gcc43 gcc45 gcc46 gcc47 gcc48 g95 openmpi mpich {
- configure.compiler macports-gcc-4.4
-}
-
-variant gcc45 description {build with gfortran-mp-4.5} conflicts gcc43 gcc44 gcc46 gcc47 gcc48 g95 openmpi mpich {
- configure.compiler macports-gcc-4.5
-}
-
-variant gcc46 description {build with gfortran-mp-4.6} conflicts gcc43 gcc44 gcc45 gcc47 gcc48 g95 openmpi mpich {
- configure.compiler macports-gcc-4.6
-}
-
-variant gcc47 description {build with gfortran-mp-4.7} conflicts gcc43 gcc44 gcc45 gcc46 gcc48 g95 openmpi mpich {
- configure.compiler macports-gcc-4.7
-}
-
-variant gcc48 description {build with gfortran-mp-4.7} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 openmpi mpich {
- configure.compiler macports-gcc-4.8
-}
-
-# does not work without --shared-lib, will not accept -force_load in linking stage
-variant g95 description {build with g95 (static only)} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 universal openmpi mpich {
- depends_build-append port:g95
- configure.args-append --disable-shared
- configure.env-append F77=${prefix}/bin/g95
-}
-
-if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] \
- && ![variant_isset gcc47] && ![variant_isset g95] && ![variant_isset openmpi] && ![variant_isset mpich]} {
- default_variants +gcc48
-}
-
variant accelerate conflicts atlas description {build with Accelerate framework} {
# the change of LDFLAGS is required to avoid linking against the ATLAS ones
# if they are present; if we specify /usr/lib/libblas.dylib directly, the
@@ -113,14 +70,8 @@
configure.args-delete LDFLAGS=''
configure.args-append LDFLAGS='/usr/lib/libblas.dylib /usr/lib/liblapack.dylib' --with-blas="-lblas -llapack"
patchfiles-append patch-ARPACK-cdot-and-zdot.diff
- if {[variant_isset openmpi] || [variant_isset mpich]} {
+ if {[mpi_variant_isset]} {
patchfiles-append patch-PARPACK-cdot-and-zdot.diff
- # PARPACK unwisely uses 'second' from LAPACK (not provided by
- # Accelerate) instead of internal 'arscnd' like ARPACK so, we make a
- # 'second' which wraps 'arscnd'. Really, 'second' should just be
- # replaced in PARPACK source.
- # http://forge.scilab.org/index.php/p/arpack-ng/issues/1245/
- patchfiles-append patch-UTIL-second_NONE.f.diff
}
}
@@ -151,5 +102,3 @@
livecheck.type regex
livecheck.url http://forge.scilab.org/index.php/p/arpack-ng/downloads/
livecheck.regex ${name}-ng (\[0-9.\]+\[0-9\])
-
-variant mpich2 requires mpich description {Legacy compatibility variant} {}
Modified: trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff
===================================================================
--- trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff 2014-01-23 20:16:05 UTC (rev 116397)
+++ trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff 2014-01-23 20:16:10 UTC (rev 116398)
@@ -1,15 +1,17 @@
---- ./PARPACK/SRC/BLACS/pcgetv0.f.orig 2012-08-07 11:00:22.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pcgetv0.f 2012-08-07 10:28:53.000000000 +1000
-@@ -188,7 +188,7 @@
+--- PARPACK/SRC/BLACS/pcgetv0.f
++++ PARPACK/SRC/BLACS/pcgetv0.f
+@@ -186,21 +186,19 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
-- external ccopy, cgemv, pclarnv, pcvout, second
-+ external ccopy, cdotc, cgemv, pclarnv, pcvout, second
+- external ccopy, cgemv, pclarnv, pcvout, arscnd
++ external ccopy, cdotc, cgemv, pclarnv, pcvout, arscnd
c
c %--------------------%
c | External Functions |
-@@ -196,9 +196,7 @@
+ c %--------------------%
c
Real
& pscnorm2, slapy2
@@ -20,7 +22,11 @@
c
c %-----------------%
c | Data Statements |
-@@ -335,7 +333,7 @@
+ c %-----------------%
+ c
+@@ -333,11 +331,11 @@ c
+ tmvbx = tmvbx + (t3 - t2)
+ end if
c
first = .FALSE.
if (bmat .eq. 'G') then
@@ -29,8 +35,12 @@
call cgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm0 = sqrt(slapy2(real (cnorm),aimag(cnorm)))
else if (bmat .eq. 'I') then
-@@ -394,7 +392,7 @@
+ rnorm0 = pscnorm2( comm, n, resid, 1)
end if
+@@ -392,11 +390,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
+ end if
c
if (bmat .eq. 'G') then
- cnorm = cdotc (n, resid, 1, workd, 1)
@@ -38,15 +48,19 @@
call cgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm = sqrt(slapy2(real (cnorm),aimag(cnorm)))
else if (bmat .eq. 'I') then
---- ./PARPACK/SRC/BLACS/pcnaitr.f.orig 2012-08-07 11:00:42.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pcnaitr.f 2012-08-07 10:56:31.000000000 +1000
-@@ -295,18 +295,16 @@
+ rnorm = pscnorm2(comm, n, resid, 1)
+ end if
+--- PARPACK/SRC/BLACS/pcnaitr.f
++++ PARPACK/SRC/BLACS/pcnaitr.f
+@@ -293,22 +293,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external caxpy, ccopy, cscal, cgemv, pcgetv0, slabad,
+ external caxpy, ccopy, cdotc, cscal, cgemv, pcgetv0, slabad,
- & csscal, pcvout, pcmout, pivout, second
+ & csscal, pcvout, pcmout, pivout, arscnd
c
c %--------------------%
c | External Functions |
@@ -61,7 +75,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -573,7 +571,7 @@
+ c %---------------------%
+ c
+@@ -571,11 +569,11 @@ c %------------------------------
+ c | The following is needed for STEP 5. |
+ c | Compute the B-norm of OP*v_{j}. |
c %-------------------------------------%
c
if (bmat .eq. 'G') then
@@ -70,8 +88,12 @@
call cgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
wnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
else if (bmat .eq. 'I') then
-@@ -647,7 +645,7 @@
+ wnorm = pscnorm2(comm, n, resid, 1)
+ end if
+@@ -645,11 +643,11 @@ c
c %------------------------------%
+ c | Compute the B-norm of r_{j}. |
+ c %------------------------------%
c
if (bmat .eq. 'G') then
- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
@@ -79,8 +101,12 @@
call cgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
else if (bmat .eq. 'I') then
-@@ -749,7 +747,7 @@
+ rnorm = pscnorm2(comm, n, resid, 1)
+ end if
+@@ -747,11 +745,11 @@ c
c %-----------------------------------------------------%
+ c | Compute the B-norm of the corrected residual r_{j}. |
+ c %-----------------------------------------------------%
c
if (bmat .eq. 'G') then
- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
@@ -88,16 +114,20 @@
call cgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm1 = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
else if (bmat .eq. 'I') then
---- ./PARPACK/SRC/BLACS/pcnaup2.f.orig 2012-08-07 11:00:57.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pcnaup2.f 2012-08-07 10:31:22.000000000 +1000
-@@ -246,18 +246,16 @@
+ rnorm1 = pscnorm2(comm, n, resid, 1)
+ end if
+--- PARPACK/SRC/BLACS/pcnaup2.f
++++ PARPACK/SRC/BLACS/pcnaup2.f
+@@ -244,22 +244,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external ccopy, pcgetv0, pcnaitr, pcneigh, pcngets, pcnapps,
-- & csortc, cswap, pcmout, pcvout, pivout, second
+- & csortc, cswap, pcmout, pcvout, pivout, arscnd
+ external ccopy, cdotc, pcgetv0, pcnaitr, pcneigh, pcngets,
-+ & pcnapps, csortc, cswap, pcmout, pcvout, pivout, second
++ & pcnapps, csortc, cswap, pcmout, pcvout, pivout, arscnd
c
c %--------------------%
c | External functions |
@@ -112,7 +142,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -767,7 +765,7 @@
+ c %---------------------%
+ c
+@@ -765,11 +763,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
end if
c
if (bmat .eq. 'G') then
@@ -121,9 +155,13 @@
call cgsum2d( comm, 'All', ' ', 1, 1, cmpnorm, 1, -1, -1 )
rnorm = sqrt(slapy2(real(cmpnorm),aimag(cmpnorm)))
else if (bmat .eq. 'I') then
---- ./PARPACK/SRC/BLACS/pcneupd.f.orig 2012-08-07 11:01:13.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pcneupd.f 2012-08-07 10:32:35.000000000 +1000
-@@ -327,7 +327,7 @@
+ rnorm = pscnorm2(comm, n, resid, 1)
+ end if
+--- PARPACK/SRC/BLACS/pcneupd.f
++++ PARPACK/SRC/BLACS/pcneupd.f
+@@ -325,11 +325,11 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
@@ -132,7 +170,11 @@
& cunm2r,ctrmm,pcvout,pivout,
& clahqr
c
-@@ -339,10 +339,6 @@
+ c %--------------------%
+ c | External Functions |
+@@ -337,14 +337,10 @@ c %--------------------%
+ c
+ Real
& scnrm2,pslamch,slapy2
external scnrm2,pslamch,slapy2
c
@@ -143,7 +185,11 @@
c %---------------------%
c | Intrinsic Functions |
c %---------------------%
-@@ -743,7 +739,7 @@
+ c
+ intrinsic abs
+@@ -741,11 +737,11 @@ c | Schur basis of H wit
+ c | Note that the eigenvector matrix of T is |
+ c | upper triangular, thus the length of the |
c | inner product can be set to j. |
c %------------------------------------------%
c
@@ -152,18 +198,22 @@
& workl(invsub+(j-1)*ldq), 1)
40 continue
c
---- ./PARPACK/SRC/BLACS/pzgetv0.f.orig 2012-08-07 11:35:26.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pzgetv0.f 2012-08-07 10:18:37.000000000 +1000
-@@ -188,7 +188,7 @@
+ if (msglvl .gt. 2) then
+ call ccopy(nconv, workl(invsub+ncv-1), ldq,
+--- PARPACK/SRC/BLACS/pzgetv0.f
++++ PARPACK/SRC/BLACS/pzgetv0.f
+@@ -186,21 +186,19 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
-- external zcopy , zgemv , pzlarnv , pzvout , second
-+ external zcopy , zdotc , zgemv , pzlarnv , pzvout , second
+- external zcopy , zgemv , pzlarnv , pzvout , arscnd
++ external zcopy , zdotc , zgemv , pzlarnv , pzvout , arscnd
c
c %--------------------%
c | External Functions |
-@@ -196,9 +196,7 @@
+ c %--------------------%
c
Double precision
& pdznorm2 , dlapy2
@@ -174,7 +224,11 @@
c
c %-----------------%
c | Data Statements |
-@@ -335,7 +333,7 @@
+ c %-----------------%
+ c
+@@ -333,11 +331,11 @@ c
+ tmvbx = tmvbx + (t3 - t2)
+ end if
c
first = .FALSE.
if (bmat .eq. 'G') then
@@ -183,8 +237,12 @@
call zgsum2d ( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm0 = sqrt(dlapy2 (dble (cnorm),dimag (cnorm)))
else if (bmat .eq. 'I') then
-@@ -394,7 +392,7 @@
+ rnorm0 = pdznorm2 ( comm, n, resid, 1)
end if
+@@ -392,11 +390,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
+ end if
c
if (bmat .eq. 'G') then
- cnorm = zdotc (n, resid, 1, workd, 1)
@@ -192,15 +250,19 @@
call zgsum2d ( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm = sqrt(dlapy2 (dble (cnorm),dimag (cnorm)))
else if (bmat .eq. 'I') then
---- ./PARPACK/SRC/BLACS/pznaitr.f.orig 2012-08-07 11:36:36.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pznaitr.f 2012-08-07 10:18:48.000000000 +1000
-@@ -295,18 +295,16 @@
+ rnorm = pdznorm2 (comm, n, resid, 1)
+ end if
+--- PARPACK/SRC/BLACS/pznaitr.f
++++ PARPACK/SRC/BLACS/pznaitr.f
+@@ -293,22 +293,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external zaxpy, zcopy, zscal, zgemv, pzgetv0, dlabad,
+ external zaxpy, zcopy, zdotc, zscal, zgemv, pzgetv0, dlabad,
- & zdscal, pzvout, pzmout, pivout, second
+ & zdscal, pzvout, pzmout, pivout, arscnd
c
c %--------------------%
c | External Functions |
@@ -215,7 +277,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -573,7 +571,7 @@
+ c %---------------------%
+ c
+@@ -571,11 +569,11 @@ c %------------------------------
+ c | The following is needed for STEP 5. |
+ c | Compute the B-norm of OP*v_{j}. |
c %-------------------------------------%
c
if (bmat .eq. 'G') then
@@ -224,8 +290,12 @@
call zgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
wnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
else if (bmat .eq. 'I') then
-@@ -647,7 +645,7 @@
+ wnorm = pdznorm2(comm, n, resid, 1)
+ end if
+@@ -645,11 +643,11 @@ c
c %------------------------------%
+ c | Compute the B-norm of r_{j}. |
+ c %------------------------------%
c
if (bmat .eq. 'G') then
- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
@@ -233,8 +303,12 @@
call zgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
else if (bmat .eq. 'I') then
-@@ -749,7 +747,7 @@
+ rnorm = pdznorm2(comm, n, resid, 1)
+ end if
+@@ -747,11 +745,11 @@ c
c %-----------------------------------------------------%
+ c | Compute the B-norm of the corrected residual r_{j}. |
+ c %-----------------------------------------------------%
c
if (bmat .eq. 'G') then
- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
@@ -242,16 +316,20 @@
call zgsum2d( comm, 'All', ' ', 1, 1, cnorm, 1, -1, -1 )
rnorm1 = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
else if (bmat .eq. 'I') then
---- ./PARPACK/SRC/BLACS/pznaup2.f.orig 2012-08-07 11:37:23.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pznaup2.f 2012-08-07 10:14:05.000000000 +1000
-@@ -246,18 +246,16 @@
+ rnorm1 = pdznorm2(comm, n, resid, 1)
+ end if
+--- PARPACK/SRC/BLACS/pznaup2.f
++++ PARPACK/SRC/BLACS/pznaup2.f
+@@ -244,22 +244,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external zcopy, pzgetv0, pznaitr, pzneigh, pzngets, pznapps,
-- & zsortc, zswap, pzmout, pzvout, pivout, second
+- & zsortc, zswap, pzmout, pzvout, pivout, arscnd
+ external zcopy, zdotc, pzgetv0, pznaitr, pzneigh, pzngets,
-+ & pznapps, zsortc, zswap, pzmout, pzvout, pivout, second
++ & pznapps, zsortc, zswap, pzmout, pzvout, pivout, arscnd
c
c %--------------------%
c | External functions |
@@ -266,7 +344,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -767,7 +765,7 @@
+ c %---------------------%
+ c
+@@ -765,11 +763,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
end if
c
if (bmat .eq. 'G') then
@@ -275,9 +357,13 @@
call zgsum2d( comm, 'All', ' ', 1, 1, cmpnorm, 1, -1, -1 )
rnorm = sqrt(dlapy2(dble(cmpnorm),dimag(cmpnorm)))
else if (bmat .eq. 'I') then
---- ./PARPACK/SRC/BLACS/pzneupd.f.orig 2012-08-07 11:37:59.000000000 +1000
-+++ ./PARPACK/SRC/BLACS/pzneupd.f 2012-08-07 09:59:41.000000000 +1000
-@@ -327,7 +327,7 @@
+ rnorm = pdznorm2(comm, n, resid, 1)
+ end if
+--- PARPACK/SRC/BLACS/pzneupd.f
++++ PARPACK/SRC/BLACS/pzneupd.f
+@@ -325,11 +325,11 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
@@ -286,7 +372,11 @@
& zunm2r,ztrmm,pzvout,pivout,
& zlahqr
c
-@@ -339,10 +339,6 @@
+ c %--------------------%
+ c | External Functions |
+@@ -337,14 +337,10 @@ c %--------------------%
+ c
+ Double precision
& dznrm2,pdlamch,dlapy2
external dznrm2,pdlamch,dlapy2
c
@@ -297,7 +387,11 @@
c %---------------------%
c | Intrinsic Functions |
c %---------------------%
-@@ -743,7 +739,7 @@
+ c
+ intrinsic abs
+@@ -741,11 +737,11 @@ c | Schur basis of H wit
+ c | Note that the eigenvector matrix of T is |
+ c | upper triangular, thus the length of the |
c | inner product can be set to j. |
c %------------------------------------------%
c
@@ -306,18 +400,22 @@
& workl(invsub+(j-1)*ldq), 1)
40 continue
c
---- ./PARPACK/SRC/MPI/pcgetv0.f.orig 2012-08-07 11:05:27.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pcgetv0.f 2012-08-07 10:35:16.000000000 +1000
-@@ -191,7 +191,7 @@
+ if (msglvl .gt. 2) then
+ call zcopy(nconv, workl(invsub+ncv-1), ldq,
+--- PARPACK/SRC/MPI/pcgetv0.f
++++ PARPACK/SRC/MPI/pcgetv0.f
+@@ -189,21 +189,19 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
-- external ccopy, cgemv, pclarnv, pcvout, second
-+ external ccopy, cdotc, cgemv, pclarnv, pcvout, second
+- external ccopy, cgemv, pclarnv, pcvout, arscnd
++ external ccopy, cdotc, cgemv, pclarnv, pcvout, arscnd
c
c %--------------------%
c | External Functions |
-@@ -199,9 +199,7 @@
+ c %--------------------%
c
Real
& pscnorm2, slapy2
@@ -328,7 +426,11 @@
c
c %-----------------%
c | Data Statements |
-@@ -331,7 +329,7 @@
+ c %-----------------%
+ c
+@@ -329,11 +327,11 @@ c
+ tmvbx = tmvbx + (t3 - t2)
+ end if
c
first = .FALSE.
if (bmat .eq. 'G') then
@@ -337,7 +439,11 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_COMPLEX, MPI_SUM, comm, ierr )
rnorm0 = sqrt(slapy2(real (cnorm),aimag(cnorm)))
-@@ -392,7 +390,7 @@
+ else if (bmat .eq. 'I') then
+ rnorm0 = pscnorm2( comm, n, resid, 1)
+@@ -390,11 +388,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
end if
c
if (bmat .eq. 'G') then
@@ -346,15 +452,19 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_COMPLEX, MPI_SUM, comm, ierr )
rnorm = sqrt(slapy2(real (cnorm),aimag(cnorm)))
---- ./PARPACK/SRC/MPI/pcnaitr.f.orig 2012-08-07 11:06:20.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pcnaitr.f 2012-08-07 10:35:14.000000000 +1000
-@@ -298,18 +298,16 @@
+ else if (bmat .eq. 'I') then
+ rnorm = pscnorm2(comm, n, resid, 1)
+--- PARPACK/SRC/MPI/pcnaitr.f
++++ PARPACK/SRC/MPI/pcnaitr.f
+@@ -296,22 +296,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external caxpy, ccopy, cscal, cgemv, pcgetv0, slabad,
+ external caxpy, ccopy, cdotc, cscal, cgemv, pcgetv0, slabad,
- & csscal, pcvout, pcmout, pivout, second
+ & csscal, pcvout, pcmout, pivout, arscnd
c
c %--------------------%
c | External Functions |
@@ -369,7 +479,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -576,7 +574,7 @@
+ c %---------------------%
+ c
+@@ -574,11 +572,11 @@ c %------------------------------
+ c | The following is needed for STEP 5. |
+ c | Compute the B-norm of OP*v_{j}. |
c %-------------------------------------%
c
if (bmat .eq. 'G') then
@@ -378,8 +492,12 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_COMPLEX, MPI_SUM, comm, ierr )
wnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
-@@ -652,7 +650,7 @@
+ else if (bmat .eq. 'I') then
+ wnorm = pscnorm2(comm, n, resid, 1)
+@@ -650,11 +648,11 @@ c
c %------------------------------%
+ c | Compute the B-norm of r_{j}. |
+ c %------------------------------%
c
if (bmat .eq. 'G') then
- cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1)
@@ -387,8 +505,12 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_COMPLEX, MPI_SUM, comm, ierr )
rnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
-@@ -756,7 +754,7 @@
+ else if (bmat .eq. 'I') then
+ rnorm = pscnorm2(comm, n, resid, 1)
+@@ -754,11 +752,11 @@ c
c %-----------------------------------------------------%
+ c | Compute the B-norm of the corrected residual r_{j}. |
+ c %-----------------------------------------------------%
c
if (bmat .eq. 'G') then
- cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1)
@@ -396,16 +518,20 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_COMPLEX, MPI_SUM, comm, ierr )
rnorm1 = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
---- ./PARPACK/SRC/MPI/pcnaup2.f.orig 2012-08-07 11:08:14.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pcnaup2.f 2012-08-07 10:40:51.000000000 +1000
-@@ -249,18 +249,16 @@
+ else if (bmat .eq. 'I') then
+ rnorm1 = pscnorm2(comm, n, resid, 1)
+--- PARPACK/SRC/MPI/pcnaup2.f
++++ PARPACK/SRC/MPI/pcnaup2.f
+@@ -247,22 +247,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external ccopy, pcgetv0, pcnaitr, pcneigh, pcngets, pcnapps,
-- & csortc, cswap, pcmout, pcvout, pivout, second
+- & csortc, cswap, pcmout, pcvout, pivout, arscnd
+ external ccopy, cdotc, pcgetv0, pcnaitr, pcneigh, pcngets,
-+ & pcnapps, csortc, cswap, pcmout, pcvout, pivout, second
++ & pcnapps, csortc, cswap, pcmout, pcvout, pivout, arscnd
c
c %--------------------%
c | External functions |
@@ -420,7 +546,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -770,7 +768,7 @@
+ c %---------------------%
+ c
+@@ -768,11 +766,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
end if
c
if (bmat .eq. 'G') then
@@ -429,9 +559,13 @@
call MPI_ALLREDUCE( cmpnorm_buf, cmpnorm, 1,
& MPI_COMPLEX, MPI_SUM, comm, ierr )
rnorm = sqrt(slapy2(real(cmpnorm),aimag(cmpnorm)))
---- ./PARPACK/SRC/MPI/pcneupd.f.orig 2012-08-07 11:07:45.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pcneupd.f 2012-08-07 10:42:02.000000000 +1000
-@@ -327,7 +327,7 @@
+ else if (bmat .eq. 'I') then
+ rnorm = pscnorm2(comm, n, resid, 1)
+--- PARPACK/SRC/MPI/pcneupd.f
++++ PARPACK/SRC/MPI/pcneupd.f
+@@ -325,11 +325,11 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
@@ -440,7 +574,11 @@
& cunm2r,ctrmm,pcvout,pivout,
& clahqr
c
-@@ -339,10 +339,6 @@
+ c %--------------------%
+ c | External Functions |
+@@ -337,14 +337,10 @@ c %--------------------%
+ c
+ Real
& scnrm2,pslamch,slapy2
external scnrm2,pslamch,slapy2
c
@@ -451,7 +589,11 @@
c %---------------------%
c | Intrinsic Functions |
c %---------------------%
-@@ -743,7 +739,7 @@
+ c
+ intrinsic abs
+@@ -741,11 +737,11 @@ c | Schur basis of H wit
+ c | Note that the eigenvector matrix of T is |
+ c | upper triangular, thus the length of the |
c | inner product can be set to j. |
c %------------------------------------------%
c
@@ -460,18 +602,22 @@
& workl(invsub+(j-1)*ldq), 1)
40 continue
c
---- ./PARPACK/SRC/MPI/pzgetv0.f.orig 2012-08-07 11:31:40.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pzgetv0.f 2012-08-07 10:14:39.000000000 +1000
-@@ -191,7 +191,7 @@
+ if (msglvl .gt. 2) then
+ call ccopy(nconv, workl(invsub+ncv-1), ldq,
+--- PARPACK/SRC/MPI/pzgetv0.f
++++ PARPACK/SRC/MPI/pzgetv0.f
+@@ -189,21 +189,19 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
-- external zcopy , zgemv , pzlarnv , pzvout , second
-+ external zcopy , zdotc , zgemv , pzlarnv , pzvout , second
+- external zcopy , zgemv , pzlarnv , pzvout , arscnd
++ external zcopy , zdotc , zgemv , pzlarnv , pzvout , arscnd
c
c %--------------------%
c | External Functions |
-@@ -199,9 +199,7 @@
+ c %--------------------%
c
Double precision
& pdznorm2 , dlapy2
@@ -482,7 +628,11 @@
c
c %-----------------%
c | Data Statements |
-@@ -331,7 +329,7 @@
+ c %-----------------%
+ c
+@@ -329,11 +327,11 @@ c
+ tmvbx = tmvbx + (t3 - t2)
+ end if
c
first = .FALSE.
if (bmat .eq. 'G') then
@@ -491,7 +641,11 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_DOUBLE_COMPLEX , MPI_SUM, comm, ierr )
rnorm0 = sqrt(dlapy2 (dble (cnorm),dimag (cnorm)))
-@@ -392,7 +390,7 @@
+ else if (bmat .eq. 'I') then
+ rnorm0 = pdznorm2 ( comm, n, resid, 1)
+@@ -390,11 +388,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
end if
c
if (bmat .eq. 'G') then
@@ -500,15 +654,19 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_DOUBLE_COMPLEX , MPI_SUM, comm, ierr )
rnorm = sqrt(dlapy2 (dble (cnorm),dimag (cnorm)))
---- ./PARPACK/SRC/MPI/pznaitr.f.orig 2012-08-07 11:32:19.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pznaitr.f 2012-08-07 10:15:01.000000000 +1000
-@@ -298,18 +298,16 @@
+ else if (bmat .eq. 'I') then
+ rnorm = pdznorm2 (comm, n, resid, 1)
+--- PARPACK/SRC/MPI/pznaitr.f
++++ PARPACK/SRC/MPI/pznaitr.f
+@@ -296,22 +296,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external zaxpy, zcopy, zscal, zgemv, pzgetv0, dlabad,
+ external zaxpy, zcopy, zdotc, zscal, zgemv, pzgetv0, dlabad,
- & zdscal, pzvout, pzmout, pivout, second
+ & zdscal, pzvout, pzmout, pivout, arscnd
c
c %--------------------%
c | External Functions |
@@ -523,7 +681,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -576,7 +574,7 @@
+ c %---------------------%
+ c
+@@ -574,11 +572,11 @@ c %------------------------------
+ c | The following is needed for STEP 5. |
+ c | Compute the B-norm of OP*v_{j}. |
c %-------------------------------------%
c
if (bmat .eq. 'G') then
@@ -532,8 +694,12 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr )
wnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
-@@ -652,7 +650,7 @@
+ else if (bmat .eq. 'I') then
+ wnorm = pdznorm2(comm, n, resid, 1)
+@@ -650,11 +648,11 @@ c
c %------------------------------%
+ c | Compute the B-norm of r_{j}. |
+ c %------------------------------%
c
if (bmat .eq. 'G') then
- cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1)
@@ -541,8 +707,12 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr )
rnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
-@@ -756,7 +754,7 @@
+ else if (bmat .eq. 'I') then
+ rnorm = pdznorm2(comm, n, resid, 1)
+@@ -754,11 +752,11 @@ c
c %-----------------------------------------------------%
+ c | Compute the B-norm of the corrected residual r_{j}. |
+ c %-----------------------------------------------------%
c
if (bmat .eq. 'G') then
- cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1)
@@ -550,16 +720,20 @@
call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
& MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr )
rnorm1 = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
---- ./PARPACK/SRC/MPI/pznaup2.f.orig 2012-08-07 11:33:54.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pznaup2.f 2012-08-07 10:16:53.000000000 +1000
-@@ -249,18 +249,16 @@
+ else if (bmat .eq. 'I') then
+ rnorm1 = pdznorm2(comm, n, resid, 1)
+--- PARPACK/SRC/MPI/pznaup2.f
++++ PARPACK/SRC/MPI/pznaup2.f
+@@ -247,22 +247,20 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
- external zcopy, pzgetv0, pznaitr, pzneigh, pzngets, pznapps,
-- & zsortc, zswap, pzmout, pzvout, pivout, second
+- & zsortc, zswap, pzmout, pzvout, pivout, arscnd
+ external zcopy, zdotc, pzgetv0, pznaitr, pzneigh, pzngets,
-+ & pznapps, zsortc, zswap, pzmout, pzvout, pivout, second
++ & pznapps, zsortc, zswap, pzmout, pzvout, pivout, arscnd
c
c %--------------------%
c | External functions |
@@ -574,7 +748,11 @@
c
c %---------------------%
c | Intrinsic Functions |
-@@ -770,7 +768,7 @@
+ c %---------------------%
+ c
+@@ -768,11 +766,11 @@ c
+ call arscnd (t3)
+ tmvbx = tmvbx + (t3 - t2)
end if
c
if (bmat .eq. 'G') then
@@ -583,9 +761,13 @@
call MPI_ALLREDUCE( cmpnorm_buf, cmpnorm, 1,
& MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr )
rnorm = sqrt(dlapy2(dble(cmpnorm),dimag(cmpnorm)))
---- ./PARPACK/SRC/MPI/pzneupd.f.orig 2012-08-07 11:48:27.000000000 +1000
-+++ ./PARPACK/SRC/MPI/pzneupd.f 2012-08-07 11:48:14.000000000 +1000
-@@ -327,7 +327,7 @@
+ else if (bmat .eq. 'I') then
+ rnorm = pdznorm2(comm, n, resid, 1)
+--- PARPACK/SRC/MPI/pzneupd.f
++++ PARPACK/SRC/MPI/pzneupd.f
+@@ -325,11 +325,11 @@ c
+ c
+ c %----------------------%
c | External Subroutines |
c %----------------------%
c
@@ -594,7 +776,11 @@
& zunm2r,ztrmm,pzvout,pivout,
& zlahqr
c
-@@ -339,10 +339,6 @@
+ c %--------------------%
+ c | External Functions |
+@@ -337,14 +337,10 @@ c %--------------------%
+ c
+ Double precision
& dznrm2,pdlamch,dlapy2
external dznrm2,pdlamch,dlapy2
c
@@ -605,7 +791,11 @@
c %---------------------%
c | Intrinsic Functions |
c %---------------------%
-@@ -743,7 +739,7 @@
+ c
+ intrinsic abs
+@@ -741,11 +737,11 @@ c | Schur basis of H wit
+ c | Note that the eigenvector matrix of T is |
+ c | upper triangular, thus the length of the |
c | inner product can be set to j. |
c %------------------------------------------%
c
@@ -614,3 +804,5 @@
& workl(invsub+(j-1)*ldq), 1)
40 continue
c
+ if (msglvl .gt. 2) then
+ call zcopy(nconv, workl(invsub+ncv-1), ldq,
Deleted: trunk/dports/math/arpack/files/patch-UTIL-second_NONE.f.diff
===================================================================
--- trunk/dports/math/arpack/files/patch-UTIL-second_NONE.f.diff 2014-01-23 20:16:05 UTC (rev 116397)
+++ trunk/dports/math/arpack/files/patch-UTIL-second_NONE.f.diff 2014-01-23 20:16:10 UTC (rev 116398)
@@ -1,15 +0,0 @@
---- UTIL/second_NONE.f.orig 2013-06-17 12:02:43.000000000 -0400
-+++ UTIL/second_NONE.f 2013-06-17 12:01:23.000000000 -0400
-@@ -34,3 +34,12 @@
- * End of ARSCND
- *
- END
-+
-+
-+
-+ subroutine second(t)
-+ real :: t
-+
-+ call arscnd(t)
-+
-+ end subroutine
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/c9940519/attachment-0001.html>
More information about the macports-changes
mailing list