diff options
| author | Mikael Simberg <mikael.simberg@iki.fi> | 2023-09-05 20:54:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 11:54:05 -0700 |
| commit | 12bc4cf0932837f1c8206c1525f961548561a6c3 (patch) | |
| tree | 6a91eae715bbc0fc926919974f067fde9a2c5756 | |
| parent | f8676db7f48bd3c470e3c4c165b92f59bdfb8428 (diff) | |
| download | spack-12bc4cf0932837f1c8206c1525f961548561a6c3.tar.gz spack-12bc4cf0932837f1c8206c1525f961548561a6c3.tar.bz2 spack-12bc4cf0932837f1c8206c1525f961548561a6c3.tar.xz spack-12bc4cf0932837f1c8206c1525f961548561a6c3.zip | |
umpire: Add 2022.10.0 (#37998)
* Add umpire 2022.10.0
* Add patches to umpire@2022.10.0
* Add axom 0.8.0 and 0.8.1
* Remove Umpire 2023.06.0
| -rw-r--r-- | var/spack/repos/builtin/packages/axom/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/umpire/package.py | 21 |
2 files changed, 23 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index cce186a564..ab3ca1d9c0 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -40,6 +40,8 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): version("main", branch="main") version("develop", branch="develop") + version("0.8.1", tag="v0.8.1", commit="0da8a5b1be596887158ac2fcd321524ba5259e15") + version("0.8.0", tag="v0.8.0", commit="71fab3262eb7e1aa44a04c21d072b77f06362f7b") version("0.7.0", tag="v0.7.0", commit="ea5158191181c137117ae37959879bdc8b107f35") version("0.6.1", tag="v0.6.1", commit="ee240d3963d7879ae0e9c392902195bd7b04e37d") version("0.6.0", tag="v0.6.0", commit="65287dc00bc7c271a08cb86c632f5909c30e3506") diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index 25963ac022..51f0c034b2 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -25,6 +25,12 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): version("develop", branch="develop", submodules=False) version("main", branch="main", submodules=False) version( + "2022.10.0", + tag="v2022.10.0", + commit="93b1441aaa258c1dcd211a552b75cff6461a2a8a", + submodules=False, + ) + version( "2022.03.1", tag="v2022.03.1", commit="6bf231bdbbc797df70d60027ddb714ac2ef7c0a1", @@ -130,6 +136,20 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): when="@:5.0.1 ^blt@0.4:", ) + # https://github.com/LLNL/Umpire/pull/805 + patch( + "https://github.com/LLNL/Umpire/pull/805/commits/47ff0aa1f7a01a917c3b7ac618e8a9e44a10fd25.patch?full_index=1", + sha256="7ed5d2c315a3b31e339f664f6108e32d7cb4cb8e9f22e5c78a65ba02625ccc09", + when="@2022.10.0", + ) + + # https://github.com/LLNL/Umpire/pull/816 + patch( + "https://github.com/LLNL/Umpire/pull/816/commits/2292d1d6078f6d9523b7ad0886ffa053644569d5.patch?full_index=1", + sha256="0f43cad7cdaec3c225ab6414ab9f81bd405a1157abf5a508e515bcb6ca53326d", + when="@2022.10.0", + ) + variant("fortran", default=False, description="Build C/Fortran API") variant("c", default=True, description="Build C API") variant("numa", default=False, description="Enable NUMA support") @@ -150,6 +170,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("cmake@3.9:", when="+cuda", type="build") depends_on("cmake@3.14:", when="@2022.03.0:") + depends_on("blt@0.5.2:", type="build", when="@2022.10.0:") depends_on("blt@0.5.0:", type="build", when="@2022.03.0:") depends_on("blt@0.4.1", type="build", when="@6.0.0") depends_on("blt@0.4.0:", type="build", when="@4.1.3:5.0.1") |