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

Rebuilt for GCC-7

This commit is contained in:
Björn Esser 2017-01-28 10:24:04 +01:00
parent 35e303b80a
commit 1a2f01f0f0
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
atlas.spec
View File

@ -5,7 +5,7 @@ Version: 3.10.2
%if "%{?enable_native_atlas}" != "0" %if "%{?enable_native_atlas}" != "0"
%define dist .native %define dist .native
%endif %endif
Release: 14%{?dist} Release: 15%{?dist}
Summary: Automatically Tuned Linear Algebra Software Summary: Automatically Tuned Linear Algebra Software
Group: System Environment/Libraries Group: System Environment/Libraries
@ -15,8 +15,8 @@ Source0: http://downloads.sourceforge.net/math-atlas/%{name}%{version}.ta
Source1: PPRO32.tgz Source1: PPRO32.tgz
#Source2: K7323DNow.tgz #Source2: K7323DNow.tgz
Source3: README.dist Source3: README.dist
#Source4: USII64.tgz #Source4: USII64.tgz
#Source5: USII32.tgz #Source5: USII32.tgz
#Source6: IBMz1032.tgz #Source6: IBMz1032.tgz
#Source7: IBMz1064.tgz #Source7: IBMz1064.tgz
#Source8: IBMz19632.tgz #Source8: IBMz19632.tgz
@ -183,7 +183,7 @@ Requires(postun): chkconfig
%description sse2-static %description sse2-static
This package contains ATLAS (Automatically Tuned Linear Algebra Software) This package contains ATLAS (Automatically Tuned Linear Algebra Software)
static libraries compiled with optimizations for the SSE2 extensions to the static libraries compiled with optimizations for the SSE2 extensions to the
ix86 architecture. ix86 architecture.
@ -217,13 +217,13 @@ Requires(postun): chkconfig
%description sse3-static %description sse3-static
This package contains ATLAS (Automatically Tuned Linear Algebra Software) This package contains ATLAS (Automatically Tuned Linear Algebra Software)
static libraries compiled with optimizations for the SSE3 extensions to the static libraries compiled with optimizations for the SSE3 extensions to the
ix86 architecture. ix86 architecture.
%endif %endif
%ifarch s390 s390x %ifarch s390 s390x
%define types base %define types base
#z196 #z196
#z10 #z10
@ -304,7 +304,7 @@ ix86 architecture.
%global mode -b %{__isa_bits} %global mode -b %{__isa_bits}
%global armflags %{nil} %global armflags %{nil}
%if "%{?enable_native_atlas}" == "0" %if "%{?enable_native_atlas}" == "0"
%define threads_option -t 4 %define threads_option -t 4
%endif %endif
%endif %endif
@ -368,7 +368,7 @@ mkdir lapacklib
cd lapacklib cd lapacklib
ar x %{_libdir}/liblapack_pic.a ar x %{_libdir}/liblapack_pic.a
# Remove functions that have ATLAS implementations # Remove functions that have ATLAS implementations
rm 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 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 # Create new library
ar rcs ../liblapack_pic_pruned.a *.o ar rcs ../liblapack_pic_pruned.a *.o
cd .. cd ..
@ -389,7 +389,7 @@ for type in %{types}; do
../configure %{mode} %{?threads_option} %{?arch_option} -D c -DWALL -Fa alg '%{armflags} -g -Wa,--noexecstack -fPIC'\ ../configure %{mode} %{?threads_option} %{?arch_option} -D c -DWALL -Fa alg '%{armflags} -g -Wa,--noexecstack -fPIC'\
--prefix=%{buildroot}%{_prefix} \ --prefix=%{buildroot}%{_prefix} \
--incdir=%{buildroot}%{_includedir} \ --incdir=%{buildroot}%{_includedir} \
--libdir=%{buildroot}%{_libdir}/${libname} --libdir=%{buildroot}%{_libdir}/${libname}
#--with-netlib-lapack-tarfile=%{SOURCE10} #--with-netlib-lapack-tarfile=%{SOURCE10}
#matches both SLAPACK and SSLAPACK #matches both SLAPACK and SSLAPACK
@ -402,18 +402,18 @@ for type in %{types}; do
sed -i 's#ARCH =.*#ARCH = HAMMER64SSE3#' Make.inc sed -i 's#ARCH =.*#ARCH = HAMMER64SSE3#' Make.inc
# sed -i 's#-DATL_SSE3##' Make.inc # sed -i 's#-DATL_SSE3##' Make.inc
sed -i 's#-DATL_AVX\w*##g' Make.inc sed -i 's#-DATL_AVX\w*##g' Make.inc
# sed -i 's#-msse3#-msse2#' Make.inc # sed -i 's#-msse3#-msse2#' Make.inc
sed -i 's#-mavx\w*#-msse3#g' Make.inc sed -i 's#-mavx\w*#-msse3#g' Make.inc
sed -i 's#-mfma\w*#-msse3#g' Make.inc sed -i 's#-mfma\w*#-msse3#g' Make.inc
echo 'base makefile edited' echo 'base makefile edited'
# sed -i 's#PMAKE = $(MAKE) .*#PMAKE = $(MAKE) -j 1#' Make.inc # sed -i 's#PMAKE = $(MAKE) .*#PMAKE = $(MAKE) -j 1#' Make.inc
elif [ "$type" = "sse3" ]; then elif [ "$type" = "sse3" ]; then
# sed -i 's#ARCH =.*#ARCH = Corei264AVX#' Make.inc # sed -i 's#ARCH =.*#ARCH = Corei264AVX#' Make.inc
# sed -i 's#PMAKE = $(MAKE) .*#PMAKE = $(MAKE) -j 1#' Make.inc # sed -i 's#PMAKE = $(MAKE) .*#PMAKE = $(MAKE) -j 1#' Make.inc
sed -i 's#-DATL_AVX\w*##g' Make.inc sed -i 's#-DATL_AVX\w*##g' Make.inc
sed -i 's#-DATL_SSE2##' Make.inc sed -i 's#-DATL_SSE2##' Make.inc
sed -i 's#-mavx\w*#-msse2#g' Make.inc sed -i 's#-mavx\w*#-msse2#g' Make.inc
sed -i 's#-msse3#-msse2#' Make.inc sed -i 's#-msse3#-msse2#' Make.inc
echo 'sse makefile edited' echo 'sse makefile edited'
%define pr_sse3 %(echo $((%{__isa_bits}+4))) %define pr_sse3 %(echo $((%{__isa_bits}+4)))
fi fi
@ -425,18 +425,18 @@ for type in %{types}; do
#sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc #sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc
sed -i 's#-DATL_SSE3##' Make.inc sed -i 's#-DATL_SSE3##' Make.inc
sed -i 's#-DATL_SSE2##' Make.inc sed -i 's#-DATL_SSE2##' Make.inc
sed -i 's#-DATL_SSE1##' Make.inc sed -i 's#-DATL_SSE1##' Make.inc
sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc
elif [ "$type" = "sse" ]; then elif [ "$type" = "sse" ]; then
sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc
sed -i 's#-DATL_SSE3#-DATL_SSE1#' Make.inc sed -i 's#-DATL_SSE3#-DATL_SSE1#' Make.inc
sed -i 's#-msse3#-msse#' Make.inc sed -i 's#-msse3#-msse#' Make.inc
%define pr_sse %(echo $((%{__isa_bits}+2))) %define pr_sse %(echo $((%{__isa_bits}+2)))
elif [ "$type" = "sse2" ]; then elif [ "$type" = "sse2" ]; then
# sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc # sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc
sed -i 's#ARCH =.*#ARCH = x86SSE232SSE2#' Make.inc sed -i 's#ARCH =.*#ARCH = x86SSE232SSE2#' Make.inc
sed -i 's#-DATL_SSE3#-DATL_SSE2#' Make.inc sed -i 's#-DATL_SSE3#-DATL_SSE2#' Make.inc
sed -i 's#-msse3#-msse2#' Make.inc sed -i 's#-msse3#-msse2#' Make.inc
%define pr_sse2 %(echo $((%{__isa_bits}+3))) %define pr_sse2 %(echo $((%{__isa_bits}+3)))
elif [ "$type" = "sse3" ]; then elif [ "$type" = "sse3" ]; then
sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc
@ -449,10 +449,10 @@ for type in %{types}; do
# we also need a compiler with -march=z196 support # we also need a compiler with -march=z196 support
# the base support will use z196 tuning # the base support will use z196 tuning
if [ "$type" = "base" ]; then if [ "$type" = "base" ]; then
%ifarch s390x %ifarch s390x
sed -i 's#ARCH =.*#ARCH = IBMz964#' Make.inc sed -i 's#ARCH =.*#ARCH = IBMz964#' Make.inc
%endif %endif
%ifarch s390 %ifarch s390
sed -i 's#ARCH =.*#ARCH = IBMz932#' Make.inc sed -i 's#ARCH =.*#ARCH = IBMz932#' Make.inc
%endif %endif
sed -i 's#-march=z196#-march=z9-109 -mtune=z196#' Make.inc sed -i 's#-march=z196#-march=z9-109 -mtune=z196#' Make.inc
@ -462,12 +462,12 @@ for type in %{types}; do
sed -i 's#-DATL_ARCH_IBMz10#-DATL_ARCH_IBMz9#' Make.inc sed -i 's#-DATL_ARCH_IBMz10#-DATL_ARCH_IBMz9#' Make.inc
# sed -i 's#-DATL_ARCH_IBMz9#-DATL_ARCH_IBMz9#' Make.inc # sed -i 's#-DATL_ARCH_IBMz9#-DATL_ARCH_IBMz9#' Make.inc
elif [ "$type" = "z10" ]; then elif [ "$type" = "z10" ]; then
%ifarch s390x %ifarch s390x
# cat Make.inc | grep "ARCH =" # cat Make.inc | grep "ARCH ="
sed -i 's#ARCH =.*#ARCH = IBMz1064#' Make.inc sed -i 's#ARCH =.*#ARCH = IBMz1064#' Make.inc
%endif %endif
%ifarch s390 %ifarch s390
sed -i 's#ARCH =.*#ARCH = IBMz1032#' Make.inc sed -i 's#ARCH =.*#ARCH = IBMz1032#' Make.inc
# cat Make.inc | grep "ARCH =" # cat Make.inc | grep "ARCH ="
%endif %endif
@ -479,10 +479,10 @@ for type in %{types}; do
%define pr_z10 %(echo $((%{__isa_bits}+1))) %define pr_z10 %(echo $((%{__isa_bits}+1)))
elif [ "$type" = "z196" ]; then elif [ "$type" = "z196" ]; then
%ifarch s390x %ifarch s390x
sed -i 's#ARCH =.*#ARCH = IBMz19664#' Make.inc sed -i 's#ARCH =.*#ARCH = IBMz19664#' Make.inc
%endif %endif
%ifarch s390 %ifarch s390
sed -i 's#ARCH =.*#ARCH = IBMz19632#' Make.inc sed -i 's#ARCH =.*#ARCH = IBMz19632#' Make.inc
%endif %endif
sed -i 's#-march=z196#-march=z10 -mtune=z196#' Make.inc sed -i 's#-march=z196#-march=z10 -mtune=z196#' Make.inc
@ -512,7 +512,7 @@ for type in %{types}; do
popd popd
done done
%install %install
for type in %{types}; do for type in %{types}; do
pushd %{_arch}_${type} pushd %{_arch}_${type}
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
@ -820,6 +820,9 @@ fi
%endif %endif
%changelog %changelog
* Sat Jan 28 2017 Björn Esser <besser82@fedoraproject.org> - 3.10.2-15
- Rebuilt for GCC-7
* Fri Dec 16 2016 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-14 * Fri Dec 16 2016 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-14
- Limit instruction set on x86_64 (bug #1405397) - Limit instruction set on x86_64 (bug #1405397)
@ -1004,10 +1007,10 @@ fi
- Fix typo in SSE3 subpackage's summary. - Fix typo in SSE3 subpackage's summary.
* Sat Oct 24 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-12 * Sat Oct 24 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-12
- Use alternatives to workaround multilib conflicts (BZ#508565). - Use alternatives to workaround multilib conflicts (BZ#508565).
* Tue Sep 29 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-11 * Tue Sep 29 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-11
- Obsolete the -header subpackage properly. - Obsolete the -header subpackage properly.
* Sat Sep 26 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-10 * Sat Sep 26 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-10
- Use the new arch. default for Pentium PRO (Fedora bug #510498) - Use the new arch. default for Pentium PRO (Fedora bug #510498)
@ -1017,10 +1020,10 @@ fi
- Rebuild against fixed lapack (see #520518) - Rebuild against fixed lapack (see #520518)
* Thu Aug 13 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-8 * Thu Aug 13 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-8
- Revert the last change, it doesn't solve the problem. - Revert the last change, it doesn't solve the problem.
* Tue Aug 04 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-7 * Tue Aug 04 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-7
- Create a -header subpackage to avoid multilib conflicts (BZ#508565). - Create a -header subpackage to avoid multilib conflicts (BZ#508565).
* Tue Aug 04 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-6 * Tue Aug 04 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-6
- Add '-g' to build flag to allow proper genration of debuginfo subpackages (Fedora bug #509813) - Add '-g' to build flag to allow proper genration of debuginfo subpackages (Fedora bug #509813)