From 9428749a3cec58f0a1baee5602f23b5975f3f9ae Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 30 May 2023 15:35:33 -0600 Subject: Update SST packages to 13.0.0 (#37467) * add sst-{core,elements,macro} v13.0.0 * Add newest DUMPI versions and remove unavailable ones * update maintainer lists * sst-core: tracking and profiling flags * sst-elements with Pin requires the Pin location * sst-core: Zoltan integration was removed in version 12 * spack style fixes * sst-core: ensure Python is in the sst{sim,info}.x rpaths * sst-macro: update homepage and maintainers * spack style --fix --- .../repos/builtin/packages/sst-core/package.py | 44 ++++++++++++++++++++-- .../repos/builtin/packages/sst-dumpi/package.py | 12 ++++-- .../repos/builtin/packages/sst-elements/package.py | 21 ++++++++++- .../repos/builtin/packages/sst-macro/package.py | 19 ++++++++-- 4 files changed, 83 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py index 4596479f98..a2fba7728f 100644 --- a/var/spack/repos/builtin/packages/sst-core/package.py +++ b/var/spack/repos/builtin/packages/sst-core/package.py @@ -14,14 +14,27 @@ 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/v11.0.0_Final/sstcore-11.0.0.tar.gz" + url = "https://github.com/sstsimulator/sst-core/releases/download/v13.0.0_Final/sstcore-13.0.0.tar.gz" - maintainers("sknigh") + maintainers("berquist", "naromero77") + version("13.0.0", sha256="c9d868dcdd75d59bef7c73146709a3b2a52a78f0df5ec2c3dc9f21434c51d935") + version("12.1.0", sha256="f7530226643439678e2f4183ec4dbadf7750411bdaa44d9443887f81feb97574") + version("12.0.1", sha256="8662a778354e587e55b909725943dd5bb01d55121b1abc1a384a4eea161e9f5a") + version("12.0.0", sha256="fae3e092e508ab297ec60941a71f772f3b9247581ef407284700868158443066") + version("11.1.0", sha256="b3967944a5dc329f0ae32e7e3355bd991346632d8d30290d2a11e6731ce73736") version("11.0.0", sha256="25d17c35d1121330ad74375b6d27fe5c5592d1add3edf0bbb356aa3b5f59f401") version("10.1.0", sha256="e464213a81c7b3ccec994fdba2b56992b52fb9a6db089ef7c3445b54306d4b87") version("10.0.0", sha256="64cf93a46dfab011fba49244bf0e0efe25ef928c6fbde1d49003220d0eb7735a") version("9.1.0", sha256="cfeda39bb2ce9f32032480427517df62e852c0b3713797255e3b838075f3614d") + version("9.0.0", sha256="1a5763c51429ae941fb59e6f0b76b7754477cc302ef7a1958afd2b74186b2a11") + version("8.0.0", sha256="34a62425c3209cf80b6bca99cb0dcc328b67fb84ed92d5e6d6c975ad9319ba8a") + version("7.2.0", sha256="3015579bbbc7a9de0eb984cea248acc02303d779b8ed5eee640c4a5532a2cfdb") + version("7.1.0", sha256="06accc9b203311a752b86e775c379f3bb56e4b95eda658769f7d92a11765aa06") + version("7.0.0", sha256="818c5923688b5c8b98669ebd49c5b2493e9414c61be57eec1e9944d191b4a309") + version("6.1.0", sha256="3b2840efe90fc312818e680a49fa01c7eb25a337d8a8d0d9374bd31887330a0c") + version("6.0.0", sha256="ecfde0409e7345d88950f9d2dc531709878a19469d8ade71517337eec525e379") + version("develop", branch="devel") version("master", branch="master") @@ -30,12 +43,25 @@ class SstCore(AutotoolsPackage): default=True, description="Build support for parallel discrete event simulation", ) - variant("zoltan", default=False, description="Use Zoltan for partitioning parallel runs") + variant( + "zoltan", + default=False, + when="@:12.0", + description="Use Zoltan for partitioning parallel runs", + ) variant("hdf5", default=False, description="Build support for HDF5 statistic output") variant("zlib", default=False, description="Build support for ZLIB compression") + + variant("trackevents", default=False, description="Enable event and activity tracking") + variant( + "trackperf", + default=False, + description="Enable tracking of simulator performance and component runtime", + ) 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")) + depends_on("python", type=("build", "run", "link")) depends_on("mpi", when="+pdes_mpi") depends_on("zoltan", when="+zoltan") depends_on("hdf5", when="+hdf5") @@ -72,8 +98,18 @@ class SstCore(AutotoolsPackage): else: args.append("--disable-mpi") + if "+trackevents" in self.spec: + args.append("--enable-event-tracking") + if "+trackperf" in self.spec: + args.append("--enable-perf-tracking") if "+preview" in self.spec: args.append("--enable-preview-build") + if "+profile" in self.spec: + args.append("--enable-profile") args.append("--with-python=%s" % self.spec["python"].prefix) return args + + def patch(self): + """The Autotools-based setup does not add Python to the RPATH or RUNPATH.""" + self.rpath.append(self.spec["python"].prefix.lib) diff --git a/var/spack/repos/builtin/packages/sst-dumpi/package.py b/var/spack/repos/builtin/packages/sst-dumpi/package.py index 036c095128..c09e7140a3 100644 --- a/var/spack/repos/builtin/packages/sst-dumpi/package.py +++ b/var/spack/repos/builtin/packages/sst-dumpi/package.py @@ -15,14 +15,18 @@ class SstDumpi(AutotoolsPackage): """ homepage = "http://sst.sandia.gov/about_dumpi.html" - url = "https://github.com/sstsimulator/sst-dumpi/archive/6.1.0.tar.gz" + url = "https://github.com/sstsimulator/sst-dumpi/archive/refs/tags/v13.0.0_Final.tar.gz" git = "https://github.com/sstsimulator/sst-dumpi.git" - maintainers("sknigh", "jpkenny", "calewis") + maintainers("berquist", "jpkenny", "calewis") + + version("13.0.0", sha256="0eaa5cf5826c9fbba6cfeed42f52af67c5a7d45bc8cbb485c2a3867b7438229b") + version("12.1.0", sha256="b718658cbb0be957d28883f7cc914617bff97b3629fad7017cd62e14ed667d9d") + version("12.0.1", sha256="6e74e5f16ee26c83b17ecd5c272a61ec37977f07f531066533dd610805f9117b") + version("12.0.0", sha256="04989c900adb253262808e59897d9f9b8df5dbd497a03820c3340640055dcf4f") + version("11.1.0", sha256="58144b4b7543705ef648ca86ea4ebf3c739554ea8a472123aadc2967a8201cdd") version("master", branch="master") - version("7.1.0", sha256="37cd9e8279e7a1c342a4357b75bb8a34b0fa76a4f372d4ecdef9168bdf50a465") - version("6.1.0", sha256="d4f6afcff5ba67fcc3a29f461afbb59855053840f5f320552a77b4e14c687bb6") depends_on("autoconf@1.68:", type="build") depends_on("automake@1.11.1:", type="build") diff --git a/var/spack/repos/builtin/packages/sst-elements/package.py b/var/spack/repos/builtin/packages/sst-elements/package.py index ee04a9426d..948725c740 100644 --- a/var/spack/repos/builtin/packages/sst-elements/package.py +++ b/var/spack/repos/builtin/packages/sst-elements/package.py @@ -14,14 +14,25 @@ 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/v11.0.0_Final/sstelements-11.0.0.tar.gz" + url = "https://github.com/sstsimulator/sst-elements/releases/download/v13.0.0_Final/sstelements-13.0.0.tar.gz" - maintainers("sknigh") + maintainers("berquist", "naromero77") + version("13.0.0", sha256="1f6f6b403a8c1b22a27cdf2943c9e505825ee14866891e7bc944d4471b7b0321") + version("12.1.0", sha256="77948cf8e1f8bf8d238d475cea111c9a72b307cbf403cb429ef0426d0cf708a4") + version("12.0.0", sha256="d3caacf8ba621a644151e1670dfc0fd8e91b45a583699998f94312897b0eca26") + version("11.1.0", sha256="2dd20ecf2e0896b59eb9d65d31ef928daa0188239016216f4ad11b7e6447ca0b") version("11.0.0", sha256="bf265cb25afc041b74422cc5cddc8e3ae1e7c3efa3e37e699dac4e3f7629be6e") version("10.1.0", sha256="a790561449795dac48a84c525b8e0b09f05d0b0bff1a0da1aa2e903279a03c4a") version("10.0.0", sha256="ecf28ef97b27ea75be7e64cb0acb99d36773a888c1b32ba16034c62174b02693") version("9.1.0", sha256="e19b05aa6e59728995fc059840c79e476ba866b67887ccde7eaf52a18a1f52ca") + version("9.0.0", sha256="6bd0743059daecadfb9c4e8cab337e2414db5630c3e3b1f2498ba133e2691692") + version("8.0.0", sha256="805c3549eb6cb134d6aed38df441af9cb72c4457d48c9f14e9f2e89ba63b6e92") + version("7.2.0", sha256="0a8494b38e987e26aea5d7a793ed7f2dc07a64c2805d806113e9de74ccab6269") + version("7.1.0", sha256="c01e381d2217b745388a8871a0137bd5002b7a473f59fc5e24da8184893d93bf") + version("7.0.0", sha256="0c842754d506df594a643ae9562aae4e652c897298504dec0a237e730600febe") + version("6.1.0", sha256="baf553bf9097f674741be750184d5868af0add630865fd7f92a6d68d6fcdc0d4") + version("6.0.0", sha256="0ede237fa3c8f6afd1ebb497069d91260bae12d19df67a179d739c9ded535604") version("develop", branch="devel") version("master", branch="master") @@ -141,3 +152,9 @@ class SstElements(AutotoolsPackage): args.append("--with-sst-core=%s" % spec["sst-core"].prefix) return args + + def setup_run_environment(self, env): + """Setup runtime environment for SST Elements.""" + + if "+pin" in self.spec: + env.set("INTEL_PIN_DIRECTORY", self.spec["intel-pin"].prefix) diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index 14cf58d194..adfa95cb9a 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -15,15 +15,28 @@ class SstMacro(AutotoolsPackage): services, and processor models. """ - homepage = "http://sst.sandia.gov/about_sstmacro.html" + homepage = "https://github.com/sstsimulator" git = "https://github.com/sstsimulator/sst-macro.git" - url = "https://github.com/sstsimulator/sst-macro/releases/download/v11.0.0_Final/sstmacro-11.0.0.tar.gz" + url = "https://github.com/sstsimulator/sst-macro/releases/download/v13.0.0_Final/sstmacro-13.0.0.tar.gz" - maintainers("jjwilke") + maintainers("berquist") + version("13.0.0", sha256="410dad4ac0c7a4c0e16c54da308b6c6b631112af18ae2c37585c8a14472987d4") + version("12.1.0", sha256="ee57e08acfd4b6429a0500d981d468ee6ded2638ec5abec7b47f172388b267f1") + version("12.0.0", sha256="259237a47cf341830ce3956cfadfd6e77ff1824da05da4a7b212fc5867ce64b2") + version("11.1.0", sha256="4b1226e75e2e99faa42b218461d85e8e17c1d4f333dd973e72a5dc052328d34c") version("11.0.0", sha256="30367baed670b5b501320a068671556c9071286a0f0c478f9994a30d8fe5bdea") version("10.1.0", sha256="e15d99ce58d282fdff849af6de267746a4c89f3b8c5ab6c1e1e7b53a01127e73") version("10.0.0", sha256="064b732256f3bec9b553e00bcbc9a1d82172ec194f2b69c8797f585200b12566") + version("9.1.0", sha256="ef735440c7297212e11ccf0559b028108562880ec55e81f57ebd0df68aa4b9f1") + version("9.0.0", sha256="b582118afd379bb17b3fcf938d814c691d0941a70bf8c8685272556aef3b956d") + version("8.0.0", sha256="8618a259e98ede9a1a2ce854edd4930628c7c5a770c3915858fa840556c1861f") + version("7.2.0", sha256="df19a4ff5c5d35cfca2d8c37440525d8836cde4c0a45ae44f1a888550ae42bff") + version("7.1.0", sha256="4bf154142f06ab8c15d9d95065fcd96581594b124ba50f86ce7ab60f366ac285") + version("7.0.0", sha256="9c17fa43c48bf9cd669f6ef6ae6fb87257793c918433424f250eac862bfb4cc4") + version("6.1.0", sha256="930b67313b594148d6356e550ca370214a9283858235321d3ef974191eb028d6") + version("6.0.0", sha256="7b475a73ba69550ca3800ad96e58ce0e35fabf909896a3764f892743ef8e50d1") + version("master", branch="master") version("develop", branch="devel") -- cgit v1.2.3-60-g2f50