rpms/atlas
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix ppc64le patch, which causes build failure on ppc64le

Browse Source
This commit is contained in:
Than Ngo 2015-07-09 10:46:33 +02:00
parent cddcd13655
commit 91230ab335
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
atlas.spec
View File

@ -5,7 +5,7 @@ Version: 3.10.2
%if "%{?enable_native_atlas}" != "0"
%define dist .native
%endif
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Automatically Tuned Linear Algebra Software
Group: System Environment/Libraries
@ -345,7 +345,7 @@ cp %{SOURCE14} CONFIG/ARCHS/
#cp %{SOURCE9} CONFIG/ARCHS/
%ifarch ppc64le
%patch99 -p2
%patch99 -p1
%patch98 -p2
%patch96 -p2
%patch95 -p2
@ -827,6 +827,9 @@ fi
%endif
%changelog
* Thu Jul 09 2015 Than Ngo <than@redhat.com> 3.10.2-6
- fix ppc64le patch
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

24
ppc64le-remove-vsx.patch
View File

@ -6,11 +6,10 @@ as long as not supported for ppc64le
Note that also force as power4
Signed-off-by: Michel Normand <normand@fr.ibm.com>
Index: atlas/ATLAS/CONFIG/src/atlcomp.txt
===================================================================
--- atlas.orig/ATLAS/CONFIG/src/atlcomp.txt
+++ atlas/ATLAS/CONFIG/src/atlcomp.txt
@@ -187,9 +187,9 @@ MACH=PPCG5 OS=ALL LVL=1000 COMPS=dmc,icc
diff -up ATLAS/CONFIG/src/atlcomp.txt.orig ATLAS/CONFIG/src/atlcomp.txt
--- ATLAS/CONFIG/src/atlcomp.txt.orig 2014-07-10 18:22:02.000000000 +0200
+++ ATLAS/CONFIG/src/atlcomp.txt 2015-07-09 09:44:07.270264073 +0200
@@ -191,9 +191,9 @@ MACH=PPCG5 OS=ALL LVL=1000 COMPS=dmc,icc
MACH=PPCG5 OS=ALL LVL=1000 COMPS=skc
'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -O2 -mvrsave'
MACH=POWER7 OS=ALL LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc,gcc
@ -22,14 +21,13 @@ Index: atlas/ATLAS/CONFIG/src/atlcomp.txt
MACH=POWER6 OS=ALL LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc,gcc
'gcc' '-mcpu=power6 -mtune=power6 -maltivec -O3 -fno-schedule-insns -fschedule-insns2 -minsert-sched-nops=2'
MACH=POWER5 OS=ALL LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc,gcc
Index: atlas/ATLAS/CONFIG/src/probe_comp.c
===================================================================
--- atlas.orig/ATLAS/CONFIG/src/probe_comp.c
+++ atlas/ATLAS/CONFIG/src/probe_comp.c
@@ -446,8 +446,8 @@ COMPNODE **GetDefaultComps(enum OSTYPE O
if ((vecexts & (1<<ISA_AVXFMA4)) && arch == AmdDozer)
vp = "-msse4.2 -mfma4";
diff -up ATLAS/CONFIG/src/probe_comp.c.orig ATLAS/CONFIG/src/probe_comp.c
--- ATLAS/CONFIG/src/probe_comp.c.orig 2015-07-09 09:44:07.280264074 +0200
+++ ATLAS/CONFIG/src/probe_comp.c 2015-07-09 09:45:51.480266328 +0200
@@ -450,8 +450,8 @@ COMPNODE **GetDefaultComps(enum OSTYPE O
vp = "-mavx -mno-sse2avx -mfma";
else if ((vecexts & (1<<ISA_AVXMAC)))
vp = "-mavx2 -mfma";
- else if (vecexts & (1<<ISA_VSX))
- vp = "-mvsx";
+ /*else if (vecexts & (1<<ISA_VSX))