Unverified Commit 1e4909f2 authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #279660 from markuskowa/fix-spfft-sirius 

spfft,sirius: fix CUDA build
parents 94e7fbc6 81564851

pkgs/by-name/si/sirius/package.nix

+7 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec { 
    cmake

    gfortran

    pkg-config

  ];

  ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;



  buildInputs = [

    blas
@@ -72,8 +72,12 @@ stdenv.mkDerivation rec { 
    eigen

    libvdwxc

  ]

  ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit

  ++ lib.optionals (gpuBackend == "rocm") [

  ++ lib.optionals (gpuBackend == "cuda") [

    cudaPackages.cuda_cudart

    cudaPackages.cuda_profiler_api

    cudaPackages.cudatoolkit

    cudaPackages.libcublas

  ] ++ lib.optionals (gpuBackend == "rocm") [

    rocmPackages.clr

    rocmPackages.rocblas

  ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp

pkgs/by-name/sp/spfft/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    cmake

    gfortran

  ];

   ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;



  buildInputs = [

    fftw

  ]

  ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit

  ++ lib.optionals (gpuBackend == "rocm") [

  ] ++ lib.optionals (gpuBackend == "cuda") [

    cudaPackages.libcufft

    cudaPackages.cuda_cudart

  ] ++ lib.optionals (gpuBackend == "rocm") [

    rocmPackages.clr

    rocmPackages.rocfft

    rocmPackages.hipfft