Compare commits

...

8 Commits
master ... f33

Author SHA1 Message Date
Fedora Release Engineering 03729bff03 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 12:39:08 +00:00
Jakub Martisko 64fd4d5d97 Refresh the s390x subpackeges
Drop support for z10 and z196 CPUs
Use the z12 as the base for s390x

Related: #1780286
2020-02-13 16:59:15 +01:00
Jakub Martisko 31b9a6429f Fix: fix compatibility with gcc-10, sync build flags with rhel 2020-01-28 09:12:28 +01:00
Fedora Release Engineering eb55349d9e - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 18:43:08 +00:00
Fedora Release Engineering 0cceea8722 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 14:05:25 +00:00
Igor Gnatenko 2eca604087 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:23:56 +01:00
Peter Robinson e42eaa8726 Update requires for alternatives 2018-10-14 23:40:32 +01:00
Fedora Release Engineering 06105294d3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 20:43:48 +00:00
2 changed files with 134 additions and 185 deletions

49
atlas-gcc10.patch Normal file
View File

@ -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

View File

@ -5,18 +5,17 @@ Version: 3.10.3
%if "%{?enable_native_atlas}" != "0"
%define dist .native
%endif
Release: 5%{?dist}
Release: 12%{?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
#Source4: USII64.tgz
#Source5: USII32.tgz
#Source6: IBMz1032.tgz
#Source7: IBMz1064.tgz
#Source8: IBMz19632.tgz
@ -45,6 +44,7 @@ Patch8: atlas-genparse.patch
# Unbundle LAPACK (BZ #1181369)
Patch9: atlas.3.10.1-unbundle.patch
Patch10: atlas-gcc10.patch
BuildRequires: gcc-gfortran, lapack-static, gcc
@ -60,8 +60,8 @@ Obsoletes: atlas-sse3 < 3.10.3-1
%endif
%ifarch s390 s390x
#Obsoletes: atlas-z10 < 3.10
#Obsoletes: atlas-z196 < 3.10
Obsoletes: atlas-z10 < 3.10.3-11
Obsoletes: atlas-z196 < 3.10.3-11
%endif
@ -83,11 +83,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
@ -99,16 +98,21 @@ Obsoletes: atlas-sse-devel < 3.10.3-1
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-11
Obsoletes: atlas-z196-devel < 3.10.3-11
%endif
%description devel
This package contains headers for development with ATLAS
(Automatically Tuned Linear Algebra Software).
%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
@ -120,6 +124,12 @@ Obsoletes: atlas-sse-static < 3.10.3-1
Obsoletes: atlas-sse2-static < 3.10.3-1
Obsoletes: atlas-sse3-static < 3.10.3-1
%endif
%ifarch s390 s390x
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).
@ -131,13 +141,12 @@ Linear Algebra Software).
############## Subpackages for architecture extensions #################
#
%ifarch x86_64
%define types base corei2
%define types base corei2
#corei4
# sse3
%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
@ -146,7 +155,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
@ -155,11 +163,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
@ -185,8 +192,8 @@ optimizations for the corei2 (Ivy/Sandy bridge) CPUs.
#Group: Development/Libraries
#Requires: %{name}-corei1 = %{version}-%{release}
#Obsoletes: %name-header <= %version-%release
#Requires(posttrans): chkconfig
#Requires(postun): chkconfig
#Requires(posttrans): /usr/sbin/alternatives
#Requires(postun): /usr/sbin/alternatives
#%description corei1-devel
#This package contains shared and static versions of the ATLAS
@ -197,8 +204,8 @@ optimizations for the corei2 (Ivy/Sandy bridge) CPUs.
#Summary: Static libraries for ATLAS for Corei1 (/Nehalem/Westmere) CPUs
#Group: Development/Libraries
#Requires: %{name}-corei1-devel = %{version}-%{release}
#Requires(posttrans): chkconfig
#Requires(postun): chkconfig
#Requires(posttrans): /usr/sbin/alternatives
#Requires(postun): /usr/sbin/alternatives
#%description corei1-static
#This package contains the ATLAS (Automatically Tuned Linear Algebra
@ -208,73 +215,7 @@ optimizations for the corei2 (Ivy/Sandy bridge) CPUs.
%endif
%ifarch s390 s390x
%define types base z196 z10
%package z196
Summary: ATLAS libraries for z196
Group: System Environment/Libraries
%description z196
This package contains the ATLAS (Automatically Tuned Linear Algebra
Software) libraries compiled with optimizations for the z196.
%package z196-devel
Summary: Development libraries for ATLAS for z196
Group: Development/Libraries
Requires: %{name}-z196 = %{version}-%{release}
Obsoletes: %name-z196-header <= %version-%release
Requires(posttrans): chkconfig
Requires(postun): chkconfig
%description z196-devel
This package contains headers and shared versions of the ATLAS
(Automatically Tuned Linear Algebra Software) libraries compiled with
optimizations for the z196 architecture.
%package z196-static
Summary: Static libraries for ATLAS
Group: Development/Libraries
Requires: %{name}-z196-devel = %{version}-%{release}
Requires(posttrans): chkconfig
Requires(postun): chkconfig
%description z196-static
This package contains static version of ATLAS (Automatically Tuned
Linear Algebra Software) for the z196 architecture.
%package z10
Summary: ATLAS libraries for z10
Group: System Environment/Libraries
%description z10
This package contains the ATLAS (Automatically Tuned Linear Algebra
Software) libraries compiled with optimizations for the z10.
%package z10-devel
Summary: Development libraries for ATLAS for z10
Group: Development/Libraries
Requires: %{name}-z10 = %{version}-%{release}
Obsoletes: %name-header <= %version-%release
Requires(posttrans): chkconfig
Requires(postun): chkconfig
%description z10-devel
This package contains headers and shared versions of the ATLAS
(Automatically Tuned Linear Algebra Software) libraries compiled with
optimizations for the z10 architecture.
%package z10-static
Summary: Static libraries for ATLAS
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires(posttrans): chkconfig
Requires(postun): chkconfig
%description z10-static
This package contains static version of ATLAS (Automatically Tuned
Linear Algebra Software) for the z10 architecture.
%define types base
%endif
@ -284,7 +225,6 @@ Linear Algebra Software) for the z10 architecture.
%package power8
Summary: ATLAS libraries for Power 8
Group: System Environment/Libraries
%description power8
This package contains ATLAS (Automatically Tuned Linear Algebra Software)
@ -293,11 +233,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
@ -306,10 +245,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
@ -318,7 +256,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)
@ -327,11 +264,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
@ -340,10 +276,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
@ -370,6 +305,7 @@ CPUs. The base ATLAS builds for the ppc64 architecture are made for the Power 5
%endif
%patch8 -p1 -b .genparse
%patch9 -p1 -b .unbundle
%patch10 -p1
cp %{SOURCE1} CONFIG/ARCHS/
#cp %{SOURCE2} CONFIG/ARCHS/
@ -420,7 +356,7 @@ p=$(pwd)
#Target architectures for the 'base' versions
%ifarch s390x
%define flags %{nil}
%define base_options "-A IBMz9 -V 1"
%define base_options "-A IBMz12 -V 1"
%endif
%ifarch x86_64
@ -497,7 +433,7 @@ for type in %{types}; do
fi
mkdir -p %{_arch}_${type}
pushd %{_arch}_${type}
../configure %{mode} $thread_options $arg_options -D c -DWALL -Fa alg '%{flags} -g -Wa,--noexecstack -fPIC ${RPM_LD_FLAGS}'\
../configure %{mode} $thread_options $arg_options -D c -DWALL -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'\
--prefix=%{buildroot}%{_prefix} \
--incdir=%{buildroot}%{_includedir} \
--libdir=%{buildroot}%{_libdir}/${libname}
@ -565,14 +501,6 @@ mkdir -p %{buildroot}%{_includedir}/atlas
%check
# Run make check but don't fail the build on these arches
#%ifarch s390 aarch64 ppc64
#for type in %{types}; do
# pushd %{_arch}_${type}
# make check ptcheck
# popd
#done
#%else
for type in %{types}; do
pushd %{_arch}_${type}
make check ptcheck
@ -630,31 +558,31 @@ fi
%ifarch s390 s390x
%post -n atlas-z10 -p /sbin/ldconfig
#%post -n atlas-z10 -p /sbin/ldconfig
%postun -n atlas-z10 -p /sbin/ldconfig
#%postun -n atlas-z10 -p /sbin/ldconfig
%posttrans z10-devel
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
%{_includedir}/atlas-%{_arch}-z10 %{pr_z10}
#%posttrans z10-devel
# /usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
# %{_includedir}/atlas-%{_arch}-z10 %{pr_z10}
%postun z10-devel
if [ $1 -ge 0 ] ; then
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z10
fi
%post -n atlas-z196 -p /sbin/ldconfig
#%postun z10-devel
#if [ $1 -ge 0 ] ; then
# /usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z10
#fi
%postun -n atlas-z196 -p /sbin/ldconfig
#%post -n atlas-z196 -p /sbin/ldconfig
%posttrans z196-devel
/usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
%{_includedir}/atlas-%{_arch}-z196 %{pr_z196}
#%postun -n atlas-z196 -p /sbin/ldconfig
%postun z196-devel
if [ $1 -ge 0 ] ; then
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z196
fi
#%posttrans z196-devel
# /usr/sbin/alternatives --install %{_includedir}/atlas atlas-inc \
# %{_includedir}/atlas-%{_arch}-z196 %{pr_z196}
#%postun z196-devel
#if [ $1 -ge 0 ] ; then
# /usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z196
#fi
%endif
@ -672,7 +600,7 @@ fi
if [ $1 -ge 0 ] ; then
/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-power7
fi
%post -n atlas-ppc8 -p /sbin/ldconfig
%postun -n atlas-ppc8 -p /sbin/ldconfig
@ -763,63 +691,35 @@ fi
%{_libdir}/atlas-power7/*.a
%endif
%ifarch %{ix86}
#%files corei1
#%doc doc/README.dist
#%dir %{_libdir}/atlas-corei1
#%{_libdir}/atlas-corei1/*.so.*
#%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-corei1.conf
#%files corei1-devel
#%doc doc
#%{_libdir}/atlas-corei1/*.so
#%{_includedir}/atlas-%{_arch}-corei1/
#%{_includedir}/*.h
#%ghost %{_includedir}/atlas
#%files corei1-static
#%{_libdir}/atlas-corei1/*.a
%endif
%ifarch s390 s390x
%files z10
%doc doc/README.dist
%dir %{_libdir}/atlas-z10
%{_libdir}/atlas-z10/*.so.*
%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-z10.conf
%files z10-devel
%doc doc
%{_libdir}/atlas-z10/*.so
%{_includedir}/atlas-%{_arch}-z10/
%{_includedir}/*.h
%ghost %{_includedir}/atlas
%files z10-static
%{_libdir}/atlas-z10/*.a
%files z196
%doc doc/README.dist
%dir %{_libdir}/atlas-z196
%{_libdir}/atlas-z196/*.so.*
%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-z196.conf
%files z196-devel
%doc doc
%{_libdir}/atlas-z196/*.so
%{_includedir}/atlas-%{_arch}-z196/
%{_includedir}/*.h
%ghost %{_includedir}/atlas
%files z196-static
%{_libdir}/atlas-z196/*.a
%endif
#enable_native_atlas if
%endif
%changelog
* 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