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

Update patches.

This commit is contained in:
Susi Lehtola 2014-07-17 00:00:07 +02:00
parent 96eb17ad79
commit a64814f022
4 changed files with 64 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
openblas-0.2.9-lapacke.patch → openblas-0.2.10-lapacke.patch
View File

@ -1,7 +1,7 @@
diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymbol
--- OpenBLAS-0.2.9/exports/gensymbol.lapacke 2014-06-10 16:55:47.000000000 +0300
+++ OpenBLAS-0.2.9/exports/gensymbol 2014-06-18 10:42:45.852966229 +0300
@@ -170,7 +170,7 @@
diff -up OpenBLAS-0.2.10/exports/gensymbol.lapacke OpenBLAS-0.2.10/exports/gensymbol
--- OpenBLAS-0.2.10/exports/gensymbol.lapacke 2014-07-16 12:04:30.000000000 +0200
+++ OpenBLAS-0.2.10/exports/gensymbol 2014-07-16 19:35:48.856855925 +0200
@@ -175,7 +175,7 @@
sggglm, sgghrd, sgglse, sggqrf,
sggrqf, sggsvd, sggsvp, sgtcon, sgtrfs, sgtsv,
sgtsvx, sgttrf, sgttrs, sgtts2, shgeqz,
@ -10,7 +10,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
slaein, slaexc, slag2, slags2, slagtm, slagv2, slahqr,
slahrd, slahr2, slaic1, slaln2, slals0, slalsa, slalsd,
slangb, slange, slangt, slanhs, slansb, slansp,
@@ -251,7 +251,7 @@
@@ -256,7 +256,7 @@
chpevx, chpgst, chpgv, chpgvd, chpgvx, chprfs, chpsv,
chpsvx,
chptrd, chptrf, chptri, chptrs, chsein, chseqr, clabrd,
@ -19,7 +19,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
claed0, claed7, claed8,
claein, claesy, claev2, clags2, clagtm,
clahef, clahqr,
@@ -318,7 +318,7 @@
@@ -323,7 +323,7 @@
dggglm, dgghrd, dgglse, dggqrf,
dggrqf, dggsvd, dggsvp, dgtcon, dgtrfs, dgtsv,
dgtsvx, dgttrf, dgttrs, dgtts2, dhgeqz,
@ -28,7 +28,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
dlaein, dlaexc, dlag2, dlags2, dlagtm, dlagv2, dlahqr,
dlahrd, dlahr2, dlaic1, dlaln2, dlals0, dlalsa, dlalsd,
dlangb, dlange, dlangt, dlanhs, dlansb, dlansp,
@@ -393,7 +393,7 @@
@@ -398,7 +398,7 @@
zhpevx, zhpgst, zhpgv, zhpgvd, zhpgvx, zhprfs, zhpsv,
zhpsvx,
zhptrd, zhptrf, zhptri, zhptrs, zhsein, zhseqr, zlabrd,
@ -37,7 +37,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
zlaed0, zlaed7, zlaed8,
zlaein, zlaesy, zlaev2, zlags2, zlagtm,
zlahef, zlahqr,
@@ -840,10 +840,6 @@
@@ -845,10 +845,6 @@
LAPACKE_chseqr_work,
LAPACKE_clacgv,
LAPACKE_clacgv_work,
@ -48,7 +48,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_clacpy,
LAPACKE_clacpy_work,
LAPACKE_clag2z,
@@ -979,8 +975,6 @@
@@ -984,8 +980,6 @@
LAPACKE_csyrfs,
LAPACKE_csyrfs_work,
LAPACKE_csysv,
@ -57,7 +57,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_csysv_work,
LAPACKE_csysvx,
LAPACKE_csysvx_work,
@@ -1254,8 +1248,6 @@
@@ -1259,8 +1253,6 @@
LAPACKE_dhsein_work,
LAPACKE_dhseqr,
LAPACKE_dhseqr_work,
@ -66,7 +66,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_dlacpy,
LAPACKE_dlacpy_work,
LAPACKE_dlag2s,
@@ -1505,8 +1497,6 @@
@@ -1510,8 +1502,6 @@
LAPACKE_dsyrfs,
LAPACKE_dsyrfs_work,
LAPACKE_dsysv,
@ -75,7 +75,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_dsysv_work,
LAPACKE_dsysvx,
LAPACKE_dsysvx_work,
@@ -1744,8 +1734,6 @@
@@ -1749,8 +1739,6 @@
LAPACKE_shsein_work,
LAPACKE_shseqr,
LAPACKE_shseqr_work,
@ -84,7 +84,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_slacpy,
LAPACKE_slacpy_work,
LAPACKE_slag2d,
@@ -1991,8 +1979,6 @@
@@ -1996,8 +1984,6 @@
LAPACKE_ssyrfs,
LAPACKE_ssyrfs_work,
LAPACKE_ssysv,
@ -93,7 +93,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_ssysv_work,
LAPACKE_ssysvx,
LAPACKE_ssysvx_work,
@@ -2316,10 +2302,6 @@
@@ -2321,10 +2307,6 @@
LAPACKE_zhseqr_work,
LAPACKE_zlacgv,
LAPACKE_zlacgv_work,
@ -104,7 +104,7 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_zlacpy,
LAPACKE_zlacpy_work,
LAPACKE_zlag2c,
@@ -2455,8 +2437,6 @@
@@ -2460,8 +2442,6 @@
LAPACKE_zsyrfs,
LAPACKE_zsyrfs_work,
LAPACKE_zsysv,
@ -113,28 +113,28 @@ diff -up OpenBLAS-0.2.9/exports/gensymbol.lapacke OpenBLAS-0.2.9/exports/gensymb
LAPACKE_zsysv_work,
LAPACKE_zsysvx,
LAPACKE_zsysvx_work,
@@ -2700,20 +2680,20 @@
@@ -2705,20 +2685,20 @@
#These function may need 2 underscores.
@lapack_embeded_underscore_objs=(xerbla_array, chla_transtype, slasyf_rook,
ssytf2_rook, ssytrf_rook, ssytrs_rook,
- ssytri_rook, ssycon_rook, ssysv_rook,
+ ssytri_rook, ssycon_rook,
chetf2_rook, chetrf_rook, chetri_rook,
+ ssytri_rook, ssycon_rook,
chetf2_rook, chetrf_rook, chetri_rook,
chetrs_rook, checon_rook, chesv_rook,
clahef_rook, clasyf_rook,
csytf2_rook, csytrf_rook, csytrs_rook,
- csytri_rook, csycon_rook, csysv_rook,
+ csytri_rook, csycon_rook,
dlasyf_rook,
dsytf2_rook, dsytrf_rook, dsytrs_rook,
- dsytri_rook, dsycon_rook, dsysv_rook,
+ dsytri_rook, dsycon_rook,
zhetf2_rook, zhetrf_rook, zhetri_rook,
clahef_rook, clasyf_rook,
csytf2_rook, csytrf_rook, csytrs_rook,
- csytri_rook, csycon_rook, csysv_rook,
+ csytri_rook, csycon_rook,
dlasyf_rook,
dsytf2_rook, dsytrf_rook, dsytrs_rook,
- dsytri_rook, dsycon_rook, dsysv_rook,
+ dsytri_rook, dsycon_rook,
zhetf2_rook, zhetrf_rook, zhetri_rook,
zhetrs_rook, zhecon_rook, zhesv_rook,
zlahef_rook, zlasyf_rook,
zsytf2_rook, zsytrf_rook, zsytrs_rook,
- zsytri_rook, zsycon_rook, zsysv_rook,
+ zsytri_rook, zsycon_rook,

56
openblas-0.2.9-system_lapack.patch → openblas-0.2.10-system_lapack.patch
View File

@ -1,13 +1,26 @@
diff -up OpenBLAS-0.2.9/Makefile.system_lapack OpenBLAS-0.2.9/Makefile
--- OpenBLAS-0.2.9/Makefile.system_lapack 2014-06-11 16:16:33.024212839 +0300
+++ OpenBLAS-0.2.9/Makefile 2014-06-11 16:19:02.742528480 +0300
@@ -205,51 +205,8 @@ hpl_p :
diff -up OpenBLAS-0.2.10/Makefile.system.system_lapack OpenBLAS-0.2.10/Makefile.system
--- OpenBLAS-0.2.10/Makefile.system.system_lapack 2014-07-16 12:04:30.000000000 +0200
+++ OpenBLAS-0.2.10/Makefile.system 2014-07-16 19:24:55.233859424 +0200
@@ -9,7 +9,7 @@ ifndef TOPDIR
TOPDIR = .
endif
-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-netlib
+NETLIB_LAPACK_DIR = $(TOPDIR)/netliblapack
# Default C compiler
# - Only set if not specified on the command line or inherited from the environment.
diff -up OpenBLAS-0.2.10/Makefile.system_lapack OpenBLAS-0.2.10/Makefile
--- OpenBLAS-0.2.10/Makefile.system_lapack 2014-07-16 19:24:55.231859424 +0200
+++ OpenBLAS-0.2.10/Makefile 2014-07-16 19:29:58.370855854 +0200
@@ -209,64 +209,9 @@ hpl_p :
fi; \
done
-ifeq ($(NO_LAPACK), 1)
-netlib :
-
netlib :
+ @$(MAKE) -C $(NETLIB_LAPACK_DIR)
-else
-netlib : lapack_prebuild
-ifndef NOFORTRAN
@ -43,27 +56,26 @@ diff -up OpenBLAS-0.2.9/Makefile.system_lapack OpenBLAS-0.2.9/Makefile
- -@echo "SUFFIX = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "PSUFFIX = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "CEXTRALIB = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifeq ($(F_COMPILER), GFORTRAN)
-ifeq ($(FC), GFORTRAN)
- -@echo "TIMER = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifdef SMP
- -@echo "LOADER = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
-else
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-else
- -@echo "TIMER = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
- -@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
+netlib :
+ @$(MAKE) -C $(NETLIB_LAPACK_DIR)
-
-large.tgz :
-ifndef NOFORTRAN
- if [ ! -a $< ]; then
- -wget http://www.netlib.org/lapack/timing/large.tgz;
- fi
-endif
large.tgz :
timing.tgz :
ifndef NOFORTRAN
diff -up OpenBLAS-0.2.9/Makefile.system.system_lapack OpenBLAS-0.2.9/Makefile.system
--- OpenBLAS-0.2.9/Makefile.system.system_lapack 2014-06-10 16:55:47.000000000 +0300
+++ OpenBLAS-0.2.9/Makefile.system 2014-06-11 16:16:33.024212839 +0300
@@ -9,7 +9,7 @@ ifndef TOPDIR
TOPDIR = .
endif
-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-netlib
+NETLIB_LAPACK_DIR = $(TOPDIR)/netliblapack
# Default C compiler
# - Only set if not specified on the command line or inherited from the environment.

125
openblas-0.2.9-i386.patch
View File

@ -1,125 +0,0 @@
From 438002204d79a0393999ae4fe8bc9b5125c45d97 Mon Sep 17 00:00:00 2001
From: wernsaar <wernsaar@googlemail.com>
Date: Sat, 21 Jun 2014 12:29:23 +0200
Subject: [PATCH] Ref #393: fix for INTERFACE64=0 and ARCH_X86 in divtable
---
Makefile | 2 +-
Makefile.system | 18 +++++++++---------
driver/others/divtable.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 2f5d032..ab8602f 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ ifndef BINARY64
else
@echo " BINARY ... 64bit "
endif
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
@echo " Use 64 bits int (equivalent to \"-i8\" in Fortran) "
endif
@echo " C compiler ... $(C_COMPILER) (command line : $(CC))"
diff --git a/Makefile.system b/Makefile.system
index ade4f93..5d5f0f9 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -52,7 +52,7 @@ ifdef TARGET_CORE
GETARCH_FLAGS := -DFORCE_$(TARGET_CORE)
endif
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
GETARCH_FLAGS += -DUSE64BITINT
endif
@@ -502,7 +502,7 @@ endif
else
ifdef BINARY64
FCOMMON_OPT += -m64
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -fdefault-integer-8
endif
else
@@ -516,7 +516,7 @@ endif
ifeq ($(F_COMPILER), INTEL)
CCOMMON_OPT += -DF_INTERFACE_INTEL
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8
endif
ifdef USE_OPENMP
@@ -536,7 +536,7 @@ CCOMMON_OPT += -DF_INTERFACE_IBM
# FCOMMON_OPT += -qarch=440
ifdef BINARY64
FCOMMON_OPT += -q64
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -qintsize=8
endif
else
@@ -551,7 +551,7 @@ ifeq ($(F_COMPILER), PGI)
CCOMMON_OPT += -DF_INTERFACE_PGI
COMMON_PROF += -DPGICOMPILER
ifdef BINARY64
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8
endif
FCOMMON_OPT += -tp p7-64
@@ -566,7 +566,7 @@ endif
ifeq ($(F_COMPILER), PATHSCALE)
CCOMMON_OPT += -DF_INTERFACE_PATHSCALE
ifdef BINARY64
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8
endif
endif
@@ -593,7 +593,7 @@ endif
ifeq ($(F_COMPILER), OPEN64)
CCOMMON_OPT += -DF_INTERFACE_OPEN64
ifdef BINARY64
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8
endif
endif
@@ -681,7 +681,7 @@ endif
endif
ifdef BINARY64
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
CCOMMON_OPT +=
#-DUSE64BITINT
endif
@@ -871,7 +871,7 @@ endif
LAPACK_CFLAGS = $(CFLAGS)
LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H
-ifdef INTERFACE64
+ifneq ($(INTERFACE64), 0)
LAPACK_CFLAGS += -DLAPACK_ILP64
endif
ifdef OS_WINDOWS
diff --git a/driver/others/divtable.c b/driver/others/divtable.c
index 7a191db..d50b091 100644
--- a/driver/others/divtable.c
+++ b/driver/others/divtable.c
@@ -39,7 +39,7 @@
#include "common.h"
#ifdef SMP
-#ifndef USE64BITINT
+#if !defined(USE64BITINT) || defined(ARCH_X86)
unsigned int blas_quick_divide_table[] = {
0x00000000, 0x00000001, 0x80000001, 0x55555556,
0x40000001, 0x33333334, 0x2aaaaaab, 0x24924925,
--
1.9.3

7
openblas.spec
View File

@ -7,13 +7,11 @@ License: BSD
URL: https://github.com/xianyi/OpenBLAS/
Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz
# Use system lapack
Patch0: openblas-0.2.9-system_lapack.patch
Patch0: openblas-0.2.10-system_lapack.patch
# Drop extra p from threaded library name
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
Patch2: openblas-0.2.9-lapacke.patch
# Fix build on i386: https://github.com/wernsaar/OpenBLAS/commit/438002204d79a0393999ae4fe8bc9b5125c45d97.patch
Patch3: openblas-0.2.9-i386.patch
Patch2: openblas-0.2.10-lapacke.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gcc-gfortran
@ -156,7 +154,6 @@ cd OpenBLAS-%{version}
%if 0%{?fedora} > 0 && 0%{?fedora} < 21
%patch2 -p1 -b .lapacke
%endif
%patch3 -p1 -b .i386
# Get rid of bundled LAPACK sources
rm -rf lapack-netlib