diff options
author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1996-06-07 15:39:54 +0000 |
---|---|---|
committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1996-06-07 15:39:54 +0000 |
commit | d2e95f05c163f196a666702adf838324fd6ea6dd (patch) | |
tree | e4b08b49cd31550bb706b566347298b0112a0593 /math/lapack/files | |
parent | 5fa74962cff4dbd9ac2cde4aa3fa8dfd9deac03d (diff) |
Notes
Diffstat (limited to 'math/lapack/files')
-rw-r--r-- | math/lapack/files/patch-aa | 57 | ||||
-rw-r--r-- | math/lapack/files/patch-ab | 47 | ||||
-rw-r--r-- | math/lapack/files/patch-ac | 37 | ||||
-rw-r--r-- | math/lapack/files/patch-ad | 22 | ||||
-rw-r--r-- | math/lapack/files/patch-ae | 41 | ||||
-rw-r--r-- | math/lapack/files/patch-af | 102 | ||||
-rw-r--r-- | math/lapack/files/patch-ag | 132 |
7 files changed, 438 insertions, 0 deletions
diff --git a/math/lapack/files/patch-aa b/math/lapack/files/patch-aa new file mode 100644 index 000000000000..1db931f4c7c6 --- /dev/null +++ b/math/lapack/files/patch-aa @@ -0,0 +1,57 @@ +*** make.inc.old Fri Sep 23 18:09:30 1994 +--- make.inc Mon Jul 3 03:37:56 1995 +*************** +*** 6,12 **** + # + # The machine (platform) identifier to append to the library names + # +! PLAT = _sun4 + # + # Modify the FORTRAN and OPTS definitions to refer to the + # compiler and desired compiler options for your machine. NOOPT +--- 6,12 ---- + # + # The machine (platform) identifier to append to the library names + # +! #PLAT = _sun4 + # + # Modify the FORTRAN and OPTS definitions to refer to the + # compiler and desired compiler options for your machine. NOOPT +*************** +*** 15,22 **** + # desired load options for your machine. + # + FORTRAN = f77 +! OPTS = -O -u +! NOOPT = -u + LOADER = f77 + LOADOPTS = + # +--- 15,22 ---- + # desired load options for your machine. + # + FORTRAN = f77 +! #OPTS = -O2 +! #NOOPT = -u + LOADER = f77 + LOADOPTS = + # +*************** +*** 31,38 **** + # machine-specific, optimized BLAS library should be used whenever + # possible.) + # +! BLASLIB = ../../blas$(PLAT).a + #BLASLIB = -lblas +! LAPACKLIB = lapack$(PLAT).a + TMGLIB = tmglib$(PLAT).a + EIGSRCLIB = eigsrc$(PLAT).a +--- 31,38 ---- + # machine-specific, optimized BLAS library should be used whenever + # possible.) + # +! BLASLIB = ../../BLAS/SRC/libblas.a + #BLASLIB = -lblas +! LAPACKLIB = SRC/liblapack.a + TMGLIB = tmglib$(PLAT).a + EIGSRCLIB = eigsrc$(PLAT).a diff --git a/math/lapack/files/patch-ab b/math/lapack/files/patch-ab new file mode 100644 index 000000000000..2aff51c83cca --- /dev/null +++ b/math/lapack/files/patch-ab @@ -0,0 +1,47 @@ +*** INSTALL/Makefile~ Fri Sep 23 18:10:06 1994 +--- INSTALL/Makefile Mon Jul 3 00:49:05 1995 +*************** +*** 11,21 **** + testdlamch: dlamch.o lsame.o dlamchtst.o + $(LOADER) -o testdlamch dlamch.o lsame.o dlamchtst.o + +! testsecond: second.o secondtst.o +! $(LOADER) -o testsecond second.o secondtst.o + +! testdsecnd: dsecnd.o dsecndtst.o +! $(LOADER) -o testdsecnd dsecnd.o dsecndtst.o + + slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c $< + dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c $< +--- 11,21 ---- + testdlamch: dlamch.o lsame.o dlamchtst.o + $(LOADER) -o testdlamch dlamch.o lsame.o dlamchtst.o + +! testsecond: second.o secondtst.o etime_.o +! $(LOADER) -o testsecond second.o secondtst.o etime_.o + +! testdsecnd: dsecnd.o dsecndtst.o etime_.o +! $(LOADER) -o testdsecnd dsecnd.o dsecndtst.o etime_.o + + slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c $< + dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c $< +*** /dev/null Sun Jul 2 04:00:02 1995 +--- INSTALL/etime_.c Mon Jul 3 00:47:16 1995 +*************** +*** 0 **** +--- 1,15 ---- ++ #include <sys/types.h> ++ #include <sys/time.h> ++ #include <sys/resource.h> ++ ++ float ++ etime_ (float *a) ++ { ++ struct rusage r; ++ float f; ++ ++ getrusage(RUSAGE_SELF, &r); ++ f = r.ru_utime.tv_sec + (float) r.ru_utime.tv_usec/1000000; ++ *a = f; ++ return f; ++ } diff --git a/math/lapack/files/patch-ac b/math/lapack/files/patch-ac new file mode 100644 index 000000000000..5eabdb0901bb --- /dev/null +++ b/math/lapack/files/patch-ac @@ -0,0 +1,37 @@ +*** Makefile.orig Tue Oct 4 16:42:15 1994 +--- Makefile Mon Oct 9 03:11:46 1995 +*************** +*** 6,12 **** + + include make.inc + +! all: install lib testing blas_testing timing blas_timing + + lib: blaslib lapacklib tmglib + +--- 6,12 ---- + + include make.inc + +! all: install lib # testing blas_testing timing blas_timing + + lib: blaslib lapacklib tmglib + +*************** +*** 17,23 **** + testdlamch; testsecond; testdsecnd; \ + cp lsame.f ../BLAS/SRC/; cp lsame.f ../SRC; \ + cp slamch.f ../SRC/; cp dlamch.f ../SRC/; \ +! cp second.f ../SRC/; cp dsecnd.f ../SRC/ ) + + blaslib: + ( cd BLAS/SRC; $(MAKE) ) +--- 17,24 ---- + testdlamch; testsecond; testdsecnd; \ + cp lsame.f ../BLAS/SRC/; cp lsame.f ../SRC; \ + cp slamch.f ../SRC/; cp dlamch.f ../SRC/; \ +! cp second.f ../SRC/; cp dsecnd.f ../SRC/; \ +! cp etime_.c ../SRC/ ) + + blaslib: + ( cd BLAS/SRC; $(MAKE) ) diff --git a/math/lapack/files/patch-ad b/math/lapack/files/patch-ad new file mode 100644 index 000000000000..d88b6f107fd7 --- /dev/null +++ b/math/lapack/files/patch-ad @@ -0,0 +1,22 @@ +*** BLAS/SRC/zrotg.f~ Fri Oct 30 21:09:39 1992 +--- BLAS/SRC/zrotg.f Mon Jul 3 01:28:54 1995 +*************** +*** 10,17 **** + go to 20 + 10 continue + scale = cdabs(ca) + cdabs(cb) +! norm = scale*dsqrt((cdabs(ca/dcmplx(scale,0.0d0)))**2 + +! * (cdabs(cb/dcmplx(scale,0.0d0)))**2) + alpha = ca /cdabs(ca) + c = cdabs(ca) / norm + s = alpha * dconjg(cb) / norm +--- 10,18 ---- + go to 20 + 10 continue + scale = cdabs(ca) + cdabs(cb) +! c = (cdabs(ca/dcmplx(scale,0.0d0)))**2 + +! * (cdabs(cb/dcmplx(scale,0.0d0)))**2 +! norm = scale*dsqrt(c) + alpha = ca /cdabs(ca) + c = cdabs(ca) / norm + s = alpha * dconjg(cb) / norm diff --git a/math/lapack/files/patch-ae b/math/lapack/files/patch-ae new file mode 100644 index 000000000000..7c7ca2d70d96 --- /dev/null +++ b/math/lapack/files/patch-ae @@ -0,0 +1,41 @@ +*** BLAS/SRC/zrotg.f~ Mon Jul 3 19:23:21 1995 +--- BLAS/SRC/zrotg.f Tue Jul 4 13:11:24 1995 +*************** +*** 3,20 **** + double precision c + double precision norm,scale + double complex alpha +! if (cdabs(ca) .ne. 0.0d0) go to 10 + c = 0.0d0 + s = (1.0d0,0.0d0) + ca = cb + go to 20 + 10 continue +! scale = cdabs(ca) + cdabs(cb) +! c = (cdabs(ca/dcmplx(scale,0.0d0)))**2 + +! * (cdabs(cb/dcmplx(scale,0.0d0)))**2 + norm = scale*dsqrt(c) +! alpha = ca /cdabs(ca) +! c = cdabs(ca) / norm + s = alpha * dconjg(cb) / norm + ca = alpha * norm + 20 continue +--- 3,20 ---- + double precision c + double precision norm,scale + double complex alpha +! if (abs(ca) .ne. 0.0d0) go to 10 + c = 0.0d0 + s = (1.0d0,0.0d0) + ca = cb + go to 20 + 10 continue +! scale = abs(ca) + abs(cb) +! c = (abs(ca/dcmplx(scale,0.0d0)))**2 + +! * (abs(cb/dcmplx(scale,0.0d0)))**2 + norm = scale*dsqrt(c) +! alpha = ca /abs(ca) +! c = abs(ca) / norm + s = alpha * dconjg(cb) / norm + ca = alpha * norm + 20 continue diff --git a/math/lapack/files/patch-af b/math/lapack/files/patch-af new file mode 100644 index 000000000000..afa3a00aa5ce --- /dev/null +++ b/math/lapack/files/patch-af @@ -0,0 +1,102 @@ +*** ./TIMING/EIG/stimee.f~ Fri Nov 18 19:49:14 1994 +--- ./TIMING/EIG/stimee.f Tue Jul 4 19:24:06 1995 +*************** +*** 243,250 **** + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAX( MAXN*( 4*MAXN+2 ), +! $ 2*LDAMAX+1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) ) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) +--- 243,249 ---- + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAXN*( 4*MAXN+2 )) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) +*** ./TIMING/EIG/ctimee.f~ Fri Nov 18 19:49:34 1994 +--- ./TIMING/EIG/ctimee.f Tue Jul 4 22:37:16 1995 +*************** +*** 262,275 **** + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAX( MAXN*( 4*MAXN+2 ), +! $ 2*LDAMAX+1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) ) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) + INTEGER LRWORK +! PARAMETER ( LRWORK = MAX( MAXIN*MAXT*MAXPRM, +! $ 1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) ) + INTEGER NIN, NOUT + PARAMETER ( NIN = 5, NOUT = 6 ) + * .. +--- 262,273 ---- + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAXN*( 4*MAXN+2 )) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) + INTEGER LRWORK +! PARAMETER ( LRWORK = 1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) + INTEGER NIN, NOUT + PARAMETER ( NIN = 5, NOUT = 6 ) + * .. +*** ./TIMING/EIG/dtimee.f~ Fri Nov 18 19:49:24 1994 +--- ./TIMING/EIG/dtimee.f Tue Jul 4 23:41:44 1995 +*************** +*** 243,250 **** + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAX( MAXN*( 4*MAXN+2 ), +! $ 2*LDAMAX+1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) ) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) +--- 243,249 ---- + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAXN*( 4*MAXN+2 )) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) +*** ./TIMING/EIG/ztimee.f~ Fri Nov 18 19:49:43 1994 +--- ./TIMING/EIG/ztimee.f Wed Jul 5 00:55:56 1995 +*************** +*** 262,275 **** + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAX( MAXN*( 4*MAXN+2 ), +! $ 2*LDAMAX+1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) ) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) + INTEGER LRWORK +! PARAMETER ( LRWORK = MAX( MAXIN*MAXT*MAXPRM, +! $ 1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) ) + INTEGER NIN, NOUT + PARAMETER ( NIN = 5, NOUT = 6 ) + * .. +--- 262,273 ---- + INTEGER LIWRK2 + PARAMETER ( LIWRK2 = 6+6*MAXN+5*MAXN*LG2MXN ) + INTEGER LWORK +! PARAMETER ( LWORK = MAXN*( 4*MAXN+2 )) + INTEGER MAXIN, MAXPRM, MAXT, MAXSUB + PARAMETER ( MAXIN = 12, MAXPRM = 10, MAXT = 10, + $ MAXSUB = 20 ) + INTEGER LRWORK +! PARAMETER ( LRWORK = 1+3*MAXN+2*MAXN*LG2MXN+3*MAXN**2 ) + INTEGER NIN, NOUT + PARAMETER ( NIN = 5, NOUT = 6 ) + * .. diff --git a/math/lapack/files/patch-ag b/math/lapack/files/patch-ag new file mode 100644 index 000000000000..835a5a64eaa6 --- /dev/null +++ b/math/lapack/files/patch-ag @@ -0,0 +1,132 @@ +*** TIMING/EIG/zeispack.f~ Fri Sep 23 18:36:18 1994 +--- TIMING/EIG/zeispack.f Wed Jul 5 01:01:51 1995 +*************** +*** 3062,3068 **** + DREAL(ZDUMR) = ZDUMR + DIMAG(ZDUMI) = (0.0D0,-1.0D0)*ZDUMI + CABS1(ZDUM) = DABS(DREAL(ZDUM)) + DABS(DIMAG(ZDUM)) +! CSIGN(ZDUM1,ZDUM2) = CDABS(ZDUM1)*(ZDUM2/CDABS(ZDUM2)) + * + * GET EPS FROM DLAMCH FOR NEW STOPPING CRITERION + IF (N.LE.0 .OR. P.LE.0) RETURN +--- 3062,3068 ---- + DREAL(ZDUMR) = ZDUMR + DIMAG(ZDUMI) = (0.0D0,-1.0D0)*ZDUMI + CABS1(ZDUM) = DABS(DREAL(ZDUM)) + DABS(DIMAG(ZDUM)) +! CSIGN(ZDUM1,ZDUM2) = ABS(ZDUM1)*(ZDUM2/ABS(ZDUM2)) + * + * GET EPS FROM DLAMCH FOR NEW STOPPING CRITERION + IF (N.LE.0 .OR. P.LE.0) RETURN +*************** +*** 3281,3287 **** + * INCREMENT OP COUNT + IOPS = IOPS + 23 + IF (WANTU) IOPS = IOPS + 6*N +! T = DCMPLX(CDABS(S(I)),0.0D0) + R = S(I)/T + S(I) = T + IF (I .LT. M) E(I) = E(I)/R +--- 3281,3287 ---- + * INCREMENT OP COUNT + IOPS = IOPS + 23 + IF (WANTU) IOPS = IOPS + 6*N +! T = DCMPLX(ABS(S(I)),0.0D0) + R = S(I)/T + S(I) = T + IF (I .LT. M) E(I) = E(I)/R +*************** +*** 3294,3300 **** + * INCREMENT OP COUNT + IOPS = IOPS + 20 + IF (WANTV) IOPS = IOPS + 6*P +! T = DCMPLX(CDABS(E(I)),0.0D0) + R = T/E(I) + E(I) = T + S(I+1) = S(I+1)*R +--- 3294,3300 ---- + * INCREMENT OP COUNT + IOPS = IOPS + 20 + IF (WANTV) IOPS = IOPS + 6*P +! T = DCMPLX(ABS(E(I)),0.0D0) + R = T/E(I) + E(I) = T + S(I+1) = S(I+1)*R +*************** +*** 3346,3358 **** + * + * INCREMENT OP COUNT + IOPST = IOPST + 17 +! TEST = CDABS(S(L)) + CDABS(S(L+1)) + * + * REPLACE STOPPING CRITERION WITH NEW ONE + * +! * ZTEST = TEST + CDABS(E(L)) + * IF (ZTEST .NE. TEST) GO TO 420 +! IF (CDABS(E(L)) .GT. EPS * TEST) GOTO 420 + * + E(L) = (0.0D0,0.0D0) + C ......EXIT +--- 3346,3358 ---- + * + * INCREMENT OP COUNT + IOPST = IOPST + 17 +! TEST = ABS(S(L)) + ABS(S(L+1)) + * + * REPLACE STOPPING CRITERION WITH NEW ONE + * +! * ZTEST = TEST + ABS(E(L)) + * IF (ZTEST .NE. TEST) GO TO 420 +! IF (ABS(E(L)) .GT. EPS * TEST) GOTO 420 + * + E(L) = (0.0D0,0.0D0) + C ......EXIT +*************** +*** 3374,3387 **** + * + * INCREMENT OP COUNT + IOPST = IOPST + 18 +! IF (LS .NE. M) TEST = TEST + CDABS(E(LS)) +! IF (LS .NE. L + 1) TEST = TEST + CDABS(E(LS-1)) + * + * REPLACE STOPPING CRITERION WITH NEW ONE AS IN LAPACK + * +! * ZTEST = TEST + CDABS(S(LS)) + * IF (ZTEST .NE. TEST) GO TO 460 +! IF (CDABS(S(LS)) .GT. EPS * TEST) GOTO 460 + * + S(LS) = (0.0D0,0.0D0) + C ......EXIT +--- 3374,3387 ---- + * + * INCREMENT OP COUNT + IOPST = IOPST + 18 +! IF (LS .NE. M) TEST = TEST + ABS(E(LS)) +! IF (LS .NE. L + 1) TEST = TEST + ABS(E(LS-1)) + * + * REPLACE STOPPING CRITERION WITH NEW ONE AS IN LAPACK + * +! * ZTEST = TEST + ABS(S(LS)) + * IF (ZTEST .NE. TEST) GO TO 460 +! IF (ABS(S(LS)) .GT. EPS * TEST) GOTO 460 + * + S(LS) = (0.0D0,0.0D0) + C ......EXIT +*************** +*** 3458,3465 **** + * + * INCREMENT OP COUNT + IOPST = IOPST + 48 +! SCALE = DMAX1(CDABS(S(M)),CDABS(S(M-1)),CDABS(E(M-1)), +! * CDABS(S(L)),CDABS(E(L))) + SM = DREAL(S(M))/SCALE + SMM1 = DREAL(S(M-1))/SCALE + EMM1 = DREAL(E(M-1))/SCALE +--- 3458,3465 ---- + * + * INCREMENT OP COUNT + IOPST = IOPST + 48 +! SCALE = DMAX1(ABS(S(M)),ABS(S(M-1)),ABS(E(M-1)), +! * ABS(S(L)),ABS(E(L))) + SM = DREAL(S(M))/SCALE + SMM1 = DREAL(S(M-1))/SCALE + EMM1 = DREAL(E(M-1))/SCALE |