!5 【LTS升级】openblas升级到最新版本
Merge pull request !5 from xinghe/openEuler-20.03-LTS
This commit is contained in:
openeuler-ci-bot
Gitee
commit
a05effd63c
@ -1,19 +0,0 @@
|
||||
diff -up OpenBLAS-0.2.15/driver/others/memory.c.priority OpenBLAS-0.2.15/driver/others/memory.c
|
||||
--- OpenBLAS-0.2.15/driver/others/memory.c.priority 2015-10-27 21:44:50.000000000 +0100
|
||||
+++ OpenBLAS-0.2.15/driver/others/memory.c 2016-01-13 21:12:01.862225898 +0100
|
||||
@@ -146,8 +146,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
#define CONSTRUCTOR __attribute__ ((constructor))
|
||||
#define DESTRUCTOR __attribute__ ((destructor))
|
||||
#else
|
||||
+#if __GNUC__ && INIT_PRIORITY && ((GCC_VERSION >= 40300) || (CLANG_VERSION >= 20900))
|
||||
#define CONSTRUCTOR __attribute__ ((constructor(101)))
|
||||
#define DESTRUCTOR __attribute__ ((destructor(101)))
|
||||
+#elif __GNUC__ && INIT_PRIORITY
|
||||
+#define CONSTRUCTOR __attribute__ ((constructor))
|
||||
+#define DESTRUCTOR __attribute__ ((destructor))
|
||||
+#else
|
||||
+#define CONSTRUCTOR
|
||||
+#define DESTRUCTOR
|
||||
#endif
|
||||
|
||||
#ifdef DYNAMIC_ARCH
|
||||
Binary file not shown.
@ -1,73 +0,0 @@
|
||||
From ee2e758278b5d82b7242f505ea694f082ef65879 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Fri, 13 Mar 2020 20:34:13 +0100
|
||||
Subject: [PATCH] Move declarations of lapack_complex_custom types outside the
|
||||
extern C
|
||||
|
||||
fixes #2510
|
||||
---
|
||||
lapack-netlib/LAPACKE/include/lapack.h | 44 ++++++++++++++------------
|
||||
1 file changed, 23 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/lapack-netlib/LAPACKE/include/lapack.h b/lapack-netlib/LAPACKE/include/lapack.h
|
||||
index 0a6226fe4..36e53ec24 100644
|
||||
--- a/lapack-netlib/LAPACKE/include/lapack.h
|
||||
+++ b/lapack-netlib/LAPACKE/include/lapack.h
|
||||
@@ -12,27 +12,6 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" {
|
||||
-#endif
|
||||
-
|
||||
-/*----------------------------------------------------------------------------*/
|
||||
-#ifndef lapack_int
|
||||
-#define lapack_int int
|
||||
-#endif
|
||||
-
|
||||
-#ifndef lapack_logical
|
||||
-#define lapack_logical lapack_int
|
||||
-#endif
|
||||
-
|
||||
-/* f2c, hence clapack and MacOS Accelerate, returns double instead of float
|
||||
- * for sdot, slange, clange, etc. */
|
||||
-#if defined(LAPACK_F2C)
|
||||
- typedef double lapack_float_return;
|
||||
-#else
|
||||
- typedef float lapack_float_return;
|
||||
-#endif
|
||||
-
|
||||
/* Complex types are structures equivalent to the
|
||||
* Fortran complex types COMPLEX(4) and COMPLEX(8).
|
||||
*
|
||||
@@ -88,6 +67,29 @@ extern "C" {
|
||||
|
||||
#endif /* LAPACK_COMPLEX_CUSTOM */
|
||||
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+/*----------------------------------------------------------------------------*/
|
||||
+#ifndef lapack_int
|
||||
+#define lapack_int int
|
||||
+#endif
|
||||
+
|
||||
+#ifndef lapack_logical
|
||||
+#define lapack_logical lapack_int
|
||||
+#endif
|
||||
+
|
||||
+/* f2c, hence clapack and MacOS Accelerate, returns double instead of float
|
||||
+ * for sdot, slange, clange, etc. */
|
||||
+#if defined(LAPACK_F2C)
|
||||
+ typedef double lapack_float_return;
|
||||
+#else
|
||||
+ typedef float lapack_float_return;
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/* Callback logical functions of one, two, or three arguments are used
|
||||
* to select eigenvalues to sort to the top left of the Schur form.
|
||||
* The value is selected if function returns TRUE (non-zero). */
|
||||
@ -1,7 +1,7 @@
|
||||
%bcond_with system_lapack
|
||||
|
||||
Name: openblas
|
||||
Version: 0.3.9
|
||||
Version: 0.3.10
|
||||
Release: 1
|
||||
Summary: An optimized BLAS library based on GotoBLAS2 1.13 BSD version
|
||||
License: BSD
|
||||
@ -10,8 +10,6 @@ Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}/openblas-
|
||||
Patch0000: openblas-0.2.15-system_lapack.patch
|
||||
Patch0001: openblas-0.2.5-libname.patch
|
||||
Patch0002: openblas-0.3.7-tests.patch
|
||||
Patch0003: openblas-move-declarations-of-lapack_complex_custom-types-.patch
|
||||
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
BuildRequires: gcc gcc-gfortran perl-devel
|
||||
|
||||
@ -59,7 +57,6 @@ cd OpenBLAS-%{version}
|
||||
%endif
|
||||
%patch0001 -p1 -b .libname
|
||||
%patch0002 -p1 -b .tests
|
||||
%patch0003 -p1 -b .cplusplus
|
||||
|
||||
# Set source permissions
|
||||
find -name \*.f -exec chmod 644 {} \;
|
||||
@ -154,6 +151,7 @@ rm -rf netliblapack64
|
||||
%endif
|
||||
|
||||
%build
|
||||
%define _lto_cflags %{nil}
|
||||
%if !%{lapacke}
|
||||
LAPACKE="NO_LAPACKE=1"
|
||||
%endif
|
||||
@ -172,12 +170,12 @@ COMMON="%{optflags} -fPIC"
|
||||
FCOMMON="%{optflags} -fPIC -frecursive"
|
||||
export LDFLAGS="%{__global_ldflags}"
|
||||
|
||||
make -C Rblas $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libRblas" LIBSONAME="libRblas.so" $AVX $LAPACKE INTERFACE64=0
|
||||
make -C Rblas $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libRblas" LIBSONAME="libRblas.so" $AVX $LAPACKE INTERFACE64=0
|
||||
|
||||
# Declare some necessary build flags
|
||||
COMMON="%{optflags} -fPIC"
|
||||
FCOMMON="$COMMON -frecursive"
|
||||
make -C serial $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas" $AVX $LAPACKE INTERFACE64=0
|
||||
make -C serial $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas" $AVX $LAPACKE INTERFACE64=0
|
||||
make -C threaded $TARGET USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblasp" $AVX $LAPACKE INTERFACE64=0
|
||||
|
||||
# USE_THREAD determines use of SMP, not of pthreads
|
||||
@ -187,7 +185,7 @@ make -C openmp $TARGET USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_O
|
||||
|
||||
COMMON="%{optflags} -fPIC"
|
||||
FCOMMON="$COMMON -frecursive -fdefault-integer-8"
|
||||
make -C serial64 $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64" $AVX $LAPACKE INTERFACE64=1
|
||||
make -C serial64 $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64" $AVX $LAPACKE INTERFACE64=1
|
||||
make -C threaded64 $TARGET USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblasp64" $AVX $LAPACKE INTERFACE64=1
|
||||
|
||||
COMMON="%{optflags} -fPIC -fopenmp -pthread"
|
||||
@ -196,7 +194,7 @@ make -C openmp64 $TARGET USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_O
|
||||
|
||||
COMMON="%{optflags} -fPIC"
|
||||
FCOMMON="$COMMON -frecursive -fdefault-integer-8"
|
||||
make -C serial64_ $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64_" $AVX $LAPACKE INTERFACE64=1 SYMBOLSUFFIX=64_
|
||||
make -C serial64_ $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64_" $AVX $LAPACKE INTERFACE64=1 SYMBOLSUFFIX=64_
|
||||
make -C threaded64_ $TARGET USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblasp64_" $AVX $LAPACKE INTERFACE64=1 SYMBOLSUFFIX=64_
|
||||
|
||||
COMMON="%{optflags} -fPIC -fopenmp -pthread"
|
||||
@ -355,6 +353,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
|
||||
%{_libdir}/lib%{name}*64_.so
|
||||
|
||||
%changelog
|
||||
* Tue Aug 18 2020 xinghe <xinghe1@huawei.com> - 0.3.10-1
|
||||
- Upgrade to 0.3.10
|
||||
|
||||
* Fri Apr 17 2020 yuxiangyang<yuxiangyang4@huawei.com> - 0.3.9-1
|
||||
- Upgrade to 0.3.9
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user