Merge pull request #276917 from markuskowa/fix-elpa-cuda
elpa: 2023.05.001 -> 2023.11.001, fix CUDA build
This commit is contained in:
commit
22b588fd45
@ -11,7 +11,7 @@
|
|||||||
, enableCuda ? config.cudaSupport
|
, enableCuda ? config.cudaSupport
|
||||||
# type of GPU architecture
|
# type of GPU architecture
|
||||||
, nvidiaArch ? "sm_60"
|
, nvidiaArch ? "sm_60"
|
||||||
, cudatoolkit
|
, cudaPackages
|
||||||
} :
|
} :
|
||||||
|
|
||||||
assert blas.isILP64 == lapack.isILP64;
|
assert blas.isILP64 == lapack.isILP64;
|
||||||
@ -19,13 +19,13 @@ assert blas.isILP64 == scalapack.isILP64;
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "elpa";
|
pname = "elpa";
|
||||||
version = "2023.05.001";
|
version = "2023.11.001";
|
||||||
|
|
||||||
passthru = { inherit (blas) isILP64; };
|
passthru = { inherit (blas) isILP64; };
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz";
|
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 = [
|
patches = [
|
||||||
@ -43,10 +43,14 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputs = [ "out" "doc" "man" "dev" ];
|
outputs = [ "out" "doc" "man" "dev" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook perl ];
|
nativeBuildInputs = [ autoreconfHook perl ]
|
||||||
|
++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
|
||||||
|
|
||||||
buildInputs = [ mpi blas lapack scalapack ]
|
buildInputs = [ mpi blas lapack scalapack ]
|
||||||
++ lib.optional enableCuda cudatoolkit;
|
++ lib.optionals enableCuda [
|
||||||
|
cudaPackages.cuda_cudart
|
||||||
|
cudaPackages.libcublas
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export FC="mpifort"
|
export FC="mpifort"
|
||||||
|
Loading…
Reference in New Issue
Block a user