rpms/openblas
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update patch.

Browse Source
This commit is contained in:
Susi Lehtola 2015-10-28 16:41:47 +01:00
parent ec8c301a07
commit 4534979eb2
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openblas-0.2.11-system_lapack.patch → openblas-0.2.15-system_lapack.patch
View File

@ -1,7 +1,19 @@
diff -up OpenBLAS-0.2.11/Makefile.system_lapack OpenBLAS-0.2.11/Makefile diff -up OpenBLAS-0.2.15/Makefile.system_lapack OpenBLAS-0.2.15/Makefile
--- OpenBLAS-0.2.11/Makefile.system_lapack 2014-08-17 20:16:14.000000000 -0700 --- OpenBLAS-0.2.15/Makefile.system_lapack 2015-10-28 08:36:08.234073535 -0700
+++ OpenBLAS-0.2.11/Makefile 2014-08-23 21:02:54.004245912 -0700 +++ OpenBLAS-0.2.15/Makefile 2015-10-28 08:38:10.847518880 -0700
@@ -209,57 +209,8 @@ hpl_p : @@ -16,11 +16,6 @@ BLASDIRS += reference
endif
SUBDIRS = $(BLASDIRS)
-ifneq ($(NO_LAPACK), 1)
-SUBDIRS += lapack
-endif
-
-LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
@@ -211,57 +206,8 @@ hpl_p :
fi; \ fi; \
done done
@ -27,7 +39,7 @@ diff -up OpenBLAS-0.2.11/Makefile.system_lapack OpenBLAS-0.2.11/Makefile
- -@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc - -@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "NOOPT = $(LAPACK_FFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
@ -60,9 +72,9 @@ diff -up OpenBLAS-0.2.11/Makefile.system_lapack OpenBLAS-0.2.11/Makefile
large.tgz : large.tgz :
ifndef NOFORTRAN ifndef NOFORTRAN
diff -up OpenBLAS-0.2.11/Makefile.system.system_lapack OpenBLAS-0.2.11/Makefile.system diff -up OpenBLAS-0.2.15/Makefile.system.system_lapack OpenBLAS-0.2.15/Makefile.system
--- OpenBLAS-0.2.11/Makefile.system.system_lapack 2014-08-17 20:16:14.000000000 -0700 --- OpenBLAS-0.2.15/Makefile.system.system_lapack 2015-10-27 13:44:50.000000000 -0700
+++ OpenBLAS-0.2.11/Makefile.system 2014-08-23 21:02:37.723976242 -0700 +++ OpenBLAS-0.2.15/Makefile.system 2015-10-28 08:36:08.234073535 -0700
@@ -9,7 +9,7 @@ ifndef TOPDIR @@ -9,7 +9,7 @@ ifndef TOPDIR
TOPDIR = . TOPDIR = .
endif endif

2
openblas.spec
View File

@ -7,7 +7,7 @@ License: BSD
URL: https://github.com/xianyi/OpenBLAS/ URL: https://github.com/xianyi/OpenBLAS/
Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz
# Use system lapack # Use system lapack
Patch0: openblas-0.2.11-system_lapack.patch Patch0: openblas-0.2.15-system_lapack.patch
# Drop extra p from threaded library name # Drop extra p from threaded library name
Patch1: openblas-0.2.5-libname.patch Patch1: openblas-0.2.5-libname.patch
# Don't test link against functions in lapacke 3.5.0 if only 3.4.0 is available # Don't test link against functions in lapacke 3.5.0 if only 3.4.0 is available