Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
|
@ -0,0 +1,49 @@
|
|||
From 9a3e640a517926c47b5655ba0033d4f56df4a66e Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Martisko <jamartis@redhat.com>
|
||||
Date: Wed, 22 Jan 2020 14:24:46 +0100
|
||||
Subject: [PATCH] test
|
||||
|
||||
---
|
||||
interfaces/blas/C/testing/c_dblat1.f | 4 ++--
|
||||
interfaces/blas/C/testing/c_sblat1.f | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/interfaces/blas/C/testing/c_dblat1.f b/interfaces/blas/C/testing/c_dblat1.f
|
||||
index 55ea989..7269601 100644
|
||||
--- a/interfaces/blas/C/testing/c_dblat1.f
|
||||
+++ b/interfaces/blas/C/testing/c_dblat1.f
|
||||
@@ -247,11 +247,11 @@
|
||||
IF (ICASE.EQ.7) THEN
|
||||
* .. DNRM2TEST ..
|
||||
STEMP(1) = DTRUE1(NP1)
|
||||
- CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP,STEMP,SFAC)
|
||||
+ CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
|
||||
ELSE IF (ICASE.EQ.8) THEN
|
||||
* .. DASUMTEST ..
|
||||
STEMP(1) = DTRUE3(NP1)
|
||||
- CALL STEST1(DASUMTEST(N,SX,INCX),STEMP,STEMP,SFAC)
|
||||
+ CALL STEST1(DASUMTEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
|
||||
ELSE IF (ICASE.EQ.9) THEN
|
||||
* .. DSCALTEST ..
|
||||
CALL DSCALTEST(N,SA((INCX-1)*5+NP1),SX,INCX)
|
||||
diff --git a/interfaces/blas/C/testing/c_sblat1.f b/interfaces/blas/C/testing/c_sblat1.f
|
||||
index 1fc6dce..b97ed0b 100644
|
||||
--- a/interfaces/blas/C/testing/c_sblat1.f
|
||||
+++ b/interfaces/blas/C/testing/c_sblat1.f
|
||||
@@ -247,11 +247,11 @@
|
||||
IF (ICASE.EQ.7) THEN
|
||||
* .. SNRM2TEST ..
|
||||
STEMP(1) = DTRUE1(NP1)
|
||||
- CALL STEST1(SNRM2TEST(N,SX,INCX),STEMP,STEMP,SFAC)
|
||||
+ CALL STEST1(SNRM2TEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
|
||||
ELSE IF (ICASE.EQ.8) THEN
|
||||
* .. SASUMTEST ..
|
||||
STEMP(1) = DTRUE3(NP1)
|
||||
- CALL STEST1(SASUMTEST(N,SX,INCX),STEMP,STEMP,SFAC)
|
||||
+ CALL STEST1(SASUMTEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
|
||||
ELSE IF (ICASE.EQ.9) THEN
|
||||
* .. SSCALTEST ..
|
||||
CALL SSCALTEST(N,SA((INCX-1)*5+NP1),SX,INCX)
|
||||
--
|
||||
2.24.1
|
||||
|
481
SPECS/atlas.spec
481
SPECS/atlas.spec
|
@ -5,65 +5,59 @@ Version: 3.10.3
|
|||
%if "%{?enable_native_atlas}" != "0"
|
||||
%define dist .native
|
||||
%endif
|
||||
Release: 8%{?dist}
|
||||
Release: 17%{?dist}
|
||||
Summary: Automatically Tuned Linear Algebra Software
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: BSD
|
||||
URL: http://math-atlas.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/math-atlas/%{name}%{version}.tar.bz2
|
||||
Source1: PPRO32.tgz
|
||||
#Source2: K7323DNow.tgz
|
||||
Source3: README.dist
|
||||
#Source4: USII64.tgz
|
||||
#Source5: USII32.tgz
|
||||
#Source6: IBMz1032.tgz
|
||||
#Source7: IBMz1064.tgz
|
||||
#Source8: IBMz19632.tgz
|
||||
#Source9: IBMz19664.tgz
|
||||
Source2: README.dist
|
||||
#archdefs taken from debian:
|
||||
Source11: POWER332.tar.bz2
|
||||
Source12: IBMz932.tar.bz2
|
||||
Source13: IBMz964.tar.bz2
|
||||
Source3: POWER332.tar.bz2
|
||||
Source4: IBMz932.tar.bz2
|
||||
Source5: IBMz964.tar.bz2
|
||||
#upstream arm uses softfp abi, fedora arm uses hard
|
||||
Source14: ARMv732NEON.tar.bz2
|
||||
Source6: ARMv732NEON.tar.bz2
|
||||
#again, taken from debian
|
||||
Source15: IBMz1264.tar.bz2
|
||||
Source16: ARMa732.tar.bz2
|
||||
Source7: IBMz1264.tar.bz2
|
||||
Source8: ARMa732.tar.bz2
|
||||
|
||||
#provided by IBM (3.10.3-8)
|
||||
Source17: IBMz1364VXZ.tar.bz2
|
||||
Source18: IBMz1464VXZ2.tar.bz2
|
||||
Source19: IBMz1564VXZ2.tar.bz2
|
||||
#Provided By IBM
|
||||
Source9: IBMz1364VXZ.tar.bz2
|
||||
Source10: IBMz1464VXZ2.tar.bz2
|
||||
Source11: IBMz1564VXZ2.tar.bz2
|
||||
|
||||
# Properly pass -melf_* to the linker with -Wl, fixes FTBFS bug 817552
|
||||
# https://sourceforge.net/tracker/?func=detail&atid=379484&aid=3555789&group_id=23725
|
||||
Patch3: atlas-melf.patch
|
||||
Patch4: atlas-throttling.patch
|
||||
Patch1: atlas-melf.patch
|
||||
Patch2: atlas-throttling.patch
|
||||
|
||||
#credits Lukas Slebodnik
|
||||
Patch5: atlas-shared_libraries.patch
|
||||
Patch3: atlas-shared_libraries.patch
|
||||
|
||||
Patch8: atlas-genparse.patch
|
||||
Patch4: atlas-genparse.patch
|
||||
|
||||
# Unbundle LAPACK (BZ #1181369)
|
||||
Patch9: atlas.3.10.1-unbundle.patch
|
||||
|
||||
# Atlas getri patch (covscan)
|
||||
Patch10: atlas-getri.patch
|
||||
|
||||
# Atlas patches dealing with z{13,14,15} support and crosscompilation provided by IBM
|
||||
Patch11: 0001-Avoid-c99-standard-compiler.patch
|
||||
Patch12: 0002-Fix-rpath-link-command-line-options.patch
|
||||
Patch13: 0003-Fix-SIMD-support-on-IBM-z13.patch
|
||||
Patch14: 0004-Read-L1-data-cache-size-from-sysconf-if-possible.patch
|
||||
Patch15: 0005-Optimizations-for-IBM-z13.patch
|
||||
Patch16: 0006-Add-IBM-z14-support.patch
|
||||
Patch17: 0007-Enable-cross-compile.patch
|
||||
Patch18: 0008-Add-IBM-z15-support.patch
|
||||
Patch5: atlas.3.10.1-unbundle.patch
|
||||
Patch6: atlas-gcc10.patch
|
||||
|
||||
|
||||
BuildRequires: gcc-gfortran, lapack-static, gcc, lapack-devel
|
||||
#patches dealing with z{13,14,15}, provided by IBM
|
||||
Patch7: 0001-Avoid-c99-standard-compiler.patch
|
||||
Patch8: 0002-Fix-rpath-link-command-line-options.patch
|
||||
Patch9: 0003-Fix-SIMD-support-on-IBM-z13.patch
|
||||
Patch10: 0004-Read-L1-data-cache-size-from-sysconf-if-possible.patch
|
||||
Patch11: 0005-Optimizations-for-IBM-z13.patch
|
||||
Patch12: 0006-Add-IBM-z14-support.patch
|
||||
Patch13: 0007-Enable-cross-compile.patch
|
||||
Patch14: 0008-Add-IBM-z15-support.patch
|
||||
|
||||
#Covscan
|
||||
Patch101: atlas-getri.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-gfortran, lapack-static, gcc
|
||||
|
||||
%ifarch x86_64
|
||||
Obsoletes: atlas-sse3 < 3.10.3-1
|
||||
|
@ -77,8 +71,8 @@ Obsoletes: atlas-sse3 < 3.10.3-1
|
|||
%endif
|
||||
|
||||
%ifarch s390 s390x
|
||||
Obsoletes: atlas-z10 < 3.10.3-8
|
||||
Obsoletes: atlas-z196 < 3.10.3-8
|
||||
Obsoletes: atlas-z10 < 3.10.3-11
|
||||
Obsoletes: atlas-z196 < 3.10.3-11
|
||||
%endif
|
||||
|
||||
|
||||
|
@ -100,11 +94,10 @@ see the documentation for information.
|
|||
|
||||
%package devel
|
||||
Summary: Development libraries for ATLAS
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Obsoletes: %name-header <= %version-%release
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires(postun): /usr/sbin/alternatives
|
||||
|
||||
%ifarch x86_64
|
||||
Obsoletes: atlas-sse3-devel < 3.10.3-1
|
||||
|
@ -117,10 +110,9 @@ Obsoletes: atlas-sse2-devel < 3.10.3-1
|
|||
Obsoletes: atlas-sse3-devel < 3.10.3-1
|
||||
%endif
|
||||
|
||||
|
||||
%ifarch s390 s390x
|
||||
Obsoletes: atlas-z10-devel < 3.10.3-8
|
||||
Obsoletes: atlas-z196-devel < 3.10.3-8
|
||||
Obsoletes: atlas-z10-devel < 3.10.3-11
|
||||
Obsoletes: atlas-z196-devel < 3.10.3-11
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
|
@ -129,10 +121,9 @@ This package contains headers for development with ATLAS
|
|||
|
||||
%package static
|
||||
Summary: Static libraries for ATLAS
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires(postun): /usr/sbin/alternatives
|
||||
|
||||
%ifarch x86_64
|
||||
Obsoletes: atlas-sse3-static < 3.10.3-1
|
||||
|
@ -146,9 +137,10 @@ Obsoletes: atlas-sse3-static < 3.10.3-1
|
|||
%endif
|
||||
|
||||
%ifarch s390 s390x
|
||||
Obsoletes: atlas-z10-static < 3.10.3-8
|
||||
Obsoletes: atlas-z196-static < 3.10.3-8
|
||||
Obsoletes: atlas-z10-static < 3.10.3-11
|
||||
Obsoletes: atlas-z196-static < 3.10.3-11
|
||||
%endif
|
||||
|
||||
%description static
|
||||
This package contains static version of ATLAS (Automatically Tuned
|
||||
Linear Algebra Software).
|
||||
|
@ -160,11 +152,10 @@ Linear Algebra Software).
|
|||
############## Subpackages for architecture extensions #################
|
||||
#
|
||||
%ifarch x86_64
|
||||
%define types base corei2
|
||||
%define types base corei2
|
||||
|
||||
%package corei2-static
|
||||
Summary: ATLAS libraries for Corei2 (Ivy/Sandy bridge) CPUs
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description corei2-static
|
||||
This package contains the ATLAS (Automatically Tuned Linear Algebra
|
||||
|
@ -173,7 +164,6 @@ CPUs. The base ATLAS builds for the x86_64 architecture are made for the hammer6
|
|||
|
||||
%package corei2
|
||||
Summary: ATLAS libraries for Corei2 (Ivy/Sandy bridge) CPUs
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description corei2
|
||||
This package contains the ATLAS (Automatically Tuned Linear Algebra
|
||||
|
@ -182,11 +172,10 @@ CPUs. The base ATLAS builds for the x86_64 architecture are made for the hammer6
|
|||
|
||||
%package corei2-devel
|
||||
Summary: Development libraries for ATLAS for Corei2 (Ivy/Sandy bridge) CPUs
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-corei2 = %{version}-%{release}
|
||||
Obsoletes: %name-header <= %version-%release
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires(postun): /usr/sbin/alternatives
|
||||
|
||||
%description corei2-devel
|
||||
This package contains shared and static versions of the ATLAS
|
||||
|
@ -200,9 +189,7 @@ optimizations for the corei2 (Ivy/Sandy bridge) CPUs.
|
|||
%endif
|
||||
|
||||
%ifarch s390 s390x
|
||||
%define types base z14
|
||||
|
||||
#z14
|
||||
%define types base z14 z15
|
||||
|
||||
%package z14
|
||||
Summary: ATLAS libraries for z14
|
||||
|
@ -237,7 +224,39 @@ This package contains the ATLAS (Automatically Tuned Linear Algebra
|
|||
Software) static libraries compiled with optimizations for the z14
|
||||
CPUs.
|
||||
|
||||
#z15
|
||||
|
||||
%package z15
|
||||
Summary: ATLAS libraries for z15
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description z15
|
||||
This package contains ATLAS (Automatically Tuned Linear Algebra Software)
|
||||
shared libraries compiled with optimizations for the z15 CPUs.
|
||||
|
||||
%package z15-devel
|
||||
Summary: Development libraries for ATLAS for z15
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-z15 = %{version}-%{release}
|
||||
Obsoletes: %name-header <= %version-%release
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
|
||||
%description z15-devel
|
||||
This package contains shared and static versions of the ATLAS
|
||||
(Automatically Tuned Linear Algebra Software) libraries compiled with
|
||||
optimizations for the z15 CPUs.
|
||||
|
||||
%package z15-static
|
||||
Summary: Static libraries for ATLAS for z15
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-z15-devel = %{version}-%{release}
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
|
||||
%description z15-static
|
||||
This package contains the ATLAS (Automatically Tuned Linear Algebra
|
||||
Software) static libraries compiled with optimizations for the z15
|
||||
CPUs.
|
||||
%endif
|
||||
|
||||
|
||||
|
@ -246,7 +265,6 @@ CPUs.
|
|||
|
||||
%package power8
|
||||
Summary: ATLAS libraries for Power 8
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description power8
|
||||
This package contains ATLAS (Automatically Tuned Linear Algebra Software)
|
||||
|
@ -255,11 +273,10 @@ The base ATLAS builds for the ppc64 architecture are made for Power 5 CPUs.
|
|||
|
||||
%package power8-devel
|
||||
Summary: Development libraries for ATLAS for Power 8
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-power8 = %{version}-%{release}
|
||||
Obsoletes: %name-header <= %version-%release
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires(postun): /usr/sbin/alternatives
|
||||
|
||||
%description power8-devel
|
||||
This package contains shared and static versions of the ATLAS
|
||||
|
@ -268,10 +285,9 @@ optimizations for the Power 8 CPUs.
|
|||
|
||||
%package power8-static
|
||||
Summary: Static libraries for ATLAS for Power 8
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-power8-devel = %{version}-%{release}
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires(postun): /usr/sbin/alternatives
|
||||
|
||||
%description power8-static
|
||||
This package contains the ATLAS (Automatically Tuned Linear Algebra
|
||||
|
@ -280,7 +296,6 @@ CPUs. The base ATLAS builds for the ppc64 architecture are made for the Power 5
|
|||
|
||||
%package power7
|
||||
Summary: ATLAS libraries for Power 7
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description power7
|
||||
This package contains ATLAS (Automatically Tuned Linear Algebra Software)
|
||||
|
@ -289,11 +304,10 @@ The base ATLAS builds for the ppc64 architecture are made for Power 5 CPUs.
|
|||
|
||||
%package power7-devel
|
||||
Summary: Development libraries for ATLAS for Power 7
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-power7 = %{version}-%{release}
|
||||
Obsoletes: %name-header <= %version-%release
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires(postun): /usr/sbin/alternatives
|
||||
|
||||
%description power7-devel
|
||||
This package contains shared and static versions of the ATLAS
|
||||
|
@ -302,10 +316,9 @@ optimizations for the Power 7 CPUs.
|
|||
|
||||
%package power7-static
|
||||
Summary: Static libraries for ATLAS for Power 7
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-power7-devel = %{version}-%{release}
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(postun): chkconfig
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires(postun): /usr/sbin/alternatives
|
||||
|
||||
%description power7-static
|
||||
This package contains the ATLAS (Automatically Tuned Linear Algebra
|
||||
|
@ -317,70 +330,53 @@ CPUs. The base ATLAS builds for the ppc64 architecture are made for the Power 5
|
|||
%endif
|
||||
|
||||
%prep
|
||||
#cat /proc/cpuinfo
|
||||
%setup -q -n ATLAS
|
||||
#patch0 -p0 -b .shared
|
||||
#arm patch not applicable, probably not needed
|
||||
#%ifarch %{arm}
|
||||
#%patch2 -p0 -b .arm
|
||||
#%endif
|
||||
%patch3 -p1 -b .melf
|
||||
%patch4 -p1 -b .thrott
|
||||
%patch5 -p2 -b .sharedlib
|
||||
%ifarch aarch64
|
||||
#%patch7 -p1 -b .aarch64
|
||||
%endif
|
||||
%patch8 -p1 -b .genparse
|
||||
%patch9 -p1 -b .unbundle
|
||||
%patch10 -p1 -b .getri
|
||||
|
||||
#IBM patches
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p2
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch10 -p1
|
||||
|
||||
%ifarch s390x s390
|
||||
%patch9 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
#As of rhel 8.3, z15 is not supported by the gcc
|
||||
#%patch18 -p1
|
||||
%endif
|
||||
|
||||
%patch101 -p1
|
||||
|
||||
cp %{SOURCE1} CONFIG/ARCHS/
|
||||
#cp %{SOURCE2} CONFIG/ARCHS/
|
||||
cp %{SOURCE3} doc
|
||||
cp %{SOURCE2} doc
|
||||
cp %{SOURCE3} CONFIG/ARCHS/
|
||||
cp %{SOURCE4} CONFIG/ARCHS/
|
||||
cp %{SOURCE5} CONFIG/ARCHS/
|
||||
cp %{SOURCE6} CONFIG/ARCHS/
|
||||
cp %{SOURCE7} CONFIG/ARCHS/
|
||||
cp %{SOURCE8} CONFIG/ARCHS/
|
||||
cp %{SOURCE9} CONFIG/ARCHS/
|
||||
cp %{SOURCE10} CONFIG/ARCHS/
|
||||
cp %{SOURCE11} CONFIG/ARCHS/
|
||||
cp %{SOURCE12} CONFIG/ARCHS/
|
||||
cp %{SOURCE13} CONFIG/ARCHS/
|
||||
cp %{SOURCE14} CONFIG/ARCHS/
|
||||
cp %{SOURCE15} CONFIG/ARCHS/
|
||||
cp %{SOURCE16} CONFIG/ARCHS/
|
||||
#z13
|
||||
cp %{SOURCE17} CONFIG/ARCHS/
|
||||
#z14
|
||||
cp %{SOURCE18} CONFIG/ARCHS/
|
||||
#z15
|
||||
cp %{SOURCE19} CONFIG/ARCHS/
|
||||
|
||||
#cp %{SOURCE8} CONFIG/ARCHS/
|
||||
#cp %{SOURCE9} CONFIG/ARCHS/
|
||||
|
||||
%ifarch %{arm}
|
||||
# Set arm flags in atlcomp.txt
|
||||
#sed -i -e 's,-mfpu=vfpv3,-mfpu=neon,' CONFIG/src/atlcomp.txt
|
||||
sed -i -e 's,-mfloat-abi=softfp,-mfloat-abi=hard,' CONFIG/src/atlcomp.txt
|
||||
# Some extra arm flags not needed
|
||||
#sed -i -e 's,-mfpu=vfpv3,,' tune/blas/gemm/CASES/*.flg
|
||||
%endif
|
||||
# Debug
|
||||
#sed -i -e 's,> \(.*\)/ptsanity.out,> \1/ptsanity.out || cat \1/ptsanity.out \&\& exit 1,' makes/Make.*
|
||||
|
||||
# Generate lapack library
|
||||
mkdir lapacklib
|
||||
cd lapacklib
|
||||
ar x %{_libdir}/liblapack_pic.a
|
||||
# Remove functions that have ATLAS implementations
|
||||
rm -f cgelqf.o cgels.o cgeqlf.o cgeqrf.o cgerqf.o cgesv.o cgetrf.o cgetri.o cgetrs.o clarfb.o clarft.o clauum.o cposv.o cpotrf.o cpotri.o cpotrs.o ctrtri.o dgelqf.o dgels.o dgeqlf.o dgeqrf.o dgerqf.o dgesv.o dgetrf.o dgetri.o dgetrs.o dlamch.o dlarfb.o dlarft.o dlauum.o dposv.o dpotrf.o dpotri.o dpotrs.o dtrtri.o ieeeck.o ilaenv.o lsame.o sgelqf.o sgels.o sgeqlf.o sgeqrf.o sgerqf.o sgesv.o sgetrf.o sgetri.o sgetrs.o slamch.o slarfb.o slarft.o slauum.o sposv.o spotrf.o spotri.o spotrs.o strtri.o xerbla.o zgelqf.o zgels.o zgeqlf.o zgeqrf.o zgerqf.o zgesv.o zgetrf.o zgetri.o zgetrs.o zlarfb.o zlarft.o zlauum.o zposv.o zpotrf.o zpotri.o zpotrs.o ztrtri.o
|
||||
rm -f cgelqf.o cgels.o cgeqlf.o cgeqrf.o cgerqf.o cgesv.o cgetrf.o cgetri.o cgetrs.o clarfb.o clarft.o clauum.o cposv.o cpotrf.o cpotri.o cpotrs.o ctrtri.o dgelqf.o dgels.o dgeqlf.o dgeqrf.o dgerqf.o dgesv.o dgetrf.o dgetri.o dgetrs.o dlamch.o dlarfb.o dlarft.o dlauum.o dposv.o dpotrf.o dpotri.o dpotrs.o dtrtri.o ieeeck.o ilaenv.o lsame.o sgelqf.o sgels.o sgeqlf.o sgeqrf.o sgerqf.o sgesv.o sgetrf.o sgetri.o sgetrs.o slamch.o slarfb.o slarft.o slauum.o sposv.o spotrf.o spotri.o spotrs.o strtri.o xerbla.o zgelqf.o zgels.o zgeqlf.o zgeqrf.o zgerqf.o zgesv.o zgetrf.o zgetri.o zgetrs.o zlarfb.o zlarft.o zlauum.o zposv.o zpotrf.o zpotri.o zpotrs.o ztrtri.o
|
||||
# Create new library
|
||||
ar rcs ../liblapack_pic_pruned.a *.o
|
||||
cd ..
|
||||
|
@ -402,16 +398,17 @@ p=$(pwd)
|
|||
#Target architectures for the 'base' versions
|
||||
%ifarch s390x
|
||||
%define flags %{nil}
|
||||
%define base_options "-A IBMz13 -V 8 -Si archdef 2"
|
||||
%define base_options "-A IBMz12 -V 1"
|
||||
#%define base_options "-A IBMz13 -V 8 -Si archdef 2"
|
||||
%endif
|
||||
|
||||
%ifarch x86_64
|
||||
%define flags "-fcf-protection=full"
|
||||
%define flags %{nil}
|
||||
%define base_options "-A HAMMER -V 896"
|
||||
%endif
|
||||
|
||||
%ifarch %ix86
|
||||
%define flags "-fcf-protection=full"
|
||||
%define flags %{nil}
|
||||
%define base_options "-A PIII -V 512"
|
||||
%endif
|
||||
|
||||
|
@ -447,7 +444,6 @@ p=$(pwd)
|
|||
%endif
|
||||
|
||||
for type in %{types}; do
|
||||
|
||||
if [ "$type" = "base" ]; then
|
||||
libname=atlas
|
||||
arg_options=%{base_options}
|
||||
|
@ -463,14 +459,13 @@ for type in %{types}; do
|
|||
arg_options="-A Corei1 -V 896"
|
||||
%define pr_corei1 %(echo $((%{__isa_bits}+2)))
|
||||
elif [ "$type" = "z14" ]; then
|
||||
thread_options="-t 4"
|
||||
arg_options="-A IBMz14 -V 4 -Si archdef 2"
|
||||
%define pr_z14 %(echo $((%{__isa_bits}+2)))
|
||||
#gcc in rhel 8.3 does not support z15, z15 subpackage is thus not being build/shipped
|
||||
thread_options="-t 4"
|
||||
arg_options="-A IBMz14 -V 4 -Si archdef 2"
|
||||
%define pr_z14 %(echo $((%{__isa_bits}+2)))
|
||||
elif [ "$type" = "z15" ]; then
|
||||
thread_options="-t 0"
|
||||
arg_options="-A IBMz15 -V 4 -Si archdef 2"
|
||||
%define pr_z15 %(echo $((%{__isa_bits}+4)))
|
||||
thread_options="-t 4"
|
||||
arg_options="-A IBMz15 -V 4 -Si archdef 2"
|
||||
%define pr_z15 %(echo $((%{__isa_bits}+4)))
|
||||
elif [ "$type" = "power7" ]; then
|
||||
thread_options="-t 4"
|
||||
arg_options="-A POWER7 -V 1"
|
||||
|
@ -481,7 +476,6 @@ for type in %{types}; do
|
|||
%define pr_power8 %(echo $((%{__isa_bits}+4)))
|
||||
fi
|
||||
fi
|
||||
|
||||
mkdir -p %{_arch}_${type}
|
||||
pushd %{_arch}_${type}
|
||||
../configure %{mode} $thread_options $arg_options -D c -DWALL -F xc ' ' -Fa alg '%{flags} -D_FORTIFY_SOURCE=2 -g -Wa,--noexecstack,--generate-missing-build-notes=yes -fstack-protector-strong -fstack-clash-protection -fPIC -fplugin=annobin -Wl,-z,now'\
|
||||
|
@ -552,18 +546,17 @@ mkdir -p %{buildroot}%{_includedir}/atlas
|
|||
|
||||
|
||||
%check
|
||||
# Run the check only for the z13. z14/z15 may fail due to illegal instrucitons...
|
||||
for type in %{types}; do
|
||||
if [ "$type" = "z14" ] || [ "$type" = "z15" ]; then
|
||||
# skip the tests (may fail due to illegal instructions).
|
||||
echo "Skipping tests for the $type subpackage"
|
||||
# skip the tests (may fail due to illegal instructions).
|
||||
echo "Skipping tests for the $type subpackage"
|
||||
else
|
||||
pushd %{_arch}_${type}
|
||||
make check ptcheck
|
||||
popd
|
||||
fi
|
||||
|
||||
pushd %{_arch}_${type}
|
||||
make check ptcheck
|
||||
popd
|
||||
fi
|
||||
done
|
||||
#%endif
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
|
@ -581,103 +574,102 @@ fi
|
|||
%if "%{?enable_native_atlas}" == "0"
|
||||
%ifarch x86_64
|
||||
|
||||
%post -n atlas-corei2 -p /sbin/ldconfig
|
||||
%post -n atlas-corei2 -p /sbin/ldconfig
|
||||
|
||||
%postun -n atlas-corei2 -p /sbin/ldconfig
|
||||
%postun -n atlas-corei2 -p /sbin/ldconfig
|
||||
|
||||
%posttrans corei2-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-corei2 %{pr_corei2}
|
||||
%posttrans corei2-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-corei2 %{pr_corei2}
|
||||
|
||||
%postun corei2-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-corei2
|
||||
fi
|
||||
%postun corei2-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-corei2
|
||||
fi
|
||||
|
||||
%endif
|
||||
|
||||
%ifarch %{ix86}
|
||||
|
||||
%post -n atlas-corei1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n atlas-corei1 -p /sbin/ldconfig
|
||||
|
||||
%posttrans corei1-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-corei1 %{pr_corei1}
|
||||
|
||||
%postun corei1-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-corei1
|
||||
fi
|
||||
|
||||
# No arch specific packages
|
||||
%endif
|
||||
|
||||
%ifarch s390 s390x
|
||||
|
||||
%post -n atlas-z14 -p /sbin/ldconfig
|
||||
%post -n atlas-z14 -p /sbin/ldconfig
|
||||
|
||||
%postun -n atlas-z14 -p /sbin/ldconfig
|
||||
%postun -n atlas-z14 -p /sbin/ldconfig
|
||||
|
||||
%posttrans z14-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-z14 %{pr_z14}
|
||||
%posttrans z14-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-z14 %{pr_z14}
|
||||
|
||||
%postun z14-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
%postun z14-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z14
|
||||
fi
|
||||
fi
|
||||
|
||||
%post -n atlas-z15 -p /sbin/ldconfig
|
||||
|
||||
%postun -n atlas-z15 -p /sbin/ldconfig
|
||||
|
||||
%posttrans z15-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-z15 %{pr_z15}
|
||||
|
||||
%postun z15-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z15
|
||||
fi
|
||||
|
||||
%endif
|
||||
|
||||
%ifarch ppc64
|
||||
|
||||
%post -n atlas-power7 -p /sbin/ldconfig
|
||||
%post -n atlas-power7 -p /sbin/ldconfig
|
||||
|
||||
%postun -n atlas-power7 -p /sbin/ldconfig
|
||||
%postun -n atlas-power7 -p /sbin/ldconfig
|
||||
|
||||
%posttrans power7-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-power7 %{pr_power7}
|
||||
%posttrans power7-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-power7 %{pr_power7}
|
||||
|
||||
%postun power7-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-power7
|
||||
fi
|
||||
%postun power7-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-power7
|
||||
fi
|
||||
|
||||
%post -n atlas-ppc8 -p /sbin/ldconfig
|
||||
%post -n atlas-ppc8 -p /sbin/ldconfig
|
||||
|
||||
%postun -n atlas-ppc8 -p /sbin/ldconfig
|
||||
%postun -n atlas-ppc8 -p /sbin/ldconfig
|
||||
|
||||
%posttrans ppc8-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-ppc8 %{pr_ppc8}
|
||||
%posttrans ppc8-devel
|
||||
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
|
||||
%{_includedir}/atlas-%{_arch}-ppc8 %{pr_ppc8}
|
||||
|
||||
%postun ppc8-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-ppc8
|
||||
fi
|
||||
%postun ppc8-devel
|
||||
if [ $1 -ge 0 ] ; then
|
||||
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-ppc8
|
||||
fi
|
||||
|
||||
%endif
|
||||
#enable_native_atlas
|
||||
%endif
|
||||
%files
|
||||
%doc doc/README.dist
|
||||
%dir %{_libdir}/atlas
|
||||
%{_libdir}/atlas/*.so.*
|
||||
%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}.conf
|
||||
%doc doc/README.dist
|
||||
%dir %{_libdir}/atlas
|
||||
%{_libdir}/atlas/*.so.*
|
||||
%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}.conf
|
||||
|
||||
%files devel
|
||||
%doc doc
|
||||
%{_libdir}/atlas/*.so
|
||||
%{_includedir}/atlas-%{_arch}-base/
|
||||
%{_includedir}/*.h
|
||||
%ghost %{_includedir}/atlas
|
||||
%{_libdir}/pkgconfig/atlas.pc
|
||||
%doc doc
|
||||
%{_libdir}/atlas/*.so
|
||||
%{_includedir}/atlas-%{_arch}-base/
|
||||
%{_includedir}/*.h
|
||||
%ghost %{_includedir}/atlas
|
||||
%{_libdir}/pkgconfig/atlas.pc
|
||||
|
||||
%files static
|
||||
%{_libdir}/atlas/*.a
|
||||
%{_libdir}/atlas/*.a
|
||||
|
||||
%if "%{?enable_native_atlas}" == "0"
|
||||
|
||||
|
@ -736,13 +728,8 @@ fi
|
|||
%{_libdir}/atlas-power7/*.a
|
||||
%endif
|
||||
|
||||
%ifarch %{ix86}
|
||||
|
||||
%endif
|
||||
|
||||
%ifarch s390 s390x
|
||||
|
||||
|
||||
%files z14
|
||||
%doc doc/README.dist
|
||||
%dir %{_libdir}/atlas-z14
|
||||
|
@ -759,38 +746,82 @@ fi
|
|||
%files z14-static
|
||||
%{_libdir}/atlas-z14/*.a
|
||||
|
||||
|
||||
%files z15
|
||||
%doc doc/README.dist
|
||||
%dir %{_libdir}/atlas-z15
|
||||
%{_libdir}/atlas-z15/*.so.*
|
||||
%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-z15.conf
|
||||
|
||||
%files z15-devel
|
||||
%doc doc
|
||||
%{_libdir}/atlas-z15/*.so
|
||||
%{_includedir}/atlas-%{_arch}-z15/
|
||||
%{_includedir}/*.h
|
||||
%ghost %{_includedir}/atlas
|
||||
|
||||
%files z15-static
|
||||
%{_libdir}/atlas-z15/*.a
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
#enable_native_atlas if
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jun 2 2020 Jakub Martisko <jamartis@redhat.com> - 3.10.3-8
|
||||
* Update the s390 subpackages:
|
||||
- The base pakcage is now optimized to z13
|
||||
- New subpackage is introduced: z14
|
||||
- All remaining subpackages for s390 are being deprecated
|
||||
- Clean up of the spec file
|
||||
- Some commented out subpackages were removed form the spec
|
||||
- These subpackages were not built/shipped -> no change from the users point of view
|
||||
Resolves: #1782560
|
||||
Resolves: #1780286
|
||||
Resolves: #1782561
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.3-17
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Mon Jun 10 2019 Jakub Martisko <jamartis@redhat.com> - 3.10.3-7
|
||||
* Fix covscan related issues (getri function)
|
||||
Related: #1602445
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.3-16
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Mon Dec 17 2018 Jakub Martisko <jamartis@redhat.com> - 3.10.3-6
|
||||
* Pass all required compiler/linker flags
|
||||
- use annobin plugin
|
||||
- generate assembler build notes
|
||||
Related: #1624098
|
||||
* Mon Feb 22 2021 Jakub Martisko <jamartis@redhat.com> - 3.10.3-15
|
||||
- Remove unused scriptlets
|
||||
|
||||
* Wed Apr 25 2018 Jakub Martisko <jamartis@redhat.com> - 3.10.3-5
|
||||
* Mon Feb 22 2021 Jakub Martisko <jamartis@redhat.com> - 3.10.3-14
|
||||
- Fix the messed scriptlets
|
||||
Resolves: #1929845
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Aug 27 2020 Jakub Martisko <jamartis@redhat.com> - 3.10.3.13
|
||||
- Sync with rhel 8.3 + cleanup
|
||||
- Add new subpackages - z{14,15}
|
||||
- Unlike in rhel8, the base subpackage still needs to be build for z12.
|
||||
- Covscan related bugfixes
|
||||
- Spec and git cleanup (remove unused patches/sources)
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Feb 13 2020 Jakub Martisko <jamartis@redhat.com> - 3.10.3-11
|
||||
- Drop IBM z10 and z196 subpackages
|
||||
- s390 is now optimized for z12
|
||||
Related: #1780286
|
||||
|
||||
* Mon Jan 27 2020 Jakub Martisko <jamartis@redhat.com> - 3.10.3-10
|
||||
- Fix compatibility with gcc 10
|
||||
- Sync compiler/linker flags with RHEL
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sun Oct 14 2018 Peter Robinson <pbrobinson@fedoraproject.org> 3.10.3-7
|
||||
- Update requires for alternatives
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Apr 11 2018 Jakub Martisko <jamartis@redhat.com> - 3.10.3-5
|
||||
- Pass RPM_LD_FLAGS to linker
|
||||
|
||||
* Wed Apr 25 2018 Jakub Martisko <jamartis@redhat.com> - 3.10.3-4
|
||||
* Thu Mar 01 2018 Jakub Martisko <jamartis@redhat.com> - 3.10.3-4
|
||||
- Add gcc to buildrequires
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-3
|
||||
|
|
Loading…
Reference in New Issue