diff options
| author | Jonathon Anderson <17242663+blue42u@users.noreply.github.com> | 2023-04-18 15:41:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 15:41:18 -0500 |
| commit | c7232f4505a86b3bfd6b3600d99d269ac0b47a3a (patch) | |
| tree | 8de87211ca9b1c7263ed2f72e149560fcc509596 | |
| parent | 08fd8c8d0afbf48551e19cc58083c5817a7d0617 (diff) | |
| download | spack-c7232f4505a86b3bfd6b3600d99d269ac0b47a3a.tar.gz spack-c7232f4505a86b3bfd6b3600d99d269ac0b47a3a.tar.bz2 spack-c7232f4505a86b3bfd6b3600d99d269ac0b47a3a.tar.xz spack-c7232f4505a86b3bfd6b3600d99d269ac0b47a3a.zip | |
lammps: backport fix for `+rocm+kokkos+kspace` (#36850)
* lammps: backport hipfft fix for ROCm-based builds
* lammps: Mark incompatibility with Kokkos 4.x for old versions
| -rw-r--r-- | var/spack/repos/builtin/packages/lammps/package.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index b7534bef42..890adce43c 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -642,6 +642,21 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage): ) conflicts("+intel", when="%aocc@:3.2.9999", msg="+intel with AOCC requires version 4 or newer") + # Backport of https://github.com/lammps/lammps/pull/3726 + conflicts("+kokkos+rocm+kspace", when="@:20210929.3") + patch( + "https://github.com/lammps/lammps/commit/ebb8eee941e52c98054fdf96ea78ee4d5f606f47.patch?full_index=1", + sha256="3dedd807f63a21c543d1036439099f05c6031fd98e7cb1ea7825822fc074106e", + when="@20220623.3:20230208 +kokkos +rocm +kspace", + ) + + # Older LAMMPS does not compile with Kokkos 4.x + conflicts( + "^kokkos @4:", + when="@:20221222", + msg="LAMMPS is incompatible with Kokkos 4.x until @20230208", + ) + patch("lib.patch", when="@20170901") patch("660.patch", when="@20170922") patch("gtest_fix.patch", when="@:20210310 %aocc@3.2.0") |