diff options
| author | Madoura <madouura@gmail.com> | 2023-10-05 16:58:02 -0500 |
|---|---|---|
| committer | Madoura <madouura@gmail.com> | 2023-10-09 17:03:19 -0500 |
| commit | e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9 (patch) | |
| tree | 8a37c8744b64f239268d840a8c143e918c4dd470 /pkgs/by-name/sp | |
| parent | 6f39d63688276f1953fc1ca3afa16d8bbb7a301d (diff) | |
| download | nixlib-e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9.tar nixlib-e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9.tar.gz nixlib-e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9.tar.bz2 nixlib-e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9.tar.lz nixlib-e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9.tar.xz nixlib-e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9.tar.zst nixlib-e6f88a9a824ad8a34bf9d501aa45b0883a4a80c9.zip | |
rocm-related: fixup for ROCm 5.7.0
blender: fixup for ROCm 5.7.0 opensycl: fixup for ROCm 5.7.0 magma: fixup for ROCm 5.7.0 torch: fixup for ROCm 5.7.0 cp2k: fixup for ROCm 5.7.0 sirius: fixup for ROCm 5.7.0 spfft: fixup for ROCm 5.7.0 spla: fixup for ROCm 5.7.0
Diffstat (limited to 'pkgs/by-name/sp')
| -rw-r--r-- | pkgs/by-name/sp/spfft/package.nix | 13 | ||||
| -rw-r--r-- | pkgs/by-name/sp/spla/package.nix | 9 |
2 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/by-name/sp/spfft/package.nix b/pkgs/by-name/sp/spfft/package.nix index dcc43ccd2446..72ae473d14a5 100644 --- a/pkgs/by-name/sp/spfft/package.nix +++ b/pkgs/by-name/sp/spfft/package.nix @@ -8,9 +8,7 @@ , llvmPackages , gpuBackend ? "none" , cudaPackages -, hip -, rocfft -, hipfft +, rocmPackages }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; @@ -35,8 +33,11 @@ stdenv.mkDerivation rec { fftw ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optionals (gpuBackend == "rocm") [ hip rocfft hipfft ] - ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optionals (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocfft + rocmPackages.hipfft + ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp ; propagatedBuildInputs = [ mpi ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional (gpuBackend == "cuda") "-DSPFFT_GPU_BACKEND=CUDA" ++ lib.optionals (gpuBackend == "rocm") [ "-DSPFFT_GPU_BACKEND=ROCM" - "-DHIP_ROOT_DIR=${hip}" + "-DHIP_ROOT_DIR=${rocmPackages.clr}" ]; diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix index 3143fbeb7316..1f8abde4b723 100644 --- a/pkgs/by-name/sp/spla/package.nix +++ b/pkgs/by-name/sp/spla/package.nix @@ -8,8 +8,7 @@ , llvmPackages , gpuBackend ? "none" , cudaPackages -, hip -, rocblas +, rocmPackages }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; @@ -39,8 +38,10 @@ stdenv.mkDerivation rec { blas ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optionals (gpuBackend == "rocm") [ hip rocblas rocblas ] - ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optionals (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocblas + ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp ; propagatedBuildInputs = [ mpi ]; |