diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-10 15:07:12 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-10 15:07:12 -0600 |
| commit | d676e059d72129c26f76746f8a8bfab761aca696 (patch) | |
| tree | 85f60709f548e9933dd95406b8d92539041bf670 /pkgs/applications/science/chemistry | |
| parent | b1ae965cda091b14fd37c86d783ae11e836d02e0 (diff) | |
| parent | a68655c5eb93bc593f23a16b64a63edf9d2d9d21 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/science/chemistry')
| -rw-r--r-- | pkgs/applications/science/chemistry/cp2k/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 052d791c0bb72..bb306fa322fee 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -37,11 +37,7 @@ # and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems , gpuVersion ? "Mi100" , gpuArch ? "gfx908" -, rocm-core -, hip -, hipblas -, hipfft -, rocblas +, rocmPackages }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; @@ -86,7 +82,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableElpa elpa ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optional (gpuBackend == "rocm") [hip rocm-core hipblas hipfft rocblas] + ++ lib.optional (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocm-core + rocmPackages.hipblas + rocmPackages.hipfft + rocmPackages.rocblas + ] ; propagatedBuildInputs = [ mpi ]; @@ -126,7 +128,7 @@ stdenv.mkDerivation rec { ${lib.strings.optionalString (gpuBackend == "rocm") '' GPUVER = ${gpuVersion} OFFLOAD_CC = hipcc - OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocm-core} + OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocmPackages.rocm-core} OFFLOAD_TARGET = hip CXX = mpicxx CXXFLAGS = -std=c++11 -fopenmp -D__HIP_PLATFORM_AMD__ |