[96280] trunk/dports/math/arpack
mmoll at macports.org
mmoll at macports.org
Mon Aug 6 19:20:32 PDT 2012
Revision: 96280
https://trac.macports.org/changeset/96280
Author: mmoll at macports.org
Date: 2012-08-06 19:20:28 -0700 (Mon, 06 Aug 2012)
Log Message:
-----------
patch for different calling convention for cdot and zdot in Apple's Accelerate framework. See #35508
Modified Paths:
--------------
trunk/dports/math/arpack/Portfile
Added Paths:
-----------
trunk/dports/math/arpack/files/patch-ARPACK-cdot-and-zdot.diff
trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff
Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile 2012-08-06 22:00:33 UTC (rev 96279)
+++ trunk/dports/math/arpack/Portfile 2012-08-07 02:20:28 UTC (rev 96280)
@@ -5,7 +5,7 @@
name arpack
version 3.1.1
-revision 2
+revision 3
categories math
license BSD
platforms darwin
@@ -103,6 +103,10 @@
# warning: this is ignored if atlas is installed
variant accelerate conflicts atlas description {build with Accelerate framework} {
configure.args-append --with-lapack=/usr/lib/liblapack.dylib
+ patchfiles-append patch-ARPACK-cdot-and-zdot.diff
+ if {[variant_isset openmpi] || [variant_isset mpich2]} {
+ patchfiles-append patch-PARPACK-cdot-and-zdot.diff
+ }
}
variant atlas description {build with atlas} {
Added: trunk/dports/math/arpack/files/patch-ARPACK-cdot-and-zdot.diff
===================================================================
--- trunk/dports/math/arpack/files/patch-ARPACK-cdot-and-zdot.diff (rev 0)
+++ trunk/dports/math/arpack/files/patch-ARPACK-cdot-and-zdot.diff 2012-08-07 02:20:28 UTC (rev 96280)
@@ -0,0 +1,276 @@
+--- ./SRC/cgetv0.f.orig 2012-08-07 11:23:20.000000000 +1000
++++ ./SRC/cgetv0.f 2012-08-07 10:48:58.000000000 +1000
+@@ -168,7 +168,7 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy, cgemv, clarnv, cvout, arscnd
++ external ccopy, cdotc, cgemv, clarnv, cvout, arscnd
+ c
+ c %--------------------%
+ c | External Functions |
+@@ -176,9 +176,7 @@
+ c
+ Real
+ & scnrm2, slapy2
+- Complex
+- & cdotc
+- external cdotc, scnrm2, slapy2
++ external scnrm2, slapy2
+ c
+ c %-----------------%
+ c | Data Statements |
+@@ -291,7 +289,7 @@
+ c
+ first = .FALSE.
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cnorm, n, resid, 1, workd, 1)
+ rnorm0 = sqrt(slapy2(real(cnorm),aimag(cnorm)))
+ else if (bmat .eq. 'I') then
+ rnorm0 = scnrm2(n, resid, 1)
+@@ -348,7 +346,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cnorm, n, resid, 1, workd, 1)
+ rnorm = sqrt(slapy2(real(cnorm),aimag(cnorm)))
+ else if (bmat .eq. 'I') then
+ rnorm = scnrm2(n, resid, 1)
+--- ./SRC/cnaitr.f.orig 2012-08-07 11:24:18.000000000 +1000
++++ ./SRC/cnaitr.f 2012-08-07 10:50:20.000000000 +1000
+@@ -272,18 +272,16 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external caxpy, ccopy, cscal, csscal, cgemv, cgetv0,
++ external caxpy, ccopy, cdotc, cscal, csscal, cgemv, cgetv0,
+ & slabad, cvout, cmout, ivout, arscnd
+ c
+ c %--------------------%
+ c | External Functions |
+ c %--------------------%
+ c
+- Complex
+- & cdotc
+ Real
+ & slamch, scnrm2, clanhs, slapy2
+- external cdotc, scnrm2, clanhs, slamch, slapy2
++ external scnrm2, clanhs, slamch, slapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -550,7 +548,7 @@
+ c %-------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ wnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
+ else if (bmat .eq. 'I') then
+ wnorm = scnrm2(n, resid, 1)
+@@ -622,7 +620,7 @@
+ c %------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ rnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
+ else if (bmat .eq. 'I') then
+ rnorm = scnrm2(n, resid, 1)
+@@ -722,7 +720,7 @@
+ c %-----------------------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ rnorm1 = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
+ else if (bmat .eq. 'I') then
+ rnorm1 = scnrm2(n, resid, 1)
+--- ./SRC/cnaup2.f.orig 2012-08-07 11:25:22.000000000 +1000
++++ ./SRC/cnaup2.f 2012-08-07 10:51:23.000000000 +1000
+@@ -239,18 +239,16 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy, cgetv0, cnaitr, cneigh, cngets, cnapps,
++ external ccopy, cdotc, cgetv0, cnaitr, cneigh, cngets, cnapps,
+ & csortc, cswap, cmout, cvout, ivout, arscnd
+ c
+ c %--------------------%
+ c | External functions |
+ c %--------------------%
+ c
+- Complex
+- & cdotc
+ Real
+ & scnrm2, slamch, slapy2
+- external cdotc, scnrm2, slamch, slapy2
++ external scnrm2, slamch, slapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -754,7 +752,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cmpnorm = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cmpnorm, n, resid, 1, workd, 1)
+ rnorm = sqrt(slapy2(real (cmpnorm),aimag(cmpnorm)))
+ else if (bmat .eq. 'I') then
+ rnorm = scnrm2(n, resid, 1)
+--- ./SRC/zgetv0.f.orig 2012-08-07 11:40:04.000000000 +1000
++++ ./SRC/zgetv0.f 2012-08-07 10:10:13.000000000 +1000
+@@ -168,7 +168,7 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy, zgemv, zlarnv, zvout, arscnd
++ external zcopy, zdotc, zgemv, zlarnv, zvout, arscnd
+ c
+ c %--------------------%
+ c | External Functions |
+@@ -176,9 +176,7 @@
+ c
+ Double precision
+ & dznrm2, dlapy2
+- Complex*16
+- & zdotc
+- external zdotc, dznrm2, dlapy2
++ external dznrm2, dlapy2
+ c
+ c %-----------------%
+ c | Data Statements |
+@@ -291,7 +289,7 @@
+ c
+ first = .FALSE.
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cnorm, n, resid, 1, workd, 1)
+ rnorm0 = sqrt(dlapy2(dble(cnorm),dimag(cnorm)))
+ else if (bmat .eq. 'I') then
+ rnorm0 = dznrm2(n, resid, 1)
+@@ -348,7 +346,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cnorm, n, resid, 1, workd, 1)
+ rnorm = sqrt(dlapy2(dble(cnorm),dimag(cnorm)))
+ else if (bmat .eq. 'I') then
+ rnorm = dznrm2(n, resid, 1)
+--- ./SRC/znaitr.f.orig 2012-08-07 11:40:35.000000000 +1000
++++ ./SRC/znaitr.f 2012-08-07 10:12:42.000000000 +1000
+@@ -272,18 +272,16 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zaxpy, zcopy, zscal, zdscal, zgemv, zgetv0,
++ external zaxpy, zcopy, zdotc, zscal, zdscal, zgemv, zgetv0,
+ & dlabad, zvout, zmout, ivout, arscnd
+ c
+ c %--------------------%
+ c | External Functions |
+ c %--------------------%
+ c
+- Complex*16
+- & zdotc
+ Double precision
+ & dlamch, dznrm2, zlanhs, dlapy2
+- external zdotc, dznrm2, zlanhs, dlamch, dlapy2
++ external dznrm2, zlanhs, dlamch, dlapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -550,7 +548,7 @@
+ c %-------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm,n, resid, 1, workd(ipj), 1)
+ wnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
+ else if (bmat .eq. 'I') then
+ wnorm = dznrm2(n, resid, 1)
+@@ -622,7 +620,7 @@
+ c %------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm,n, resid, 1, workd(ipj), 1)
+ rnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
+ else if (bmat .eq. 'I') then
+ rnorm = dznrm2(n, resid, 1)
+@@ -722,7 +720,7 @@
+ c %-----------------------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc (cnorm, n, resid, 1, workd(ipj), 1)
+ rnorm1 = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) )
+ else if (bmat .eq. 'I') then
+ rnorm1 = dznrm2(n, resid, 1)
+--- ./SRC/znaup2.f.orig 2012-08-07 11:41:31.000000000 +1000
++++ ./SRC/znaup2.f 2012-08-07 10:21:53.000000000 +1000
+@@ -239,18 +239,16 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy , zgetv0 , znaitr , zneigh , zngets , znapps ,
+- & zsortc , zswap , zmout , zvout , ivout, arscnd
++ external zcopy , zdotc , zgetv0 , znaitr , zneigh , zngets ,
++ & znapps , zsortc , zswap , zmout , zvout , ivout, arscnd
+ c
+ c %--------------------%
+ c | External functions |
+ c %--------------------%
+ c
+- Complex*16
+- & zdotc
+ Double precision
+ & dznrm2 , dlamch , dlapy2
+- external zdotc , dznrm2 , dlamch , dlapy2
++ external dznrm2 , dlamch , dlapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -754,7 +752,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cmpnorm = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cmpnorm, n, resid, 1, workd, 1)
+ rnorm = sqrt(dlapy2 (dble (cmpnorm),dimag (cmpnorm)))
+ else if (bmat .eq. 'I') then
+ rnorm = dznrm2 (n, resid, 1)
+--- ./SRC/zneupd.f.orig 2012-08-07 11:42:11.000000000 +1000
++++ ./SRC/zneupd.f 2012-08-07 11:10:29.000000000 +1000
+@@ -312,7 +312,7 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy , zgeru, zgeqr2, zlacpy, zmout,
++ external zcopy, zdotc, zgeru, zgeqr2, zlacpy, zmout,
+ & zunm2r, ztrmm, zvout, ivout,
+ & zlahqr
+ c
+@@ -324,10 +324,6 @@
+ & dznrm2, dlamch, dlapy2
+ external dznrm2, dlamch, dlapy2
+ c
+- Complex*16
+- & zdotc
+- external zdotc
+-c
+ c %-----------------------%
+ c | Executable Statements |
+ c %-----------------------%
+@@ -731,7 +727,7 @@
+ c | inner product can be set to j. |
+ c %------------------------------------------%
+ c
+- workev(j) = zdotc(j, workl(ihbds), 1,
++ call zdotc(workev(j), j, workl(ihbds), 1,
+ & workl(invsub+(j-1)*ldq), 1)
+ 40 continue
+ c
Added: trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff
===================================================================
--- trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff (rev 0)
+++ trunk/dports/math/arpack/files/patch-PARPACK-cdot-and-zdot.diff 2012-08-07 02:20:28 UTC (rev 96280)
@@ -0,0 +1,616 @@
+--- ./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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy, cgemv, pclarnv, pcvout, second
++ external ccopy, cdotc, cgemv, pclarnv, pcvout, second
+ c
+ c %--------------------%
+ c | External Functions |
+@@ -196,9 +196,7 @@
+ c
+ Real
+ & pscnorm2, slapy2
+- Complex
+- & cdotc
+- external cdotc, pscnorm2, slapy2
++ external pscnorm2, slapy2
+ c
+ c %-----------------%
+ c | Data Statements |
+@@ -335,7 +333,7 @@
+ c
+ first = .FALSE.
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cnorm, n, resid, 1, workd, 1)
+ 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 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cnorm, n, resid, 1, workd, 1)
+ 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 @@
+ 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
+ c
+ c %--------------------%
+ c | External Functions |
+ c %--------------------%
+ c
+- Complex
+- & cdotc
+ Real
+ & pslamch, pscnorm2, clanhs, slapy2
+- external cdotc, pscnorm2, clanhs, pslamch, slapy2
++ external pscnorm2, clanhs, pslamch, slapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -573,7 +571,7 @@
+ c %-------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c %------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c %-----------------------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy, pcgetv0, pcnaitr, pcneigh, pcngets, pcnapps,
+- & csortc, cswap, pcmout, pcvout, pivout, second
++ external ccopy, cdotc, pcgetv0, pcnaitr, pcneigh, pcngets,
++ & pcnapps, csortc, cswap, pcmout, pcvout, pivout, second
+ c
+ c %--------------------%
+ c | External functions |
+ c %--------------------%
+ c
+- Complex
+- & cdotc
+ Real
+ & pscnorm2, pslamch, slapy2
+- external cdotc, pscnorm2, pslamch, slapy2
++ external pscnorm2, pslamch, slapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -767,7 +765,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cmpnorm = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cmpnorm, n, resid, 1, workd, 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy ,cgeru,cgeqr2,clacpy,pcmout,
++ external ccopy,cdotc,cgeru,cgeqr2,clacpy,pcmout,
+ & cunm2r,ctrmm,pcvout,pivout,
+ & clahqr
+ c
+@@ -339,10 +339,6 @@
+ & scnrm2,pslamch,slapy2
+ external scnrm2,pslamch,slapy2
+ c
+- Complex
+- & cdotc
+- external cdotc
+-c
+ c %---------------------%
+ c | Intrinsic Functions |
+ c %---------------------%
+@@ -743,7 +739,7 @@
+ c | inner product can be set to j. |
+ c %------------------------------------------%
+ c
+- workev(j) = cdotc(j, workl(ihbds), 1,
++ call cdotc(workev(j), j, workl(ihbds), 1,
+ & 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy , zgemv , pzlarnv , pzvout , second
++ external zcopy , zdotc , zgemv , pzlarnv , pzvout , second
+ c
+ c %--------------------%
+ c | External Functions |
+@@ -196,9 +196,7 @@
+ c
+ Double precision
+ & pdznorm2 , dlapy2
+- Complex*16
+- & zdotc
+- external zdotc , pdznorm2 , dlapy2
++ external pdznorm2 , dlapy2
+ c
+ c %-----------------%
+ c | Data Statements |
+@@ -335,7 +333,7 @@
+ c
+ first = .FALSE.
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cnorm, n, resid, 1, workd, 1)
+ 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 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cnorm, n, resid, 1, workd, 1)
+ 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 @@
+ 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
+ c
+ c %--------------------%
+ c | External Functions |
+ c %--------------------%
+ c
+- Complex*16
+- & zdotc
+ Double precision
+ & pdlamch, pdznorm2, zlanhs, dlapy2
+- external zdotc, pdznorm2, zlanhs, pdlamch, dlapy2
++ external pdznorm2, zlanhs, pdlamch, dlapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -573,7 +571,7 @@
+ c %-------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c %------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c %-----------------------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy, pzgetv0, pznaitr, pzneigh, pzngets, pznapps,
+- & zsortc, zswap, pzmout, pzvout, pivout, second
++ external zcopy, zdotc, pzgetv0, pznaitr, pzneigh, pzngets,
++ & pznapps, zsortc, zswap, pzmout, pzvout, pivout, second
+ c
+ c %--------------------%
+ c | External functions |
+ c %--------------------%
+ c
+- Complex*16
+- & zdotc
+ Double precision
+ & pdznorm2, pdlamch, dlapy2
+- external zdotc, pdznorm2, pdlamch, dlapy2
++ external pdznorm2, pdlamch, dlapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -767,7 +765,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cmpnorm = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cmpnorm, n, resid, 1, workd, 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy ,zgeru,zgeqr2,zlacpy,pzmout,
++ external zcopy,zdotc,zgeru,zgeqr2,zlacpy,pzmout,
+ & zunm2r,ztrmm,pzvout,pivout,
+ & zlahqr
+ c
+@@ -339,10 +339,6 @@
+ & dznrm2,pdlamch,dlapy2
+ external dznrm2,pdlamch,dlapy2
+ c
+- Complex*16
+- & zdotc
+- external zdotc
+-c
+ c %---------------------%
+ c | Intrinsic Functions |
+ c %---------------------%
+@@ -743,7 +739,7 @@
+ c | inner product can be set to j. |
+ c %------------------------------------------%
+ c
+- workev(j) = zdotc(j, workl(ihbds), 1,
++ call zdotc( workev(j), j, workl(ihbds), 1,
+ & 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy, cgemv, pclarnv, pcvout, second
++ external ccopy, cdotc, cgemv, pclarnv, pcvout, second
+ c
+ c %--------------------%
+ c | External Functions |
+@@ -199,9 +199,7 @@
+ c
+ Real
+ & pscnorm2, slapy2
+- Complex
+- & cdotc
+- external cdotc, pscnorm2, slapy2
++ external pscnorm2, slapy2
+ c
+ c %-----------------%
+ c | Data Statements |
+@@ -331,7 +329,7 @@
+ c
+ first = .FALSE.
+ if (bmat .eq. 'G') then
+- cnorm_buf = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cnorm_buff, n, resid, 1, workd, 1)
+ call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
+ & MPI_COMPLEX, MPI_SUM, comm, ierr )
+ rnorm0 = sqrt(slapy2(real (cnorm),aimag(cnorm)))
+@@ -392,7 +390,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cnorm_buff, n, resid, 1, workd, 1)
+ 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 @@
+ 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
+ c
+ c %--------------------%
+ c | External Functions |
+ c %--------------------%
+ c
+- Complex
+- & cdotc
+ Real
+ & pslamch, pscnorm2, clanhs, slapy2
+- external cdotc, pscnorm2, clanhs, pslamch, slapy2
++ external pscnorm2, clanhs, pslamch, slapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -576,7 +574,7 @@
+ c %-------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm_buf, n, resid, 1, workd(ipj), 1)
+ call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
+ & MPI_COMPLEX, MPI_SUM, comm, ierr )
+ wnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
+@@ -652,7 +650,7 @@
+ c %------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm_buf, n, resid, 1, workd(ipj), 1)
+ call MPI_ALLREDUCE( cnorm_buf, cnorm, 1,
+ & MPI_COMPLEX, MPI_SUM, comm, ierr )
+ rnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) )
+@@ -756,7 +754,7 @@
+ c %-----------------------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1)
++ call cdotc(cnorm_buf, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy, pcgetv0, pcnaitr, pcneigh, pcngets, pcnapps,
+- & csortc, cswap, pcmout, pcvout, pivout, second
++ external ccopy, cdotc, pcgetv0, pcnaitr, pcneigh, pcngets,
++ & pcnapps, csortc, cswap, pcmout, pcvout, pivout, second
+ c
+ c %--------------------%
+ c | External functions |
+ c %--------------------%
+ c
+- Complex
+- & cdotc
+ Real
+ & pscnorm2, pslamch, slapy2
+- external cdotc, pscnorm2, pslamch, slapy2
++ external pscnorm2, pslamch, slapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -770,7 +768,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cmpnorm_buf = cdotc (n, resid, 1, workd, 1)
++ call cdotc(cmpnorm_buf, n, resid, 1, workd, 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external ccopy ,cgeru,cgeqr2,clacpy,pcmout,
++ external ccopy,cdotc,cgeru,cgeqr2,clacpy,pcmout,
+ & cunm2r,ctrmm,pcvout,pivout,
+ & clahqr
+ c
+@@ -339,10 +339,6 @@
+ & scnrm2,pslamch,slapy2
+ external scnrm2,pslamch,slapy2
+ c
+- Complex
+- & cdotc
+- external cdotc
+-c
+ c %---------------------%
+ c | Intrinsic Functions |
+ c %---------------------%
+@@ -743,7 +739,7 @@
+ c | inner product can be set to j. |
+ c %------------------------------------------%
+ c
+- workev(j) = cdotc(j, workl(ihbds), 1,
++ call cdotc(workev(j), j, workl(ihbds), 1,
+ & 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy , zgemv , pzlarnv , pzvout , second
++ external zcopy , zdotc , zgemv , pzlarnv , pzvout , second
+ c
+ c %--------------------%
+ c | External Functions |
+@@ -199,9 +199,7 @@
+ c
+ Double precision
+ & pdznorm2 , dlapy2
+- Complex*16
+- & zdotc
+- external zdotc , pdznorm2 , dlapy2
++ external pdznorm2 , dlapy2
+ c
+ c %-----------------%
+ c | Data Statements |
+@@ -331,7 +329,7 @@
+ c
+ first = .FALSE.
+ if (bmat .eq. 'G') then
+- cnorm_buf = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cnorm_buf, n, resid, 1, workd, 1)
+ 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 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cnorm_buf, n, resid, 1, workd, 1)
+ 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 @@
+ 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
+ c
+ c %--------------------%
+ c | External Functions |
+ c %--------------------%
+ c
+- Complex*16
+- & zdotc
+ Double precision
+ & pdlamch, pdznorm2, zlanhs, dlapy2
+- external zdotc, pdznorm2, zlanhs, pdlamch, dlapy2
++ external pdznorm2, zlanhs, pdlamch, dlapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -576,7 +574,7 @@
+ c %-------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm_buf, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c %------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm_buf, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c %-----------------------------------------------------%
+ c
+ if (bmat .eq. 'G') then
+- cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1)
++ call zdotc(cnorm_buf, n, resid, 1, workd(ipj), 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy, pzgetv0, pznaitr, pzneigh, pzngets, pznapps,
+- & zsortc, zswap, pzmout, pzvout, pivout, second
++ external zcopy, zdotc, pzgetv0, pznaitr, pzneigh, pzngets,
++ & pznapps, zsortc, zswap, pzmout, pzvout, pivout, second
+ c
+ c %--------------------%
+ c | External functions |
+ c %--------------------%
+ c
+- Complex*16
+- & zdotc
+ Double precision
+ & pdznorm2, pdlamch, dlapy2
+- external zdotc, pdznorm2, pdlamch, dlapy2
++ external pdznorm2, pdlamch, dlapy2
+ c
+ c %---------------------%
+ c | Intrinsic Functions |
+@@ -770,7 +768,7 @@
+ end if
+ c
+ if (bmat .eq. 'G') then
+- cmpnorm_buf = zdotc (n, resid, 1, workd, 1)
++ call zdotc(cmpnorm_buf, n, resid, 1, workd, 1)
+ 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 @@
+ c | External Subroutines |
+ c %----------------------%
+ c
+- external zcopy ,zgeru,zgeqr2,zlacpy,pzmout,
++ external zcopy,zdotc,zgeru,zgeqr2,zlacpy,pzmout,
+ & zunm2r,ztrmm,pzvout,pivout,
+ & zlahqr
+ c
+@@ -339,10 +339,6 @@
+ & dznrm2,pdlamch,dlapy2
+ external dznrm2,pdlamch,dlapy2
+ c
+- Complex*16
+- & zdotc
+- external zdotc
+-c
+ c %---------------------%
+ c | Intrinsic Functions |
+ c %---------------------%
+@@ -743,7 +739,7 @@
+ c | inner product can be set to j. |
+ c %------------------------------------------%
+ c
+- workev(j) = zdotc(j, workl(ihbds), 1,
++ call zdotc(workev(j), j, workl(ihbds), 1,
+ & workl(invsub+(j-1)*ldq), 1)
+ 40 continue
+ c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120806/149d7f9d/attachment-0001.html>
More information about the macports-changes
mailing list