summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Berquist <eric.berquist@gmail.com>2023-11-27 15:55:22 -0500
committerGitHub <noreply@github.com>2023-11-27 14:55:22 -0600
commitabc294e3a2334f5752cba4b65bb2c44bab2b00d2 (patch)
tree4f58512c095e3824f8b06888f89999cc6d1d4cfb
parentc482534c1d3168da8053c4c47a203da300054a71 (diff)
downloadspack-abc294e3a2334f5752cba4b65bb2c44bab2b00d2.tar.gz
spack-abc294e3a2334f5752cba4b65bb2c44bab2b00d2.tar.bz2
spack-abc294e3a2334f5752cba4b65bb2c44bab2b00d2.tar.xz
spack-abc294e3a2334f5752cba4b65bb2c44bab2b00d2.zip
Update SST packages to 13.1.0 (#41220)
* Update SST packages to 13.1.0 * Allow mismatch between sst-core dependency and current macro version * SST does not work with Python 3.12 yet * Sanity check install binaries for sst-core * Elements compiles with OTF2 but not OTF * Version bounds in specs are inclusive * Remove not-strictly-necessary file check
-rw-r--r--var/spack/repos/builtin/packages/sst-core/package.py5
-rw-r--r--var/spack/repos/builtin/packages/sst-elements/package.py8
-rw-r--r--var/spack/repos/builtin/packages/sst-macro/package.py10
3 files changed, 12 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py
index 860d30d0b3..891fbf5d2d 100644
--- a/var/spack/repos/builtin/packages/sst-core/package.py
+++ b/var/spack/repos/builtin/packages/sst-core/package.py
@@ -14,10 +14,11 @@ class SstCore(AutotoolsPackage):
homepage = "https://github.com/sstsimulator"
git = "https://github.com/sstsimulator/sst-core.git"
- url = "https://github.com/sstsimulator/sst-core/releases/download/v13.0.0_Final/sstcore-13.0.0.tar.gz"
+ url = "https://github.com/sstsimulator/sst-core/releases/download/v13.1.0_Final/sstcore-13.1.0.tar.gz"
maintainers("berquist", "naromero77")
+ version("13.1.0", sha256="0a44c62ee0b18a20a3cb089f4e0d43e293dc5adc6c3fa7639d40986cf5b9854c")
version("13.0.0", sha256="c9d868dcdd75d59bef7c73146709a3b2a52a78f0df5ec2c3dc9f21434c51d935")
version("12.1.0", sha256="f7530226643439678e2f4183ec4dbadf7750411bdaa44d9443887f81feb97574")
version("12.0.1", sha256="8662a778354e587e55b909725943dd5bb01d55121b1abc1a384a4eea161e9f5a")
@@ -61,7 +62,7 @@ class SstCore(AutotoolsPackage):
variant("preview", default=False, description="Preview build with deprecated features removed")
variant("profile", default=False, description="Enable performance profiling of core features")
- depends_on("python", type=("build", "run", "link"))
+ depends_on("python@:3.11", type=("build", "run", "link"))
depends_on("mpi", when="+pdes_mpi")
depends_on("zoltan", when="+zoltan")
depends_on("hdf5", when="+hdf5")
diff --git a/var/spack/repos/builtin/packages/sst-elements/package.py b/var/spack/repos/builtin/packages/sst-elements/package.py
index 49677daf04..f5f9e7621d 100644
--- a/var/spack/repos/builtin/packages/sst-elements/package.py
+++ b/var/spack/repos/builtin/packages/sst-elements/package.py
@@ -14,12 +14,14 @@ class SstElements(AutotoolsPackage):
homepage = "https://github.com/sstsimulator"
git = "https://github.com/sstsimulator/sst-elements.git"
- url = "https://github.com/sstsimulator/sst-elements/releases/download/v13.0.0_Final/sstelements-13.0.0.tar.gz"
+ url = "https://github.com/sstsimulator/sst-elements/releases/download/v13.1.0_Final/sstelements-13.1.0.tar.gz"
maintainers("berquist", "naromero77")
+ version("13.1.0", sha256="ebda6ee5af858192dff8a7faf3125010001d5c439beec22afe5b9828a74adf1a")
version("13.0.0", sha256="1f6f6b403a8c1b22a27cdf2943c9e505825ee14866891e7bc944d4471b7b0321")
version("12.1.0", sha256="77948cf8e1f8bf8d238d475cea111c9a72b307cbf403cb429ef0426d0cf708a4")
+ version("12.0.1", sha256="fe6bd9e2c14ffca77cfb31ee39410d0df3a353524b6a5a35270104dd25836e48")
version("12.0.0", sha256="d3caacf8ba621a644151e1670dfc0fd8e91b45a583699998f94312897b0eca26")
version("11.1.0", sha256="2dd20ecf2e0896b59eb9d65d31ef928daa0188239016216f4ad11b7e6447ca0b")
version("11.0.0", sha256="bf265cb25afc041b74422cc5cddc8e3ae1e7c3efa3e37e699dac4e3f7629be6e")
@@ -40,7 +42,6 @@ class SstElements(AutotoolsPackage):
# Contact SST developers (https://github.com/sstsimulator)
# if your use case requires support for:
# - balar
- # - OTF2
# - stake (riscv simulator)
variant("pin", default=False, description="Enable the Ariel CPU model")
@@ -56,7 +57,7 @@ class SstElements(AutotoolsPackage):
variant("otf", default=False, description="Build with OTF")
variant("otf2", default=False, description="Build with OTF2")
- depends_on("python", type=("build", "run"))
+ depends_on("python@:3.11", type=("build", "run"))
depends_on("sst-core")
depends_on("sst-core@develop", when="@develop")
depends_on("sst-core@master", when="@master")
@@ -85,7 +86,6 @@ class SstElements(AutotoolsPackage):
conflicts("+dumpi", msg="Dumpi not currently supported, contact SST Developers for help")
conflicts("+otf", msg="OTF not currently supported, contact SST Developers for help")
- conflicts("+otf2", msg="OTF2 not currently supported, contact SST Developers for help")
conflicts(
"~dramsim2",
when="+hybridsim",
diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py
index df129cfb4f..3f7c09bea7 100644
--- a/var/spack/repos/builtin/packages/sst-macro/package.py
+++ b/var/spack/repos/builtin/packages/sst-macro/package.py
@@ -17,12 +17,14 @@ class SstMacro(AutotoolsPackage):
homepage = "https://github.com/sstsimulator"
git = "https://github.com/sstsimulator/sst-macro.git"
- url = "https://github.com/sstsimulator/sst-macro/releases/download/v13.0.0_Final/sstmacro-13.0.0.tar.gz"
+ url = "https://github.com/sstsimulator/sst-macro/releases/download/v13.1.0_Final/sstmacro-13.1.0.tar.gz"
maintainers("berquist")
+ version("13.1.0", sha256="022e39daae1067b56c0011dbe87e3234fee4587049fd53671e1ed6b23233f70e")
version("13.0.0", sha256="410dad4ac0c7a4c0e16c54da308b6c6b631112af18ae2c37585c8a14472987d4")
version("12.1.0", sha256="ee57e08acfd4b6429a0500d981d468ee6ded2638ec5abec7b47f172388b267f1")
+ version("12.0.1", sha256="1491a149f4554777a6c3aa62730b3cd1a24c43a8d3d7fb61edfb4fe5c773aed8")
version("12.0.0", sha256="259237a47cf341830ce3956cfadfd6e77ff1824da05da4a7b212fc5867ce64b2")
version("11.1.0", sha256="4b1226e75e2e99faa42b218461d85e8e17c1d4f333dd973e72a5dc052328d34c")
version("11.0.0", sha256="30367baed670b5b501320a068671556c9071286a0f0c478f9994a30d8fe5bdea")
@@ -50,10 +52,8 @@ class SstMacro(AutotoolsPackage):
depends_on("otf2", when="+otf2")
depends_on("llvm+clang@5:9", when="+skeletonizer")
depends_on("mpi", when="+pdes_mpi")
- depends_on("sst-core@develop", when="@develop+core")
- depends_on("sst-core@master", when="@master+core")
- depends_on("sst-core@10.1.0", when="@10.1.0+core")
- depends_on("sst-core@10.0.0", when="@10.0.0+core")
+ # Allow mismatch between core dependency version and current macro version.
+ depends_on("sst-core", when="+core")
depends_on("gettext")
variant("pdes_threads", default=True, description="Enable thread-parallel PDES simulation")