diff options
| author | Mikael Simberg <mikael.simberg@iki.fi> | 2023-01-24 19:20:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 10:20:10 -0800 |
| commit | 909a5b1d8365066eaf76e4c3beace84ee3adb6e6 (patch) | |
| tree | c5ce39415c5c8fbf8ab8935de9d5964a4a9af161 | |
| parent | 9a0884bfed73e1cc0b89908d1d65d9740c616761 (diff) | |
| download | spack-909a5b1d8365066eaf76e4c3beace84ee3adb6e6.tar.gz spack-909a5b1d8365066eaf76e4c3beace84ee3adb6e6.tar.bz2 spack-909a5b1d8365066eaf76e4c3beace84ee3adb6e6.tar.xz spack-909a5b1d8365066eaf76e4c3beace84ee3adb6e6.zip | |
Add whip 0.1.0 and use in pika (#35073)
* Add whip 0.1.0
* Make pika depend on whip@0.1.0
Co-authored-by: msimberg <msimberg@users.noreply.github.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/pika/package.py | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/whip/package.py | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/pika/package.py b/var/spack/repos/builtin/packages/pika/package.py index 2b2f38507c..22cee1b58a 100644 --- a/var/spack/repos/builtin/packages/pika/package.py +++ b/var/spack/repos/builtin/packages/pika/package.py @@ -102,13 +102,14 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): depends_on("rocsolver", when="@0.5: +rocm") depends_on("tracy-client", when="+tracy") conflicts("tracy-client@0.9:", when="@:0.9") - depends_on("whip+rocm", when="@0.9: +rocm") - depends_on("whip+cuda", when="@0.9: +cuda") + depends_on("whip@0.1: +rocm", when="@0.9: +rocm") + depends_on("whip@0.1: +cuda", when="@0.9: +cuda") with when("+rocm"): for val in ROCmPackage.amdgpu_targets: depends_on( - "whip amdgpu_target={0}".format(val), when="@0.9: amdgpu_target={0}".format(val) + "whip@0.1: amdgpu_target={0}".format(val), + when="@0.9: amdgpu_target={0}".format(val), ) depends_on( "rocsolver amdgpu_target={0}".format(val), @@ -120,7 +121,9 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): with when("+cuda"): for val in CudaPackage.cuda_arch_values: - depends_on("whip cuda_arch={0}".format(val), when="@0.9: cuda_arch={0}".format(val)) + depends_on( + "whip@0.1: cuda_arch={0}".format(val), when="@0.9: cuda_arch={0}".format(val) + ) for cxxstd in cxxstds: depends_on("boost cxxstd={0}".format(map_cxxstd(cxxstd)), when="cxxstd={0}".format(cxxstd)) diff --git a/var/spack/repos/builtin/packages/whip/package.py b/var/spack/repos/builtin/packages/whip/package.py index 0947735ec6..d49bd2edd9 100644 --- a/var/spack/repos/builtin/packages/whip/package.py +++ b/var/spack/repos/builtin/packages/whip/package.py @@ -16,6 +16,7 @@ class Whip(CMakePackage, CudaPackage, ROCmPackage): maintainers = ["msimberg", "rasolca"] version("main", branch="main") + version("0.1.0", sha256="5d557794f4afc8332fc660948a342f69e22bc9e5d575ffb3e3944cf526db5ec9") depends_on("cmake@3.22:", type="build") |