atlas: WIP of upgrade to 3.10.2 (stable release)
This commit is contained in:
Kamil Rytarowski
parent
4e389ce85a
commit
5472b151fe
|
|
@ -1,9 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.12 2013/09/14 23:46:50 asau Exp $
|
||||
|
||||
ATLAS_VERSION= 3.11.11
|
||||
|
||||
DISTNAME= atlas${ATLAS_VERSION}
|
||||
PKGNAME= atlas-${ATLAS_VERSION}
|
||||
DISTNAME= atlas3.10.2
|
||||
PKGNAME= ${DISTNAME:C/atlas/atlas-/}
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=math-atlas/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
|
@ -19,15 +17,19 @@ HAS_CONFIGURE= yes
|
|||
|
||||
MAKE_JOBS_SAFE= no
|
||||
|
||||
PKGSRC_FORTRAN= gfortran
|
||||
USE_LANGUAGES= c fortran77
|
||||
USE_TOOLS+= gmake
|
||||
|
||||
CONFIGURE_DIRS= obj
|
||||
CONFIGURE_SCRIPT= ../configure
|
||||
CONFIGURE_ARGS+= --incdir=${DESTDIR}${PREFIX}/include
|
||||
CONFIGURE_ARGS+= --libdir=${DESTDIR}${PREFIX}/lib
|
||||
CONFIGURE_ARGS+= -b 32
|
||||
CONFIGURE_ARGS+= -t ${MAKE_JOBS}
|
||||
|
||||
TEST_TARGET= check
|
||||
BUILD_TAGET= build shared ptshared
|
||||
|
||||
pre-configure:
|
||||
${RUN} cd ${WRKSRC}; mkdir ${CONFIGURE_DIRS}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.7 2013/09/14 23:46:50 asau Exp $
|
||||
|
||||
SHA1 (atlas3.11.11.tar.bz2) = 8e26a499606762464b70d09df6915fa9b9e3d687
|
||||
RMD160 (atlas3.11.11.tar.bz2) = 6b9895301becdf1ef35c7951c40672119256fe78
|
||||
Size (atlas3.11.11.tar.bz2) = 5238482 bytes
|
||||
SHA1 (atlas3.10.2.tar.bz2) = f1f883e201d70ff60d54a2af016b4afc83a2499b
|
||||
RMD160 (atlas3.10.2.tar.bz2) = af4099e8bb65f5d771618ca1580f5bc8210f83fe
|
||||
SHA512 (atlas3.10.2.tar.bz2) = 9fe04cfa1f89449db047d1a4659a656964d13117c783cbbe43344eb32555736f037d9cd30c5ae1514c08ad5b8949a3982d7fe102d707ddb62288e76b2607fbb1
|
||||
Size (atlas3.10.2.tar.bz2) = 4904923 bytes
|
||||
SHA1 (patch-CONFIG_src_Makefile) = b62d96b61d6bd16c9a214076e9260f4f6064e04a
|
||||
SHA1 (patch-CONFIG_src_backend_Make.ext) = 9b3140112d4db1646446f564a9efb1d6a72ea457
|
||||
SHA1 (patch-CONFIG_src_backend_archinfo__netbsd.c) = f611ef725eb8e6ff1c8fe24c15f2d2d3d25c2cbc
|
||||
SHA1 (patch-aa) = 1cfe4f7ad66ec006a2d6ee9186d1d91b9d656c44
|
||||
SHA1 (patch-ab) = 45a535eb378de2cfcc4cf64e5f76d0ae0fc28a0f
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
$NetBSD$
|
||||
|
||||
--- CONFIG/src/Makefile.orig 2014-07-10 16:22:02.000000000 +0000
|
||||
+++ CONFIG/src/Makefile
|
||||
@@ -381,6 +381,11 @@ IRunArchInfo_freebsd: xarchinfo_freebsd
|
||||
$(MAKE) $(atlrun) atldir=$(mydir) exe=xarchinfo_freebsd args="$(args)" \
|
||||
redir=config0.out
|
||||
- cat config0.out
|
||||
+IRunArchInfo_freebsd: xarchinfo_netbsd
|
||||
+ - rm -f config0.out
|
||||
+ $(MAKE) $(atlrun) atldir=$(mydir) exe=xarchinfo_netbsd args="$(args)" \
|
||||
+ redir=config0.out
|
||||
+ - cat config0.out
|
||||
IRunArchInfo_linux: xarchinfo_linux
|
||||
- rm -f config0.out
|
||||
$(MAKE) $(atlrun) atldir=$(mydir) exe=xarchinfo_linux args="$(args)" \
|
||||
@@ -412,6 +417,9 @@ xarchinfo_sunos : $(SRCdir)/backend/arch
|
||||
xarchinfo_freebsd : $(SRCdir)/backend/archinfo_freebsd.c atlconf_misc_BE.o
|
||||
$(CC) $(CCFLAGS) -o xarchinfo_freebsd $(SRCdir)/backend/archinfo_freebsd.c \
|
||||
atlconf_misc_BE.o
|
||||
+xarchinfo_netbsd : $(SRCdir)/backend/archinfo_netbsd.c atlconf_misc_BE.o
|
||||
+ $(CC) $(CCFLAGS) -o xarchinfo_netbsd $(SRCdir)/backend/archinfo_netbsd.c \
|
||||
+ atlconf_misc_BE.o
|
||||
xarchinfo_linux : $(SRCdir)/backend/archinfo_linux.c atlconf_misc_BE.o
|
||||
$(CC) $(CCFLAGS) -o xarchinfo_linux $(SRCdir)/backend/archinfo_linux.c \
|
||||
atlconf_misc_BE.o
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD$
|
||||
|
||||
--- CONFIG/src/backend/Make.ext.orig 2014-07-10 16:22:02.000000000 +0000
|
||||
+++ CONFIG/src/backend/Make.ext
|
||||
@@ -137,6 +137,8 @@ archinfo_linux.c : $(basA)
|
||||
$(extC) -b $(basA) -o archinfo_linux.c rout=archinfo_linux
|
||||
archinfo_freebsd.c : $(basA)
|
||||
$(extC) -b $(basA) -o archinfo_freebsd.c rout=archinfo_freebsd
|
||||
+archinfo_netbsd.c : $(basA)
|
||||
+ $(extC) -b $(basA) -o archinfo_netbsd.c rout=archinfo_netbsd
|
||||
archinfo_sunos.c : $(basA)
|
||||
$(extC) -b $(basA) -o archinfo_sunos.c rout=archinfo_sunos
|
||||
archinfo_irix.c : $(basA)
|
||||
|
|
@ -0,0 +1,284 @@
|
|||
$NetBSD$
|
||||
|
||||
--- CONFIG/src/backend/archinfo_netbsd.c.orig 2016-07-04 21:48:40.614798806 +0000
|
||||
+++ CONFIG/src/backend/archinfo_netbsd.c
|
||||
@@ -0,0 +1,279 @@
|
||||
+#include "atlconf.h"
|
||||
+
|
||||
+void PrintUsage(char *name, int i)
|
||||
+{
|
||||
+ fprintf(stderr, "USAGE: %s -v (verb) -b (@ bits) -a (arch) -n (ncpu) -c <ncache> -C <lvl> (cache size) -m (Mhz) -t (cpu throttling)\n", name);
|
||||
+ exit(i);
|
||||
+}
|
||||
+
|
||||
+int GetFlags(int nargs, char **args, int *CacheLevel)
|
||||
+{
|
||||
+ int i, flag = 0;
|
||||
+
|
||||
+ *CacheLevel = 0;
|
||||
+ for (i=1; i < nargs; i++)
|
||||
+ {
|
||||
+ if (args[i][0] != '-') PrintUsage(args[0], i);
|
||||
+ switch(args[i][1])
|
||||
+ {
|
||||
+ case 'n':
|
||||
+ flag |= Pncpu;
|
||||
+ break;
|
||||
+ case 'c':
|
||||
+ flag |= Pncache;
|
||||
+ break;
|
||||
+ case 'C':
|
||||
+ if (++i > nargs)
|
||||
+ PrintUsage(args[0], i);
|
||||
+ *CacheLevel = atoi(args[i]);
|
||||
+ break;
|
||||
+ case 'v':
|
||||
+ flag |= Pverb;
|
||||
+ break;
|
||||
+ case 'm':
|
||||
+ flag |= PMhz;
|
||||
+ break;
|
||||
+ case 'a':
|
||||
+ flag |= Parch;
|
||||
+ break;
|
||||
+ case 'b':
|
||||
+ flag |= P64;
|
||||
+ break;
|
||||
+ case 't':
|
||||
+ flag |= Pthrottle;
|
||||
+ break;
|
||||
+ default:
|
||||
+ PrintUsage(args[0], i);
|
||||
+ }
|
||||
+ }
|
||||
+ if (!flag)
|
||||
+ flag = Parch | P64;
|
||||
+ return(flag);
|
||||
+}
|
||||
+
|
||||
+enum MACHTYPE ProbeArch()
|
||||
+{
|
||||
+ enum ARCHFAM fam;
|
||||
+ enum MACHTYPE mach=MACHOther;
|
||||
+ int ierr, i;
|
||||
+ char *res;
|
||||
+
|
||||
+ fam = ProbeArchFam(NULL);
|
||||
+ switch(fam)
|
||||
+ {
|
||||
+ case AFPPC: /* don't know */
|
||||
+ res = atlsys_1L(NULL, "sysctl hw.model", 0, 0);
|
||||
+ if (res)
|
||||
+ {
|
||||
+ if (strstr(res, "PowerMac"))
|
||||
+ {
|
||||
+ if (strstr(res,"c1,2")||strstr(res,"c3,1")||strstr(res,"c3,2")||
|
||||
+ strstr(res,"c3,3")||strstr(res,"c3,4")||strstr(res,"c3,5")||
|
||||
+ strstr(res,"c3,6")||strstr(res,"c4,2")||strstr(res,"c4,5")||
|
||||
+ strstr(res,"c5,1")||strstr(res,"c10,1"))
|
||||
+ mach = PPCG4;
|
||||
+ else if (strstr(res,"c11,2")|| strstr(res,"c12,1")||
|
||||
+ strstr(res,"c7,2") || strstr(res,"c7,3") ||
|
||||
+ strstr(res,"c8,1") || strstr(res,"c8,1") ||
|
||||
+ strstr(res,"c8,2") || strstr(res,"c9,1"))
|
||||
+ mach = PPCG5;
|
||||
+ }
|
||||
+ else if (strstr(res, "PowerBook"))
|
||||
+ {
|
||||
+ if (strstr(res,"k3,2") || strstr(res,"k3,3") || strstr(res,"k3,4")||
|
||||
+ strstr(res,"k3,5") || strstr(res,"k5,1") || strstr(res,"k5,2")||
|
||||
+ strstr(res,"k5,3") || strstr(res,"k5,4") || strstr(res,"k5,5")||
|
||||
+ strstr(res,"k5,6") || strstr(res,"k5,7") || strstr(res,"k5,8")||
|
||||
+ strstr(res,"k5,9") || strstr(res,"k6,1") || strstr(res,"k6,2")||
|
||||
+ strstr(res,"k6,3") || strstr(res,"k6,4") || strstr(res,"k6,5")||
|
||||
+ strstr(res,"k6,7") || strstr(res,"k6,8"))
|
||||
+ mach = PPCG4;
|
||||
+ }
|
||||
+ else if (strstr(res, "RackMac"))
|
||||
+ {
|
||||
+ if (strstr(res, "c1,1") || strstr(res, "c1,2"))
|
||||
+ mach = PPCG4;
|
||||
+ else if (strstr(res, "c3,1"))
|
||||
+ mach = PPCG5;
|
||||
+ }
|
||||
+ free(res);
|
||||
+ }
|
||||
+ break;
|
||||
+ case AFSPARC: /* don't know */
|
||||
+ break;
|
||||
+ case AFALPHA:
|
||||
+ #if 0
|
||||
+ res = atlsys_1L(NULL, "sysctl hw.model", 0, 0);
|
||||
+ if (res)
|
||||
+ {
|
||||
+ if (strstr(res, "433au")) mach = Dec21164;
|
||||
+ else if (strstr(res, "XP1000")) mach = Dec21264;
|
||||
+ free(res);
|
||||
+ }
|
||||
+ #endif
|
||||
+ break;
|
||||
+ case AFIA64: /* don't know */
|
||||
+ break;
|
||||
+ case AFX86:
|
||||
+ res = atlsys_1L(NULL, "sysctl hw.model", 0, 0);
|
||||
+ if (res)
|
||||
+ {
|
||||
+ if (strstr(res, "Pentium Pro")) mach = IntPPRO;
|
||||
+ 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, "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;
|
||||
+ free(res);
|
||||
+ }
|
||||
+ break;
|
||||
+ default:;
|
||||
+ }
|
||||
+ return(mach);
|
||||
+}
|
||||
+int ProbeNCPU()
|
||||
+{
|
||||
+ int ncpu = 0;
|
||||
+ char *res;
|
||||
+
|
||||
+ res = atlsys_1L(NULL, "sysctl hw.ncpu", 0, 0);
|
||||
+ if (res)
|
||||
+ {
|
||||
+ ncpu = GetLastInt(res);
|
||||
+ free(res);
|
||||
+ }
|
||||
+ return(ncpu);
|
||||
+}
|
||||
+
|
||||
+int ProbePointerBits(int *sure)
|
||||
+{
|
||||
+ int i;
|
||||
+ char *uname;
|
||||
+ char *cmnd, *res;
|
||||
+
|
||||
+ *sure = 0;
|
||||
+/*
|
||||
+ * This probe should be running on backend; if its ptr length is 8, we've
|
||||
+ * definitely got a 64 bit machine
|
||||
+ * NOTE: getting 4 could be a result of compiler flags on a 64-bit arch,
|
||||
+ * so reverse is not dispositive
|
||||
+ */
|
||||
+ if (sizeof(void*) == 8)
|
||||
+ {
|
||||
+ *sure = 1;
|
||||
+ return(64);
|
||||
+ }
|
||||
+
|
||||
+/*
|
||||
+ * Note this is a weak probe, archinfo_x86 much better . . .
|
||||
+ */
|
||||
+ uname = FindUname(NULL);
|
||||
+ i = strlen(uname) + 4;
|
||||
+ cmnd = malloc(sizeof(char)*i);
|
||||
+ assert(cmnd);
|
||||
+ sprintf(cmnd, "%s -a", uname);
|
||||
+
|
||||
+ res = atlsys_1L(NULL, cmnd, 0, 0);
|
||||
+ free(cmnd);
|
||||
+ if (res)
|
||||
+ {
|
||||
+/*
|
||||
+ * If uname is a known 64-bit platform, we're sure we've got OS support
|
||||
+ * for 64bits (may not have compiler support, but that's not our fault)
|
||||
+ */
|
||||
+ if (strstr(res, "x86_64") || strstr(res, "ppc64") || strstr(res, "ia64"))
|
||||
+ {
|
||||
+ *sure = 1;
|
||||
+ free(res);
|
||||
+ return(64);
|
||||
+ }
|
||||
+ free(res);
|
||||
+ }
|
||||
+ return(32);
|
||||
+}
|
||||
+
|
||||
+int ProbeMhz()
|
||||
+{
|
||||
+ int mhz=0;
|
||||
+ char *res;
|
||||
+ res = atlsys_1L(NULL, "sysctl hw.cpufrequency", 0, 0);
|
||||
+ if (res)
|
||||
+ {
|
||||
+ mhz = GetFirstDouble(res) / 1000000;
|
||||
+ free(res);
|
||||
+ }
|
||||
+ else if ((res=atlsys_1L(NULL, "sysctl hw.clockrate", 0, 0)))
|
||||
+ {
|
||||
+ mhz = GetFirstDouble(res);
|
||||
+ free(res);
|
||||
+ }
|
||||
+ return(mhz);
|
||||
+}
|
||||
+
|
||||
+int ProbeThrottle()
|
||||
+/*
|
||||
+ * RETURNS: 1 if cpu throttling is detected, 0 otherwise
|
||||
+ */
|
||||
+{
|
||||
+ int iret=0;
|
||||
+ int imax=0, imin=0, icur=0;
|
||||
+ char *res;
|
||||
+
|
||||
+ res = atlsys_1L(NULL, "sysctl hw.cpufrequency_max", 0, 0);
|
||||
+ if (res)
|
||||
+ {
|
||||
+ imax = GetFirstInt(res);
|
||||
+ free(res);
|
||||
+ }
|
||||
+ res = atlsys_1L(NULL, "sysctl hw.cpufrequency_min", 0, 0);
|
||||
+ if (res)
|
||||
+ {
|
||||
+ imin = GetFirstInt(res);
|
||||
+ free(res);
|
||||
+ }
|
||||
+ if (imax)
|
||||
+ {
|
||||
+ if (imax != imin)
|
||||
+ iret = 1;
|
||||
+ }
|
||||
+ return(iret);
|
||||
+}
|
||||
+
|
||||
+main(int nargs, char **args)
|
||||
+{
|
||||
+ int flags, CacheLevel, ncpu, mhz, bits, sure;
|
||||
+ enum MACHTYPE arch=MACHOther;
|
||||
+
|
||||
+ flags = GetFlags(nargs, args, &CacheLevel);
|
||||
+ if (flags & Parch)
|
||||
+ {
|
||||
+ arch = ProbeArch();
|
||||
+ if (flags & Pverb)
|
||||
+ printf("Architecture detected as %s.\n", machnam[arch]);
|
||||
+ printf("MACHTYPE=%d\n", arch);
|
||||
+ }
|
||||
+ if (flags & Pncpu)
|
||||
+ printf("NCPU=%d\n", ProbeNCPU());
|
||||
+ if (flags & PMhz)
|
||||
+ printf("CPU MHZ=%d\n", ProbeMhz());
|
||||
+ if (flags & Pthrottle)
|
||||
+ printf("CPU THROTTLE=%d\n", ProbeThrottle());
|
||||
+ if (flags & P64)
|
||||
+ {
|
||||
+ bits = ProbePointerBits(&sure);
|
||||
+ printf("PTR BITS=%d, SURE=%d\n", bits, sure);
|
||||
+ }
|
||||
+
|
||||
+/*
|
||||
+ * Here for future, presently unsupported
|
||||
+ */
|
||||
+ if (flags & Pncache)
|
||||
+ printf("NCACHES=0\n");
|
||||
+ if (flags & PCacheSize)
|
||||
+ printf("%d Cache size (kb) = 0\n", CacheLevel);
|
||||
+ exit(0);
|
||||
+}
|
||||
Loading…
Reference in New Issue