summaryrefslogtreecommitdiff
path: root/math/atlas-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/atlas-devel/files')
-rw-r--r--math/atlas-devel/files/Makefile.test35
-rw-r--r--math/atlas-devel/files/alpha-patch9
-rw-r--r--math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c20
-rw-r--r--math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt121
-rw-r--r--math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c76
-rw-r--r--math/atlas-devel/files/patch-tune+sysinfo+L1CacheSize.c20
-rw-r--r--math/atlas-devel/files/thread-patch12
7 files changed, 0 insertions, 293 deletions
diff --git a/math/atlas-devel/files/Makefile.test b/math/atlas-devel/files/Makefile.test
deleted file mode 100644
index 1eaae571f323..000000000000
--- a/math/atlas-devel/files/Makefile.test
+++ /dev/null
@@ -1,35 +0,0 @@
-ALLTESTS = xsl3blastst xdl3blastst xcl3blastst xzl3blastst \
- xsl2blastst xdl2blastst xcl2blastst xzl2blastst \
- xsl1blastst xdl1blastst xcl1blastst xzl1blastst \
- xslutst xslutstF xdlutst xdlutstF xclutst xclutstF \
- xzlutst xzlutstF xsllttst xsllttstF xdllttst xdllttstF \
- xcllttst xcllttstF xzllttst xzllttstF
-
-ALLTESTS_PT = xsl3blastst_pt xdl3blastst_pt xcl3blastst_pt xzl3blastst_pt \
- xslutst_pt xslutstF_pt xdlutst_pt xdlutstF_pt xclutst_pt xclutstF_pt \
- xzlutst_pt xzlutstF_pt xsllttst_pt xsllttstF_pt xdllttst_pt \
- xdllttstF_pt xcllttst_pt xcllttstF_pt xzllttst_pt xzllttstF_pt
-#build errors?
-# xsl2blastst_pt xdl2blastst_pt xcl2blastst_pt xzl2blastst_pt \
-# xsl1blastst_pt xdl1blastst_pt xcl1blastst_pt xzl1blastst_pt \
-#Failed tests
-do-test:
- @for i in ${ALLTESTS} ; do \
- ${ECHO_CMD} "Making $${i}" ; \
- cd ${WRKDIR}/ATLAS/NON_THREADED_PIC/bin ; ${MAKE} $${i} ; \
- done
- @for i in ${ALLTESTS_PT} ; do \
- ${ECHO_CMD} "Making $${i}" ; \
- cd ${WRKDIR}/ATLAS/THREADED_PIC/bin ; ${MAKE} $${i} ; \
- done
- @for i in ${ALLTESTS} ; do \
- ${ECHO_CMD} "Benchmarking $${i}" ; \
- cd ${WRKDIR}/ATLAS/NON_THREADED_PIC/bin ; ./$${i} ; \
- done
- @for i in ${ALLTESTS_PT} ; do \
- ${ECHO_CMD} "Benchmarking $${i}" ; \
- cd ${WRKDIR}/ATLAS/THREADED_PIC/bin ; ./$${i} ; \
- done
-
-
-
diff --git a/math/atlas-devel/files/alpha-patch b/math/atlas-devel/files/alpha-patch
deleted file mode 100644
index 564198d5be91..000000000000
--- a/math/atlas-devel/files/alpha-patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/blas/gemm/GOTO/ATLU_usergemm.c~ Mon Jun 17 10:38:22 2002
-+++ src/blas/gemm/GOTO/ATLU_usergemm.c Sun Aug 18 10:41:19 2002
-@@ -1,5 +1,5 @@
- #include "atlas_misc.h"
--#include <sys/mman.h>
-+/*#include <sys/mman.h>*/
-
- #ifdef EV6
- #ifdef ATL_OS_OSF1
diff --git a/math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c b/math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c
deleted file mode 100644
index 502d4c169a0f..000000000000
--- a/math/atlas-devel/files/patch-CONFIG+src+SpewMakeInc.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- CONFIG/src/SpewMakeInc.c.orig 2009-04-07 23:11:39.000000000 +0900
-+++ CONFIG/src/SpewMakeInc.c 2009-04-13 17:20:56.000000000 +0900
-@@ -737,7 +737,7 @@
- fprintf(fpout, "# ------------------------------------\n");
- fprintf(fpout, "# Reference and system libraries\n");
- fprintf(fpout, "# ------------------------------------\n");
-- fprintf(fpout, " FBLASlib = $(LIBdir)/libf77refblas.a\n");
-+ fprintf(fpout, " FBLASlib = -L%%LOCALBASE%%/lib -lblas\n");
- fprintf(fpout, " BLASlib = $(FBLASlib)\n");
- if (LAsrcd)
- {
-@@ -754,7 +754,7 @@
- fprintf(fpout, " SLAPACKlib = \n");
- if (THREADS)
- {
-- fprintf(fpout, " LIBS = -lpthread");
-+ fprintf(fpout, " LIBS = %%PTHREAD_LIBS%%");
- if (OSIsWin(OS))
- fprintf(fpout, " -lkernel32");
- }
diff --git a/math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt b/math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt
deleted file mode 100644
index 7a4be8e203cc..000000000000
--- a/math/atlas-devel/files/patch-CONFIG+src+atlcomp.txt
+++ /dev/null
@@ -1,121 +0,0 @@
---- CONFIG/src/atlcomp.txt 2009-04-07 23:11:39.000000000 +0900
-+++ CONFIG/src/atlcomp.txt 2009-04-13 17:22:20.000000000 +0900
-@@ -40,31 +40,31 @@
- #
- # Core2 & Corei7
- MACH=Corei7 OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
-- 'gcc' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -fno-schedule-insns2'
-+ '%%CC%%' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -fno-schedule-insns2'
- MACH=Core2 OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
-- 'gcc' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2'
-+ '%%CC%%' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2'
- # PPRO,PII,PIII,P4,P4E,K7,HAMMER
- MACH=PPRO,PII,PIII,P4,P4E,K7,HAMMER OS=ALL LVL=1000 COMPS=f77
-- 'gfortran' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4'
-+ '%%FC%%' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4'
- MACH=PPRO,PII,PIII,P4,P4E,K7,HAMMER OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
-- 'gcc' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4'
-+ '%%CC%%' '-fomit-frame-pointer -mfpmath=387 -O2 -falign-loops=4'
- # CoreSolo,CoreDuo
- MACH=CoreSolo,CoreDuo OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
-- 'gcc' '-fomit-frame-pointer -O3 -mfpmath=387'
-+ '%%CC%%' '-fomit-frame-pointer -O3 -mfpmath=387'
- # 3rd generation opteron (Barcelona and descendents)
- MACH=AMD64K10h OS=ALL LVL=1000 COMPS=f77
-- 'gfortran' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
-+ '%%FC%%' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
- MACH=AMD64K10h OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
-- 'gcc' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
-+ '%%CC%%' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
- # UltraSPARC III & IV
- MACH=USIII,USIV OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc
-- 'gcc' '-mcpu=ultrasparc3 -mtune=ultrasparc3 -O3 -funroll-all-loops'
-+ '%%CC%%' '-mcpu=ultrasparc3 -mtune=ultrasparc3 -O3 -funroll-all-loops'
- MACH=USIII,USIV OS=ALL LVL=1000 COMPS=icc,xcc
-- 'gcc' '-mcpu=ultrasparc3 -mtune=ultrasparc3 -O'
-+ '%%CC%%' '-mcpu=ultrasparc3 -mtune=ultrasparc3 -O'
- MACH=USIII,USIV OS=ALL LVL=1000 COMPS=f77
- 'f77' '-dalign -native -xO5'
- MACH=USIII,USIV OS=ALL LVL=100 COMPS=f77
-- 'gfortran' '-O -mcpu=ultrasparc3 -mtune=ultrasparc3'
-+ '%%FC%%' '-O -mcpu=ultrasparc3 -mtune=ultrasparc3'
- MACH=USIII,USIV OS=ALL LVL=10 COMPS=f77
- 'g77' '-O -mcpu=ultrasparc3 -mtune=ultrasparc3'
- #
-@@ -72,11 +72,11 @@
- #
- # These gcc 4 default flags will die on gcc3, allowing gcc3's flags to be used
- MACH=IA64Itan,IA64Itan2 OS=ALL LVL=1010 COMPS=smc,dmc,skc,dkc
-- 'gcc' '-fomit-frame-pointer -O2 -fno-tree-loop-optimize'
-+ '%%CC%%' '-fomit-frame-pointer -O2 -fno-tree-loop-optimize'
- MACH=IA64Itan,IA64Itan2 OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc
-- 'gcc' '-fomit-frame-pointer -O2'
-+ '%%CC%%' '-fomit-frame-pointer -O2'
- MACH=IA64Itan,IA64Itan2 OS=ALL LVL=1010 COMPS=f77
-- 'gfortran' '-fomit-frame-pointer -O2 -fno-tree-loop-optimize'
-+ '%%FC%%' '-fomit-frame-pointer -O2 -fno-tree-loop-optimize'
- #
- # IRIX/MIPS
- #
-@@ -92,7 +92,7 @@
- # pathcc at -O2 -- seems to be a compiler error
- #
- MACH=MIPSICE9 OS=ALL LVL=500 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-O2 -mips64 -march=5kf -mtune=5kf -fno-schedule-insns -fschedule-insns2 -fno-peephole -fno-peephole2'
-+ '%%CC%%' '-O2 -mips64 -march=5kf -mtune=5kf -fno-schedule-insns -fschedule-insns2 -fno-peephole -fno-peephole2'
- MACH=MIPSICE9 OS=ALL LVL=1000 COMPS=f77
- 'pathf95' '-march=auto -O2'
- MACH=MIPSICE9 OS=ALL LVL=1 COMPS=skc,dkc
-@@ -105,9 +105,9 @@
- # G4 flags
- #
- MACH=PPCG4 OS=ALL LVL=1000 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-O3 -maltivec -mabi=altivec -mcpu=7400 -mtune=7400'
-+ '%%CC%%' '-O3 -maltivec -mabi=altivec -mcpu=7400 -mtune=7400'
- MACH=PPCG4 OS=OSX LVL=1001 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-O3 -maltivec -mabi=altivec -mcpu=7400 -mtune=7400 -no-cpp-precomp -faltivec'
-+ '%%CC%%' '-O3 -maltivec -mabi=altivec -mcpu=7400 -mtune=7400 -no-cpp-precomp -faltivec'
-
- #
- # OS X / PowerPC970; the
-@@ -116,19 +116,19 @@
- # performance by removing them (for all PowerPC platforms)
- #
- MACH=PPCG5 OS=OSX LVL=1001 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -O3'
-+ '%%CC%%' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -O3'
- MACH=PPCG5 OS=OSX LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -force_cpusubtype_ALL -O3 -fno-schedule-insns -fno-rerun-loop-opt'
-+ '%%CC%%' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -faltivec -force_cpusubtype_ALL -O3 -fno-schedule-insns -fno-rerun-loop-opt'
- MACH=PPCG5 OS=ALL LVL=1000 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -O3'
-+ '%%CC%%' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -O3'
- MACH=POWER5 OS=ALL LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-mcpu=power5 -mtune=power5 -O3 -fno-schedule-insns -fno-rerun-loop-opt'
-+ '%%CC%%' '-mcpu=power5 -mtune=power5 -O3 -fno-schedule-insns -fno-rerun-loop-opt'
- MACH=POWER5 OS=ALL LVL=1010 COMPS=f77
-- 'gfortran' '-mcpu=power5 -mtune=power5 -O3 -fno-schedule-insns -fno-rerun-loop-opt'
-+ '%%FC%%' '-mcpu=power5 -mtune=power5 -O3 -fno-schedule-insns -fno-rerun-loop-opt'
- MACH=POWER5 OS=ALL LVL=1010 COMPS=f77
- 'xlf' '-qtune=pwr5 -qarch=pwr5 -O3 -qmaxmem=-1 -qfloat=hsflt'
- MACH=POWER4 OS=ALL LVL=1010 COMPS=icc,dmc,smc,dkc,skc,xcc
-- 'gcc' '-mcpu=power4 -mtune=power4 -O3 -fno-schedule-insns -fno-rerun-loop-opt'
-+ '%%CC%%' '-mcpu=power4 -mtune=power4 -O3 -fno-schedule-insns -fno-rerun-loop-opt'
- MACH=POWER4 OS=ALL LVL=1010 COMPS=f77
- 'xlf' '-qtune=pwr4 -qarch=pwr4 -O3 -qmaxmem=-1 -qfloat=hsflt'
- #
-@@ -148,10 +148,10 @@
- # Generic defaults
- #
- MACH=ALL OS=ALL LVL=5 COMPS=icc,smc,dmc,skc,dkc,xcc
-- 'gcc' '-O -fomit-frame-pointer'
-+ '%%CC%%' '-O -fomit-frame-pointer'
- MACH=ALL OS=ALL LVL=5 COMPS=f77
-- 'gfortran' '-O'
-+ '%%FC%%' '-O'
- MACH=ALL OS=ALL LVL=4 COMPS=f77
-- 'g77' '-O'
-+ '%%FC%%' '-O'
- MACH=ALL OS=ALL LVL=0 COMPS=f77
-- 'f77' '-O'
-+ '%%FC%%' '-O'
diff --git a/math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c b/math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c
deleted file mode 100644
index eb8bb07d29e9..000000000000
--- a/math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c
+++ /dev/null
@@ -1,76 +0,0 @@
---- CONFIG/src/backend/archinfo_freebsd.c.orig Wed Jan 31 06:30:00 2007
-+++ CONFIG/src/backend/archinfo_freebsd.c Thu Feb 8 16:37:05 2007
-@@ -73,13 +73,24 @@
- }
- break;
- case AFSPARC: /* don't know */
-+ if (!CmndOneLine(NULL, "sysctl hw.model", res))
-+ {
-+ if (strstr(res, "UltraSparc-IV")) mach = SunUSIV;
-+ if (strstr(res, "UltraSparc-II")) mach = SunUSII;
-+ if (strstr(res, "UltraSparc-I")) mach = SunUSI;
-+ if (strstr(res, "UltraSparc")) mach = SunUSI;
-+ else mach = SunUSI;
-+ }
- break;
- case AFALPHA:
- #if 0
- if (!CmndOneLine(NULL, "sysctl hw.model", res))
- {
- if (strstr(res, "433au")) mach = Dec21164;
-+ else if (strstr(res, "500au")) mach = Dec21164;
-+ else if (strstr(res, "AlphaPC 164")) mach = Dec21164;
- else if (strstr(res, "XP1000")) mach = Dec21264;
-+ else mach = Dec21264;
- }
- #endif
- break;
-@@ -89,15 +100,33 @@
- if (!CmndOneLine(NULL, "sysctl hw.model", res))
- {
- if (strstr(res, "Pentium Pro")) mach = IntPPRO;
-+ else if (strstr(res, "Pentium(R) D")) mach = IntP4E;
-+ else if (strstr(res, "Pentium(R) Pro")) mach = IntPPRO;
-+ else if (strstr(res, "Pentium 4")) mach = IntP4;
-+ else if (strstr(res, "Pentium(R) 4")) mach = IntP4;
-+ else if (strstr(res, "Pentium(R) M")) mach = IntP4;
- else if (strstr(res, "Pentium III")) mach = IntPIII;
- else if (strstr(res, "Pentium II ")) mach = IntPII;
- else if (strstr(res, "Athlon")) mach = AmdAthlon;
-+ else if (strstr(res, "Pentium III/Pentium III")) mach = IntPIII;
-+ else if (strstr(res, "Pentium(R) III")) mach = IntPIII;
-+ else if (strstr(res, "Pentium II")) mach = IntPII;
-+ else if (strstr(res, "Pentium II/PentiumII")) mach = IntPII;
-+ else if (strstr(res, "Pentium(R) II ")) mach = IntPII;
-+ else if (strstr(res, "Celeron")) mach = IntPII;
-+ else if (strstr(res, "Celeron(R)")) mach = IntPII;
-+ else if (strstr(res, "Opteron(tm)")) mach = AmdHammer;
-+ else if (strstr(res, "AMD Athlon(tm) 64")) mach = AmdHammer;
- else if (strstr(res, "AMD-K7")) mach = AmdAthlon;
-- else if (strstr(res, "32 bit Hammer")) mach = AmdHammer;
-- else if (strstr(res, "64 bit Hammer")) mach = AmdHammer;
-- else if (strstr(res, "Pentium/P55C")) mach = IntP5MMX; /* sent by */
-- else if (strstr(res, "Pentium")) mach=IntP5; /* Nakata Maho */
- else if (strstr(res, "iMac4,1")) mach=IntCoreDuo;
-+ else if (strstr(res, "Sempron(tm)")) mach = AmdAthlon;
-+ else if (strstr(res, "AMD-K6(tm)")) mach = IntP5MMX;
-+ else if (strstr(res, "Pentium/P55C")) mach = IntP5MMX;
-+ else if (strstr(res, "Pentium/P54C")) mach=IntP5;
-+ else if (strstr(res, "Pentium")) mach=IntP5;
-+ else if (strstr(res, "VIA")) mach=IntP5MMX;
-+ else if (strstr(res, "Crusoe(tm)")) mach=IntP5MMX;
-+ else mach = IntP5;
- }
- break;
- default:;
-@@ -156,8 +185,8 @@
- {
- int mhz=0;
- char res[1024];
-- if (!CmndOneLine(NULL, "sysctl hw.cpufrequency", res) )
-- mhz = GetFirstDouble(res) / 1000000;
-+ if (!CmndOneLine(NULL, "sysctl kern.timecounter.choice dev.cpu.0.freq | grep dev", res) ) //requires cpufreq.ko
-+ mhz = GetLastInt(res);
- return(mhz);
- }
-
diff --git a/math/atlas-devel/files/patch-tune+sysinfo+L1CacheSize.c b/math/atlas-devel/files/patch-tune+sysinfo+L1CacheSize.c
deleted file mode 100644
index f93ac6da884f..000000000000
--- a/math/atlas-devel/files/patch-tune+sysinfo+L1CacheSize.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- tune/sysinfo/L1CacheSize.c.orig Tue Dec 19 06:48:02 2006
-+++ tune/sysinfo/L1CacheSize.c Wed Dec 27 12:43:59 2006
-@@ -31,7 +31,7 @@
- #include <stdio.h>
- #include <stdlib.h>
-
--#define REPS 4096
-+#define REPS 12288
-
- #ifndef time00
- #define time00 ATL_cputime
-@@ -267,7 +267,7 @@
-
- main(int nargs, char *args[])
- {
-- int L1Size, MaxSize=64, correct=1;
-+ int L1Size, MaxSize=256, correct=1;
- FILE *L1f;
-
- if (nargs > 2)
diff --git a/math/atlas-devel/files/thread-patch b/math/atlas-devel/files/thread-patch
deleted file mode 100644
index 8dc50b6dbf7a..000000000000
--- a/math/atlas-devel/files/thread-patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- CONFIG/src/SpewMakeInc.c~ 2009-04-13 17:52:14.000000000 +0900
-+++ CONFIG/src/SpewMakeInc.c 2009-04-13 17:53:05.000000000 +0900
-@@ -423,7 +423,8 @@
- &srcdir, &blddir, &USEDEFL1, &USEARCHDEF, &LATUNE, &nof77,
- &f2cdefs, &cdefs, &pmake, &flapack, &smaflags, &dmaflags,
- &f77lib, &LAsrcd, &l2size, &targ);
-- if (ncpu > 1) THREADS = 1;
-+/* if (ncpu > 1) THREADS = 1; */
-+ THREADS = 1;
- if (!outfile)
- fpout = stdout;
- else