From 47bdb5f2ee9a6093911f3b3c035f99e057811d68 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 25 Sep 2019 11:21:43 +0200 Subject: [PATCH 1/3] fflas-ffpack: disable all avx versions by default To fix a transient failure on hydra. See https://github.com/linbox-team/fflas-ffpack/issues/284 for more details. --- .../libraries/fflas-ffpack/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index d46d997f644..0636d2ecfc6 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -30,14 +30,15 @@ stdenv.mkDerivation rec { "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; + # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; From cc625cfba4359a35c21b3e74ad42391f4d56fc46 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 25 Sep 2019 11:29:19 +0200 Subject: [PATCH 2/3] fflas-ffpack: add timokau as a maintainer I'm interested in this package as a dependency of sage and therefore would like ofBorg to notify me on changes. --- pkgs/development/libraries/fflas-ffpack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 0636d2ecfc6..b7d5d79544e 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -43,12 +43,12 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { inherit version; description = ''Finite Field Linear Algebra Subroutines''; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ raskin timokau ]; + platforms = platforms.unix; homepage = https://linbox-team.github.io/fflas-ffpack/; }; } From 030d44f6934767ffbb70e66cad06d6fd87f2dea0 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 25 Sep 2019 11:38:33 +0200 Subject: [PATCH 3/3] fflas-ffpack_1: remove No longer used in nixpkgs, so we can clean it up. --- pkgs/development/libraries/fflas-ffpack/1.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/fflas-ffpack/1.nix diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix deleted file mode 100644 index 4a276db12c0..00000000000 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}: -stdenv.mkDerivation rec { - pname = "fflas-ffpack"; - version = "1.6.0"; - src = fetchurl { - url = "http://linalg.org/fflas-ffpack-${version}.tar.gz"; - sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9"; - }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ givaro_3_7 openblas gmpxx]; - configureFlags = [ - "--with-blas=-lopenblas" - "--with-gmp=${gmpxx.dev}" - "--with-givaro=${givaro_3_7}" - ]; - meta = { - inherit version; - description = ''Finite Field Linear Algebra Subroutines''; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = https://linbox-team.github.io/fflas-ffpack/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd3bc17f4f0..2d1df5b66dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10715,7 +10715,6 @@ in blas = if stdenv.isDarwin then blas else openblas; }; - fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {}; linbox = callPackage ../development/libraries/linbox { # We need to use blas instead of openblas on darwin, see # https://github.com/NixOS/nixpkgs/pull/45013 and