Unverified Commit 22b588fd authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #276917 from markuskowa/fix-elpa-cuda 

elpa: 2023.05.001 -> 2023.11.001, fix CUDA build
parents 03993bc2 1615b8fb

pkgs/development/libraries/elpa/default.nix

+9 −5
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
, enableCuda ? config.cudaSupport

# type of GPU architecture

, nvidiaArch ? "sm_60"

, cudatoolkit

, cudaPackages

} :



assert blas.isILP64 == lapack.isILP64;
@@ -19,13 +19,13 @@ assert blas.isILP64 == scalapack.isILP64; 


stdenv.mkDerivation rec {

  pname = "elpa";

  version = "2023.05.001";

  version = "2023.11.001";



  passthru = { inherit (blas) isILP64; };



  src = fetchurl {

    url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz";

    sha256 = "sha256-7GS+XWUigQ1gGjuOajFyDjw+tK8zpDTYpkVw125kYrY=";

    sha256 = "sha256-tXvRl85nvbbiRRJOn9q4mz/a3dvTTYEu5JDVdH7npBA=";

  };



  patches = [
@@ -43,10 +43,14 @@ stdenv.mkDerivation rec { 


  outputs = [ "out" "doc" "man" "dev" ];



  nativeBuildInputs = [ autoreconfHook perl ];

  nativeBuildInputs = [ autoreconfHook perl ]

    ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];



  buildInputs = [ mpi blas lapack scalapack ]

    ++ lib.optional enableCuda cudatoolkit;

    ++ lib.optionals enableCuda [

      cudaPackages.cuda_cudart

      cudaPackages.libcublas

    ];



  preConfigure = ''

    export FC="mpifort"