Attachment #24412 for bug #41770

View | Details | Raw Unified | Return to bug 41770
Collapse All | Expand All

Lines 20-25 Link Here

(-)atlas/Makefile (+12 lines)
20	USE_BZIP2= yes	20	USE_BZIP2= yes
21	WRKSRC= ${WRKDIR}/ATLAS	21	WRKSRC= ${WRKDIR}/ATLAS
22	INSTALLS_SHLIB= yes	22	INSTALLS_SHLIB= yes
		23	USE_REINPLACE= yes
		24
		25	.if (${MACHINE_ARCH} == "alpha")
		26	USE_GCC= 3.1
		27	.endif
23		28
24	do-configure:	29	do-configure:
25	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)	30	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
Lines 27-35 Link Here
27	.else	32	.else
28	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} config)	33	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} config)
29	.endif	34	.endif
		35	.if (${MACHINE_ARCH} == "alpha")
		36	@(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/alpha-patch)
		37	.endif
30		38
31	do-build:	39	do-build:
		40	.if (${MACHINE_ARCH} == "alpha") \|\| defined(USE_GCC)
		41	@${REINPLACE_CMD} -e 's\|/usr/bin/gcc\|${CC}\|g;' ${WRKSRC}/Make.`cat ${WRKSRC}/ARCHNAME`
		42	.endif
32	(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=`cat ${WRKSRC}/ARCHNAME`)	43	(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=`cat ${WRKSRC}/ARCHNAME`)
		44	(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} sanity_test arch=`cat ${WRKSRC}/ARCHNAME`)
33	(cd ${WRKSRC}; ${MKDIR} tmp ; \	45	(cd ${WRKSRC}; ${MKDIR} tmp ; \
34	${CP} ${LOCALBASE}/lib/liblapack.a tmp ;\	46	${CP} ${LOCALBASE}/lib/liblapack.a tmp ;\
35	cd tmp ;\	47	cd tmp ;\

Line 0 Link Here

(-)atlas/files/alpha-patch (+9 lines)
	1	--- src/blas/gemm/GOTO/ATLU_usergemm.c~ Mon Jun 17 10:38:22 2002
	2	+++ src/blas/gemm/GOTO/ATLU_usergemm.c Sun Aug 18 10:41:19 2002
	3	@@ -1,5 +1,5 @@
	4	#include "atlas_misc.h"
	5	-#include <sys/mman.h>
	6	+/#include <sys/mman.h>/
	7
	8	#ifdef EV6
	9	#ifdef ATL_OS_OSF1




--- config.c.orig	Mon Jun 17 10:37:24 2002
+++ config.c	Sun Aug 18 03:11:24 2002
@@ -692,7 +692,7 @@
          else if (mach == IA64Itan || MachIsUS(mach) ||
                   mach == Dec21164 || mach == Dec21264)
          {
-            if (major == 3)
+            if ((major == 2 && minor < 96) || (major == 3)) /* Nasty hack for FreeBSD/Alpha STABLE */
             {
                strcpy(goodgcc, files[i]);
                return(0);
@@ -2040,7 +2040,10 @@
          if (!CmndOneLine(targ, "sysctl hw.model", ln))
          {
             if (strstr(ln, "433au")) mach = Dec21164;
+            else if (strstr(ln, "500au")) mach = Dec21164;
+            else if (strstr(ln, "AlphaPC 164")) mach = Dec21164;
             else if (strstr(ln, "XP1000")) mach = Dec21264;
+            else mach = Dec21264;
          }
          break;
       case LAIA64: /* don't know */
@@ -2049,12 +2052,14 @@
          if (!CmndOneLine(targ, "sysctl hw.model", ln))
          {
             if (strstr(ln, "Pentium Pro")) mach = IntPPRO;

             else if (strstr(ln, "Athlon")) mach = AmdAthlon;
             else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
             else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX; /* sent by */
-            else if (strstr(ln, "Pentium")) mach=IntP5;       /* Nakata Maho */
+            else if (strstr(ln, "Pentium")) mach = IntP5;       /* Nakata Maho */
+            else mach = IntP5;
          }
          break;
       default:;
@@ -3024,6 +3029,9 @@
    }
    if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe");
 




IT SIGNIFICANTLY IMPROVES PERFORMANCE. 

If you use blas, you can simply change flags when linking,
from -lblas to -lf77blas -latlas (order is important).
get a significantly performance increase.

A few routines from LAPACK are merged into one library as libalapack.
It requres both C and Fortran77 interfaces, and thus that link line would be:
-lalapack -lf77blas -lcblas -latlas -lg2c -lm .

Other choice of CC and CFLAGS are *NOT* recommended.
They are already optimized for this platform and automatically searched.

WWW: http://math-atlas.sourceforge.net/
- NAKATA, Maho
  E-mail: chat95@mbox.kyoto-inet.or.jp

Return to bug 41770

Lines 1-6 Link Here

(-)atlas/files/patch-aa (-6 / +27 lines)
1	--- config.c.orig Mon Jun 17 09:37:24 2002	1	--- config.c.orig Mon Jun 17 10:37:24 2002
2	+++ config.c Mon Jul 15 18:39:46 2002	2	+++ config.c Sun Aug 18 03:11:24 2002
3	@@ -2049,12 +2049,14 @@	3	@@ -692,7 +692,7 @@
		4	else if (mach == IA64Itan \|\| MachIsUS(mach) \|\|
		5	mach == Dec21164 \|\| mach == Dec21264)
		6	{
		7	- if (major == 3)
		8	+ if ((major == 2 && minor < 96) \|\| (major == 3)) /* Nasty hack for FreeBSD/Alpha STABLE */
		9	{
		10	strcpy(goodgcc, files[i]);
		11	return(0);
		12	@@ -2040,7 +2040,10 @@
		13	if (!CmndOneLine(targ, "sysctl hw.model", ln))
		14	{
		15	if (strstr(ln, "433au")) mach = Dec21164;
		16	+ else if (strstr(ln, "500au")) mach = Dec21164;
		17	+ else if (strstr(ln, "AlphaPC 164")) mach = Dec21164;
		18	else if (strstr(ln, "XP1000")) mach = Dec21264;
		19	+ else mach = Dec21264;
		20	}
		21	break;
		22	case LAIA64: /* don't know */
		23	@@ -2049,12 +2052,14 @@
4	if (!CmndOneLine(targ, "sysctl hw.model", ln))	24	if (!CmndOneLine(targ, "sysctl hw.model", ln))
5	{	25	{
6	if (strstr(ln, "Pentium Pro")) mach = IntPPRO;	26	if (strstr(ln, "Pentium Pro")) mach = IntPPRO;
Lines 10-21 Link Here
10	else if (strstr(ln, "Athlon")) mach = AmdAthlon;	30	else if (strstr(ln, "Athlon")) mach = AmdAthlon;
11	else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;	31	else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
12	else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX; /* sent by */	32	else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX; /* sent by */
13	else if (strstr(ln, "Pentium")) mach=IntP5; /* Nakata Maho */	33	- else if (strstr(ln, "Pentium")) mach=IntP5; /* Nakata Maho */
14	+ else mach=IntP5;	34	+ else if (strstr(ln, "Pentium")) mach = IntP5; /* Nakata Maho */
		35	+ else mach = IntP5;
15	}	36	}
16	break;	37	break;
17	default:;	38	default:;
18	@@ -3024,6 +3026,9 @@	39	@@ -3024,6 +3029,9 @@
19	}	40	}
20	if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe");	41	if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe");
21		42

Lines 11-24 Link Here

(-)atlas/pkg-descr (-6 / +5 lines)
11	IT SIGNIFICANTLY IMPROVES PERFORMANCE.	11	IT SIGNIFICANTLY IMPROVES PERFORMANCE.
12		12
13	If you use blas, you can simply change flags when linking,	13	If you use blas, you can simply change flags when linking,
14	from -lblas to -lf77blas -latlas (order is important)	14	from -lblas to -lf77blas -latlas (order is important).
15	get a significantly performance increase.
16		15
17	A few routines from LAPACK are merged into one library as libalapack.	16	A few routines from LAPACK are merged into one library as libalapack.
18	It requres both C and Fortran77 interfaces, and thus that link line would be:	17	It requres both C and Fortran77 interfaces, and thus that link line would be:
19	-lalapack -lf77blas -lcblas -latlas -lg2c -lm	18	-lalapack -lf77blas -lcblas -latlas -lg2c -lm .
20	Order is important, so -latlas -lcblas will not work.	19
		20	Other choice of CC and CFLAGS are NOT recommended.
		21	They are already optimized for this platform and automatically searched.
21		22
22	WWW: http://math-atlas.sourceforge.net/	23	WWW: http://math-atlas.sourceforge.net/
23	- NAKATA, Maho
24	E-mail: chat95@mbox.kyoto-inet.or.jp