summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authoradam <adam>2017-01-25 15:53:06 +0000
committeradam <adam>2017-01-25 15:53:06 +0000
commit2dc5a83d7aec7f74d37aa2ad158ab8fc56710832 (patch)
tree87895439a8f33d397e2097b405cf441d71f90a67 /math
parent1741e1537b8f511c41ea4b7083a645ad066744b3 (diff)
downloadpkgsrc-2dc5a83d7aec7f74d37aa2ad158ab8fc56710832.tar.gz
Changes 3.7.0:
* Linear Least Squares / Minimum Norm solution * Symmetric-indefinite Factorization: Aasen’s tridiagonalization * Symmetric-indefinite Factorization: New storage format for L factor in Rook Pivoting and Bunch Kaufman of LDLT * Symmetric eigenvalue problem: Two-stage algorithm for reduction to tridiagonal form * Improved Complex Jacobi SVD * LAPACKE interfaces
Diffstat (limited to 'math')
-rw-r--r--math/lapack/Makefile.common4
-rw-r--r--math/lapack/distinfo16
-rw-r--r--math/lapack/patches/patch-BLAS_SRC_Makefile10
-rw-r--r--math/lapack/patches/patch-aa106
-rw-r--r--math/lapack/patches/patch-ad27
5 files changed, 86 insertions, 77 deletions
diff --git a/math/lapack/Makefile.common b/math/lapack/Makefile.common
index e117b568a35..fbbb3087c19 100644
--- a/math/lapack/Makefile.common
+++ b/math/lapack/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2016/12/12 14:36:23 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2017/01/25 15:53:06 adam Exp $
# used by math/blas/Makefile
# used by math/lapack/Makefile
-DISTNAME= lapack-3.6.1
+DISTNAME= lapack-3.7.0
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/}
EXTRACT_SUFX= .tgz
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index f782a5fa57e..a03fff880a6 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2016/10/18 14:08:14 wiz Exp $
+$NetBSD: distinfo,v 1.20 2017/01/25 15:53:06 adam Exp $
-SHA1 (lapack-3.6.1.tgz) = 7220a9bc9c766cb513007f313b804d88f110c228
-RMD160 (lapack-3.6.1.tgz) = 227e893b3716286d405e683ad0e29df475c9ebde
-SHA512 (lapack-3.6.1.tgz) = 2c0af80f6082283395d9c6dc0a463b5a291d7bda3bc3aa68b8f2c7405bfdfac9e4ae417d156da75aa6ed0d90765d0c2ee30bd87ca13ced3c29f8f065038203a1
-Size (lapack-3.6.1.tgz) = 6813749 bytes
-SHA1 (patch-BLAS_SRC_Makefile) = e0ee6f76e94352b05edac151c0a47f82e8773210
-SHA1 (patch-aa) = 3612216affbe323d1e7e46e66988f94f9f7a3574
+SHA1 (lapack-3.7.0.tgz) = 27dbd06bedc76619150f8e28de6412f7df0c649a
+RMD160 (lapack-3.7.0.tgz) = 71841959ce7cd6a07e721a2de8ff29c89735b103
+SHA512 (lapack-3.7.0.tgz) = e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
+Size (lapack-3.7.0.tgz) = 7359812 bytes
+SHA1 (patch-BLAS_SRC_Makefile) = daffb940f6ec0cd03dcce22799e27096a4d98607
+SHA1 (patch-aa) = e6a5a34a182d14a1859c9bf24823ab1f9cfabf2f
SHA1 (patch-ac) = 14945f2d5d18a6e310a2237ca413967dc5bdf4ff
-SHA1 (patch-ad) = c8768f0efd2473b06251f2234b8b14951a9a877c
+SHA1 (patch-ad) = aba4eae370d65e291b5cf6303cb9b4a6555a788c
diff --git a/math/lapack/patches/patch-BLAS_SRC_Makefile b/math/lapack/patches/patch-BLAS_SRC_Makefile
index 6370cf028db..852d948abb9 100644
--- a/math/lapack/patches/patch-BLAS_SRC_Makefile
+++ b/math/lapack/patches/patch-BLAS_SRC_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-BLAS_SRC_Makefile,v 1.3 2014/08/19 13:37:15 joerg Exp $
+$NetBSD: patch-BLAS_SRC_Makefile,v 1.4 2017/01/25 15:53:06 adam Exp $
Use LIBTOOL.
---- BLAS/SRC/Makefile.orig 2008-11-07 17:35:57.000000000 +0000
+--- BLAS/SRC/Makefile.orig 2016-12-23 23:01:32.000000000 +0000
+++ BLAS/SRC/Makefile
-@@ -138,8 +138,8 @@ ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(D
+@@ -138,8 +138,8 @@ ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $
$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
$(BLASLIB): $(ALLOBJ)
@@ -18,6 +18,6 @@ Use LIBTOOL.
@@ -168,4 +168,4 @@ clean:
rm -f *.o
- .f.o:
-- $(FORTRAN) $(OPTS) -c $< -o $@
+ .f.o:
+- $(FORTRAN) $(OPTS) -c -o $@ $<
+ ${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
diff --git a/math/lapack/patches/patch-aa b/math/lapack/patches/patch-aa
index 1726378387a..7bea87e0af2 100644
--- a/math/lapack/patches/patch-aa
+++ b/math/lapack/patches/patch-aa
@@ -1,80 +1,89 @@
-$NetBSD: patch-aa,v 1.10 2016/10/18 14:08:14 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2017/01/25 15:53:06 adam Exp $
---- SRC/Makefile.orig 2016-06-18 22:15:11.000000000 +0000
+Fix ifdef/endif.
+Use LIBTOOL.
+Remove duplicate objects (one line).
+
+--- SRC/Makefile.orig 2016-12-23 23:01:32.000000000 +0000
+++ SRC/Makefile
-@@ -163,7 +163,7 @@ SLASRC = \
+@@ -174,7 +174,7 @@ SLASRC = \
- DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o
+ DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o
-ifdef USEXBLAS
+.ifdef USEXBLAS
- SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o \
- sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o \
- sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o \
-@@ -171,7 +171,7 @@ SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx
- sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o \
- sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o \
+ SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o \
+ sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o \
+ sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o \
+@@ -182,7 +182,7 @@ SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx
+ sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o \
+ sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o \
slascl2.o sla_wwaddw.o
-endif
+.endif
CLASRC = \
cpotrf2.o cgetrf2.o \
-@@ -245,7 +245,7 @@ CLASRC = \
- cgeqrt.o cgeqrt2.o cgeqrt3.o cgemqrt.o \
- ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o
+@@ -271,7 +271,7 @@ CLASRC = \
+ cheevd_2stage.o cheev_2stage.o cheevx_2stage.o cheevr_2stage.o \
+ chbev_2stage.o chbevx_2stage.o chbevd_2stage.o chegv_2stage.o
-ifdef USEXBLAS
+.ifdef USEXBLAS
CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o \
csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \
-@@ -257,7 +257,7 @@ CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx
+@@ -283,7 +283,7 @@ CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx
chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \
cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \
cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
-endif
+.endif
- ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o
+ ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o
-@@ -328,7 +328,7 @@ DLASRC = \
- dgeqrt.o dgeqrt2.o dgeqrt3.o dgemqrt.o \
- dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o
+@@ -366,7 +366,7 @@ DLASRC = \
+ dsyevd_2stage.o dsyev_2stage.o dsyevx_2stage.o dsyevr_2stage.o \
+ dsbev_2stage.o dsbevx_2stage.o dsbevd_2stage.o dsygv_2stage.o
-ifdef USEXBLAS
+.ifdef USEXBLAS
- DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \
- dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o \
- dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o \
-@@ -336,7 +336,7 @@ DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx
- dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o \
- dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o \
+ DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \
+ dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o \
+ dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o \
+@@ -374,7 +374,7 @@ DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx
+ dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o \
+ dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o \
dlascl2.o dla_wwaddw.o
-endif
+.endif
ZLASRC = \
zpotrf2.o zgetrf2.o \
-@@ -416,7 +416,7 @@ ZLASRC = \
- zgeqrt.o zgeqrt2.o zgeqrt3.o zgemqrt.o \
- ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o
+@@ -464,12 +464,11 @@ ZLASRC = \
+ zgelqt.o zgelqt3.o zgemlqt.o \
+ zgetsls.o zgeqr.o zlatsqr.o zlamtsqr.o zgemqr.o \
+ zgelq.o zlaswlq.o zlamswlq.o zgemlq.o \
+- ztplqt.o ztplqt2.o ztpmlqt.o \
+ zhetrd_2stage.o zhetrd_he2hb.o zhetrd_hb2st.o zhb2st_kernels.o \
+ zheevd_2stage.o zheev_2stage.o zheevx_2stage.o zheevr_2stage.o \
+ zhbev_2stage.o zhbevx_2stage.o zhbevd_2stage.o zhegv_2stage.o
-ifdef USEXBLAS
+.ifdef USEXBLAS
- ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \
- zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o \
- zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o \
-@@ -426,7 +426,7 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx
- zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o \
- zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o \
+ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \
+ zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o \
+ zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o \
+@@ -479,7 +478,7 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx
+ zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o \
+ zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o \
zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
-endif
+.endif
- DEPRECSRC = DEPRECATED/cgegs.o DEPRECATED/cgegv.o DEPRECATED/cgelsx.o \
- DEPRECATED/cgeqpf.o DEPRECATED/cggsvd.o DEPRECATED/cggsvp.o \
-@@ -444,19 +444,19 @@ DEPRECSRC = DEPRECATED/cgegs.o DEPRECATE
+ DEPRECSRC = DEPRECATED/cgegs.o DEPRECATED/cgegv.o DEPRECATED/cgelsx.o \
+ DEPRECATED/cgeqpf.o DEPRECATED/cggsvd.o DEPRECATED/cggsvp.o \
+@@ -497,19 +496,19 @@ DEPRECSRC = DEPRECATED/cgegs.o DEPRECATE
ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
$(SCLAUX) $(DZLAUX) $(ALLAUX)
@@ -100,7 +109,7 @@ $NetBSD: patch-aa,v 1.10 2016/10/18 14:08:14 wiz Exp $
single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
-@@ -487,12 +487,12 @@ $(DLASRC): $(FRC)
+@@ -540,12 +539,12 @@ $(DLASRC): $(FRC)
$(ZLASRC): $(FRC)
$(ZCLASRC): $(FRC)
$(DSLASRC): $(FRC)
@@ -115,20 +124,23 @@ $NetBSD: patch-aa,v 1.10 2016/10/18 14:08:14 wiz Exp $
FRC:
@FRC=$(FRC)
-@@ -501,12 +501,11 @@ clean:
+@@ -554,14 +553,14 @@ clean:
rm -f *.o DEPRECATED/*.o
- .f.o:
-- $(FORTRAN) $(OPTS) -c $< -o $@
--
--slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
--dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
--sla_wwaddw.o: sla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
--dla_wwaddw.o: dla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
--cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
--zla_wwaddw.o: zla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+ .f.o:
+- $(FORTRAN) $(OPTS) -c -o $@ $<
+ ${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
+ .F.o:
+- $(FORTRAN) $(OPTS) -c $< -o $@
++ ${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
+
+-slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+-dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+-sla_wwaddw.o: sla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+-dla_wwaddw.o: dla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+-cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+-zla_wwaddw.o: zla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+slaruv.o: slaruv.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
+dlaruv.o: dlaruv.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
+sla_wwaddw.o: sla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
diff --git a/math/lapack/patches/patch-ad b/math/lapack/patches/patch-ad
index 0b9cb5162d2..8ea1e74314d 100644
--- a/math/lapack/patches/patch-ad
+++ b/math/lapack/patches/patch-ad
@@ -1,20 +1,17 @@
-$NetBSD: patch-ad,v 1.4 2014/08/19 13:37:15 joerg Exp $
+$NetBSD: patch-ad,v 1.5 2017/01/25 15:53:06 adam Exp $
---- INSTALL/Makefile.orig 2011-10-01 02:37:03.000000000 +0000
+Use LIBTOOL.
+
+--- INSTALL/Makefile.orig 2016-12-23 23:01:32.000000000 +0000
+++ INSTALL/Makefile
-@@ -28,8 +28,11 @@ testversion: ilaver.o LAPACK_version.o
-
+@@ -29,7 +29,7 @@ testversion: ilaver.o LAPACK_version.o
clean:
rm -f *.o
--.f.o:
-- $(FORTRAN) $(OPTS) -c $< -o $@
-
--slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
--dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
-+.f.o:
+ .f.o:
+- $(FORTRAN) $(OPTS) -c -o $@ $<
+ ${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
-+
-+slamch.o: slamch.f
-+ ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
-+dlamch.o: dlamch.f
-+ ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
+
+-slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+-dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
++slamch.o: slamch.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
++dlamch.o: dlamch.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@