Commit 80e1bfb0 authored by Thomas Watson's avatar Thomas Watson Committed by Rick van Schijndel
Browse files

zfp: 0.5.5 -> 1.0.0, fix issues 

Remove examples as they have some common executable names likely to
cause conflicts, there is no way to properly install them, and they are
not particularly useful. Remove now-unnecessary installation hacks.

Disable the long tests as they are just bigger versions of the short
tests and end up being pretty slow.

Build CUDA kernels for all GPUs to avoid issues at runtime.
parent 507da9f2

pkgs/tools/compression/zfp/default.nix

+13 −17
Original line number Diff line number Diff line 
{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform

, enableCfp ? true

, enableCuda ? false

, enableExamples ? true

, enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms

, enableOpenMP ? true

, enablePython ? true
@@ -9,13 +8,13 @@ 


stdenv.mkDerivation rec {

  pname = "zfp";

  version = "0.5.5";

  version = "1.0.0";



  src = fetchFromGitHub {

    owner = "LLNL";

    repo = "zfp";

    rev = version;

    sha256 = "19ycflz35qsrzfcvxdyy0mgbykfghfi9y5v684jb4awjp7nf562c";

    sha256 = "sha256-E2LI1rWo1HO5O/sxPHAmLDs3Z5xouzlgMj11rQFPNYQ=";

  };



  nativeBuildInputs = [ cmake ];
@@ -25,27 +24,24 @@ stdenv.mkDerivation rec { 
    ++ lib.optional enableOpenMP llvmPackages.openmp

    ++ lib.optionals enablePython (with python3Packages; [ cython numpy python ]);



  # compile CUDA code for all extant GPUs so the binary will work with any GPU

  # and driver combination. to be ultimately solved upstream:

  # https://github.com/LLNL/zfp/issues/178

  # NB: not in cmakeFlags due to https://github.com/NixOS/nixpkgs/issues/114044

  preConfigure = lib.optionalString enableCuda ''

    cmakeFlagsArray+=(

      "-DCMAKE_CUDA_FLAGS=-gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_87,code=sm_87 -gencode=arch=compute_86,code=compute_86"

    )

  '';



  cmakeFlags = [

    # More tests not enabled by default

    ''-DZFP_BINARY_DIR=${placeholder "out"}''

    ''-DZFP_BUILD_TESTING_LARGE=ON''

  ]

    ++ lib.optionals targetPlatform.isDarwin [

      "-DCMAKE_INSTALL_BINDIR=bin"

      "-DCMAKE_INSTALL_LIBDIR=lib"

    ]

    ++ lib.optional enableCfp "-DBUILD_CFP=ON"

  ] ++ lib.optional enableCfp "-DBUILD_CFP=ON"

    ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON"

    ++ lib.optional enableExamples "-DBUILD_EXAMPLES=ON"

    ++ lib.optional enableFortran "-DBUILD_ZFORP=ON"

    ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON"

    ++ lib.optional enablePython "-DBUILD_ZFPY=ON"

    ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]);



  preCheck = lib.optional targetPlatform.isDarwin ''

    export DYLD_LIBRARY_PATH="$out/lib:$DYLD_LIBRARY_PATH"

  '';



  doCheck = true;



  meta = with lib; {