public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atlas: update to version 3.10.1

Browse Source 
This patch fixes issue #297.
This commit is contained in:
Peter Simons 2013-02-06 11:31:49 +01:00
parent f921baec94
commit 3334f33daf
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/science/math/atlas/default.nix
View File

@ -1,27 +1,32 @@
{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }: { stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }:
let let
version = "3.10.1";
optionalString = stdenv.lib.optionalString; optionalString = stdenv.lib.optionalString;
optional = stdenv.lib.optional;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "atlas-3.9.67"; name = "atlas-${version}";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2; url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; sha256 = "11ncgdc7kzb2y2gqb3sgarm5saj9fr07r3h2yh2h5bja429b85d2";
}; };
# Atlas aborts the build if it detects that some kind of CPU frequency
# scaling is active on the build machine because that feature offsets the
# performance timings. We ignore that check, however, because with binaries
# being pre-built on Hydra those timings aren't accurate for the local
# machine in the first place.
patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch;
# Configure outside of the source directory. # Configure outside of the source directory.
preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; preConfigure = '' mkdir build; cd build; configureScript=../configure; '';
# * -fPIC allows to build atlas inside shared objects, as octave does. # * -fPIC allows to build atlas inside shared objects, as octave does.
# #
# * Atlas aborts the build if it detects that some kind of CPU frequency
# scaling is active on the build machine because that feature offsets the
# performance timings. We ignore that check, however, because with binaries
# being pre-built on Hydra those timings aren't accurate for the local
# machine in the first place.
# * Atlas detects the cpu and does some tricks. For example, notices the # * Atlas detects the cpu and does some tricks. For example, notices the
# hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR) # hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR)
# available, for what I know, only in that family. So we hardcode K7 # available, for what I know, only in that family. So we hardcode K7
@ -33,7 +38,6 @@ stdenv.mkDerivation {
configureFlags = "-Fa alg -fPIC -t 0" configureFlags = "-Fa alg -fPIC -t 0"
+ optionalString stdenv.isi686 " -b 32 -A 18 -V 1" + optionalString stdenv.isi686 " -b 32 -A 18 -V 1"
+ optionalString stdenv.isx86_64 " -A 31 -V 192" + optionalString stdenv.isx86_64 " -A 31 -V 192"
+ optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"
+ optionalString shared " --shared " + optionalString shared " --shared "
; ;

22
pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch Normal file
View File

@ -0,0 +1,22 @@
diff -ubr ATLAS-orig/CONFIG/src/config.c ATLAS/CONFIG/src/config.c
--- ATLAS-orig/CONFIG/src/config.c 2013-02-06 11:23:47.078036878 +0100
+++ ATLAS/CONFIG/src/config.c 2013-02-06 11:24:16.481120888 +0100
@@ -711,17 +711,7 @@
int ProbeCPUThrottle(int verb, char *targarg, enum OSTYPE OS, enum ASMDIA asmb)
{
- int i, iret;
- char *ln;
- i = strlen(targarg) + 22 + 12;
- ln = malloc(i*sizeof(char));
- assert(ln);
- sprintf(ln, "%s -O %d -s %d -t", targarg, OS, asmb);
- iret = GetIntProbe(verb, ln, "arch", "CPU THROTTLE", 0);
- free(ln);
- if (iret) printf("CPU Throttling apparently enabled!\n");
- else printf("Cannot detect CPU throttling.\n");
- return(iret);
+ return 0;
}
char *NewAppendedString_SFLAG(char *old, char *flag, char *str)