[lapack/f19] sync to f19
Tom Callaway
spot at fedoraproject.org
Mon Jul 7 17:03:58 UTC 2014
commit b3151a9a876861a2977aad48e57d19c3530a1361
Author: Tom Callaway <spot at fedoraproject.org>
Date: Mon Jul 7 13:04:08 2014 -0400
sync to f19
lapack-3.4.2-R-blas-fixes.patch | 99 ++++++++++++++++++++++++++++++++++
lapack-3.4.2-lapacke-matgenobj.patch | 12 ++++
lapack-3.4.2-lapacke-tmglib.patch | 36 ++++++++++++
lapack.spec | 21 +++++++-
4 files changed, 167 insertions(+), 1 deletions(-)
---
diff --git a/lapack-3.4.2-R-blas-fixes.patch b/lapack-3.4.2-R-blas-fixes.patch
new file mode 100644
index 0000000..178142d
--- /dev/null
+++ b/lapack-3.4.2-R-blas-fixes.patch
@@ -0,0 +1,99 @@
+diff -up lapack-3.5.0/BLAS/SRC/dgbmv.f.R lapack-3.5.0/BLAS/SRC/dgbmv.f
+--- lapack-3.5.0/BLAS/SRC/dgbmv.f.R 2011-11-03 16:32:56.000000000 -0400
++++ lapack-3.5.0/BLAS/SRC/dgbmv.f 2014-07-07 11:50:48.257175853 -0400
+@@ -312,18 +312,18 @@
+ JX = KX
+ IF (INCY.EQ.1) THEN
+ DO 60 J = 1,N
+- IF (X(JX).NE.ZERO) THEN
++c IF (X(JX).NE.ZERO) THEN
+ TEMP = ALPHA*X(JX)
+ K = KUP1 - J
+ DO 50 I = MAX(1,J-KU),MIN(M,J+KL)
+ Y(I) = Y(I) + TEMP*A(K+I,J)
+ 50 CONTINUE
+- END IF
++c END IF
+ JX = JX + INCX
+ 60 CONTINUE
+ ELSE
+ DO 80 J = 1,N
+- IF (X(JX).NE.ZERO) THEN
++c IF (X(JX).NE.ZERO) THEN
+ TEMP = ALPHA*X(JX)
+ IY = KY
+ K = KUP1 - J
+@@ -331,7 +331,7 @@
+ Y(IY) = Y(IY) + TEMP*A(K+I,J)
+ IY = IY + INCY
+ 70 CONTINUE
+- END IF
++c END IF
+ JX = JX + INCX
+ IF (J.GT.KU) KY = KY + INCY
+ 80 CONTINUE
+diff -up lapack-3.5.0/BLAS/SRC/dgemm.f.R lapack-3.5.0/BLAS/SRC/dgemm.f
+--- lapack-3.5.0/BLAS/SRC/dgemm.f.R 2011-11-03 16:32:56.000000000 -0400
++++ lapack-3.5.0/BLAS/SRC/dgemm.f 2014-07-07 11:50:48.257175853 -0400
+@@ -311,12 +311,12 @@
+ 60 CONTINUE
+ END IF
+ DO 80 L = 1,K
+- IF (B(L,J).NE.ZERO) THEN
++c IF (B(L,J).NE.ZERO) THEN
+ TEMP = ALPHA*B(L,J)
+ DO 70 I = 1,M
+ C(I,J) = C(I,J) + TEMP*A(I,L)
+ 70 CONTINUE
+- END IF
++c END IF
+ 80 CONTINUE
+ 90 CONTINUE
+ ELSE
+@@ -353,12 +353,12 @@
+ 140 CONTINUE
+ END IF
+ DO 160 L = 1,K
+- IF (B(J,L).NE.ZERO) THEN
++c IF (B(J,L).NE.ZERO) THEN
+ TEMP = ALPHA*B(J,L)
+ DO 150 I = 1,M
+ C(I,J) = C(I,J) + TEMP*A(I,L)
+ 150 CONTINUE
+- END IF
++c END IF
+ 160 CONTINUE
+ 170 CONTINUE
+ ELSE
+diff -up lapack-3.5.0/BLAS/SRC/dgemv.f.R lapack-3.5.0/BLAS/SRC/dgemv.f
+--- lapack-3.5.0/BLAS/SRC/dgemv.f.R 2011-11-03 16:32:56.000000000 -0400
++++ lapack-3.5.0/BLAS/SRC/dgemv.f 2014-07-07 11:50:48.257175853 -0400
+@@ -278,24 +278,24 @@
+ JX = KX
+ IF (INCY.EQ.1) THEN
+ DO 60 J = 1,N
+- IF (X(JX).NE.ZERO) THEN
++c IF (X(JX).NE.ZERO) THEN
+ TEMP = ALPHA*X(JX)
+ DO 50 I = 1,M
+ Y(I) = Y(I) + TEMP*A(I,J)
+ 50 CONTINUE
+- END IF
++c END IF
+ JX = JX + INCX
+ 60 CONTINUE
+ ELSE
+ DO 80 J = 1,N
+- IF (X(JX).NE.ZERO) THEN
++c IF (X(JX).NE.ZERO) THEN
+ TEMP = ALPHA*X(JX)
+ IY = KY
+ DO 70 I = 1,M
+ Y(IY) = Y(IY) + TEMP*A(I,J)
+ IY = IY + INCY
+ 70 CONTINUE
+- END IF
++c END IF
+ JX = JX + INCX
+ 80 CONTINUE
+ END IF
diff --git a/lapack-3.4.2-lapacke-matgenobj.patch b/lapack-3.4.2-lapacke-matgenobj.patch
new file mode 100644
index 0000000..b1a5686
--- /dev/null
+++ b/lapack-3.4.2-lapacke-matgenobj.patch
@@ -0,0 +1,12 @@
+diff -up lapack-3.4.2/lapacke/src/Makefile.matgenobj lapack-3.4.2/lapacke/src/Makefile
+--- lapack-3.4.2/lapacke/src/Makefile.matgenobj 2014-06-17 14:10:08.407480346 -0400
++++ lapack-3.4.2/lapacke/src/Makefile 2014-06-17 14:10:08.409480336 -0400
+@@ -2041,7 +2041,7 @@ lapacke_slagsy_work.o \
+ lapacke_zlagsy.o \
+ lapacke_zlagsy_work.o
+
+-ALLOBJ = $(SRC_OBJ)
++ALLOBJ = $(SRC_OBJ) $(MATGEN_OBJ)
+
+ ifdef USEXBLAS
+ ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
diff --git a/lapack-3.4.2-lapacke-tmglib.patch b/lapack-3.4.2-lapacke-tmglib.patch
new file mode 100644
index 0000000..ad286ab
--- /dev/null
+++ b/lapack-3.4.2-lapacke-tmglib.patch
@@ -0,0 +1,36 @@
+diff -up lapack-3.4.2/lapacke/Makefile.tmglib lapack-3.4.2/lapacke/Makefile
+--- lapack-3.4.2/lapacke/Makefile.tmglib 2014-06-18 21:43:49.836389559 -0400
++++ lapack-3.4.2/lapacke/Makefile 2014-06-18 21:43:49.862389390 -0400
+@@ -50,7 +50,7 @@ lapacke:
+ cd utils && $(MAKE)
+
+ shlib: lapacke
+- $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE). at SHORTVER@ -o $(SHLIB_LAPACKE). at LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc
++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE). at SHORTVER@ -o $(SHLIB_LAPACKE). at LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc ../TESTING/MATGEN/*.o
+
+ lapacke_example:
+ cd example && $(MAKE)
+diff -up lapack-3.4.2/lapacke/src/Makefile.tmglib lapack-3.4.2/lapacke/src/Makefile
+--- lapack-3.4.2/lapacke/src/Makefile.tmglib 2014-06-18 21:43:49.839389540 -0400
++++ lapack-3.4.2/lapacke/src/Makefile 2014-06-18 21:43:49.841389527 -0400
+@@ -2053,7 +2053,7 @@ OBJ_FILES := $(C_FILES:.o=.o)
+ all: ../../$(LAPACKELIB)
+
+ ../../$(LAPACKELIB): $(ALLOBJ) $(ALLXOBJ)
+- $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ)
++ $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) ../../TESTING/MATGEN/*.o
+ $(RANLIB) ../../$(LAPACKELIB)
+
+ .c.o:
+diff -up lapack-3.4.2/Makefile.tmglib lapack-3.4.2/Makefile
+--- lapack-3.4.2/Makefile.tmglib 2012-04-13 14:13:07.000000000 -0400
++++ lapack-3.4.2/Makefile 2014-06-18 21:43:49.841389527 -0400
+@@ -23,7 +23,7 @@ blaslib:
+ lapacklib: lapack_install
+ ( cd SRC; $(MAKE) )
+
+-lapackelib: lapacklib
++lapackelib: tmglib lapacklib
+ ( cd lapacke; $(MAKE) )
+
+ lapacke_example: lapackelib
diff --git a/lapack.spec b/lapack.spec
index ef568b9..68d15bf 100644
--- a/lapack.spec
+++ b/lapack.spec
@@ -10,7 +10,7 @@
Summary: Numerical linear algebra package libraries
Name: lapack
Version: %{mediumver}.2
-Release: 2%{?dist}
+Release: 7%{?dist}
License: BSD
Group: Development/Libraries
URL: http://www.netlib.org/lapack/
@@ -28,6 +28,9 @@ Source5: http://www.netlib.org/blas/blasqr.ps
Patch3: lapack-3.4.0-make.inc.patch
Patch4: lapack-3.4.1-lapacke-shared.patch
Patch5: lapack-3.4.1-lapacke-disable-testing-functions.patch
+Patch6: lapack-3.4.2-lapacke-matgenobj.patch
+Patch7: lapack-3.4.2-lapacke-tmglib.patch
+Patch8: lapack-3.4.2-R-blas-fixes.patch
BuildRequires: gcc-gfortran
%description
@@ -154,6 +157,9 @@ BLAS static libraries (64bit INTEGER).
%patch3 -p1 -b .fedora
%patch4 -p1 -b .shared
%patch5 -p1 -b .disable-functions
+%patch6 -p1 -b .matgenobj
+%patch7 -p1 -b .tmglib
+%patch8 -p1 -b .R
mkdir manpages
mv man/ manpages/
@@ -287,6 +293,7 @@ ln -s liblapack64.so.%{version} liblapack64.so
%endif
# Build the lapacke libraries
+make OPTS="$RPM_OPT_FLAGS -fPIC" tmglib
pushd lapacke
make clean
make CFLAGS="$RPM_OPT_FLAGS" lapacke
@@ -450,6 +457,18 @@ ln -sf libblas64.so.%{version} libblas64.so.%{mediumver}
%endif
%changelog
+* Mon Jul 7 2014 Tom Callaway <spot at fedoraproject.org> - 3.4.2-7
+- fix issues with BLAS found by R
+
+* Thu Jun 19 2014 Tom Callaway <spot at fedoraproject.org> - 3.4.2-6
+- compile in tmglib object files, not static lib
+
+* Tue Jun 17 2014 Tom Callaway <spot at fedoraproject.org> - 3.4.2-4
+- add matgen_obj files to lapacke lib
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Mon Mar 25 2013 Tom Callaway <spot at fedoraproject.org> - 3.4.2-2
- clean out non-free example files from source tarball
More information about the scm-commits
mailing list