sst: update core, elements, macro to 15.0.0 (#50473)

* Add tag for podio v01-03

* Update minimal root version for RNTuple support

* Make sure clang-format does not interfere with code generation

* Add edm4hep version 0.99.2 and new podio version dependency

* Keep root versions ordered for dependencies

Co-authored-by: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>

---------

Co-authored-by: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>

var/spack/repos/spack_repo/builtin/packages/abyss/package.py

@@ -5,10 +5,11 @@
 import numbers
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 def is_multiple_32(x):
     """multiple of 32"""

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_1.0.0/Allwmake

@@ -1,4 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-applications/Allwmake $targetType $*
+wmake $targetType applications/solvers/additiveFoam/movingHeatSource
+wmake $targetType applications/solvers/additiveFoam

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_1.0.0/applications/Allwmake

@@ -1,5 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-wmake libso solvers/additiveFoam/movingHeatSource
-wmake solvers/additiveFoam

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_main/Allwmake

@@ -1,4 +1,4 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-applications/Allwmake $targetType $*
+./applications/solvers/additiveFoam/Allwmake $targetType $*

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_main/applications/Allwmake

@@ -1,9 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-wmake $targetType solvers/additiveFoam/functionObjects/ExaCA
-wmake $targetType solvers/additiveFoam/movingHeatSource
-wmake $targetType solvers/additiveFoam

var/spack/repos/spack_repo/builtin/packages/additivefoam/package.py

@@ -15,9 +15,9 @@
 class Additivefoam(Package):
     """AdditiveFOAM is a heat and mass transfer software for Additive Manufacturing (AM)"""
 
-    homepage = "https://github.com/ORNL/AdditiveFOAM"
+    homepage = "https://ornl.github.io/AdditiveFOAM/"
     git = "https://github.com/ORNL/AdditiveFOAM.git"
-    url = "https://github.com/ORNL/AdditiveFOAM/archive/1.0.0.tar.gz"
+    url = "https://github.com/ORNL/AdditiveFOAM/archive/1.1.0.tar.gz"
 
     maintainers("streeve", "colemanjs", "gknapp1")
 
@@ -26,16 +26,17 @@ class Additivefoam(Package):
     license("GPL-3.0-only")
 
     version("main", branch="main")
+    version("1.1.0", sha256="a13770bd66fe10224705fb3a2bfb557e63e0aea98c917b0084cf8b91eaa53ee2")
     version("1.0.0", sha256="abbdf1b0230cd2f26f526be76e973f508978611f404fe8ec4ecdd7d5df88724c")
 
     depends_on("cxx", type="build")  # generated
 
     depends_on("openfoam-org@10")
 
-    common = ["spack-derived-Allwmake"]
+    common = []
-    assets = [join_path("applications", "Allwmake"), "Allwmake"]
+    assets = ["Allwmake"]
 
-    build_script = "./spack-derived-Allwmake"
+    build_script = "./Allwmake"
 
     phases = ["configure", "build", "install"]
 
@@ -56,15 +57,49 @@ def add_extra_files(self, common, local_prefix, local):
             openfoam.install(join_path(indir, f), join_path(outdir, f))
 
     def patch(self):
+        """Patches build by adding Allwmake from the asset directory based on
+        the spec version.
+
+        For all versions after 1.0.0 there is an Allwmake script in
+        the AdditiveFOAM repository that can be called by the spack assets_main/Allwmake
+        script, whereas the assets_1.0.0/Allwmake script contains the
+        build instructions."""
         spec = self.spec
-        asset_dir = ""
-        if Version("main") in spec.versions:
         asset_dir = "assets_main"
-        elif Version("1.0.0") in spec.versions:
+        if Version("1.0.0") in spec.versions:
             asset_dir = "assets_1.0.0"
         self.add_extra_files(self.common, asset_dir, self.assets)
 
+    def setup_build_environment(self, env):
+        """Set up the build environment variables."""
+
+        # Ensure that the directories exist
+        mkdirp(self.prefix.bin)
+        mkdirp(self.prefix.lib)
+
+        # Add to the environment
+        env.set("FOAM_USER_APPBIN", self.prefix.bin)
+        env.set("FOAM_USER_LIBBIN", self.prefix.lib)
+
+    def setup_run_environment(self, env):
+        """Set up the run environment variables."""
+
+        # Add to the environment
+        env.prepend_path("PATH", self.prefix.bin)
+        env.prepend_path("LD_LIBRARY_PATH", self.prefix.lib)
+
+    def activate(self, spec, prefix):
+        """Activate the package to modify the environment."""
+        self.setup_run_environment(self.spec.environment())
+
+    def deactivate(self, spec, prefix):
+        """Deactivate the package and clean up the environment."""
+        env = self.spec.environment()
+        env.pop("FOAM_USER_APPBIN", None)
+        env.pop("FOAM_USER_LIBBIN", None)
+
     def configure(self, spec, prefix):
+        """Configure the environment for building."""
         pass
 
     def build(self, spec, prefix):

var/spack/repos/spack_repo/builtin/packages/akantu/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Akantu(CMakePackage):
     """

var/spack/repos/spack_repo/builtin/packages/amdblis/package.py

@@ -4,10 +4,10 @@
 
 import os
 
-from spack_repo.builtin.packages.blis.package import BlisBase
-
 from spack.package import *
 
+from ..blis.package import BlisBase
+
 
 class Amdblis(BlisBase):
     """AMD Optimized BLIS.

var/spack/repos/spack_repo/builtin/packages/amdfftw/package.py

@@ -4,10 +4,10 @@
 
 import os
 
-from spack_repo.builtin.packages.fftw.package import FftwBase
-
 from spack.package import *
 
+from ..fftw.package import FftwBase
+
 
 class Amdfftw(FftwBase):
     """FFTW (AMD Optimized version) is a comprehensive collection of

var/spack/repos/spack_repo/builtin/packages/amdlibflame/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems import autotools, cmake
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
-from spack_repo.builtin.packages.libflame.package import LibflameBase
 
 from spack.package import *
 
+from ..libflame.package import LibflameBase
+
 
 class Amdlibflame(CMakePackage, LibflameBase):
     """libFLAME (AMD Optimized version) is a portable library for

var/spack/repos/spack_repo/builtin/packages/amdscalapack/package.py

@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.packages.netlib_scalapack.package import ScalapackBase
-
 from spack.package import *
 
+from ..netlib_scalapack.package import ScalapackBase
+
 
 class Amdscalapack(ScalapackBase):
     """

var/spack/repos/spack_repo/builtin/packages/amdsmi/package.py

@@ -21,6 +21,7 @@ class Amdsmi(CMakePackage):
     libraries = ["libamd_smi"]
 
     license("MIT")
+    version("6.4.0", sha256="6f0200ba7305171e9dadbfcd41ff00c194b98d2b88e0555c57739ef01c767233")
     version("6.3.3", sha256="e23abc65a1cd75764d7da049b91cce2a095b287279efcd4f90b4b9b63b974dd5")
     version("6.3.2", sha256="1ed452eedfe51ac6e615d7bfe0bd7a0614f21113874ae3cbea7df72343cc2d13")
     version("6.3.1", sha256="a3a5a711052e813b9be9304d5e818351d3797f668ec2a455e61253a73429c355")
@@ -38,6 +39,7 @@ class Amdsmi(CMakePackage):
     version("5.5.1", sha256="b794c7fd562fd92f2c9f2bbdc2d5dded7486101fcd4598f2e8c3484c9a939281")
     version("5.5.0", sha256="dcfbd96e93afcf86b1261464e008e9ef7e521670871a1885e6eaffc7cdc8f555")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     depends_on("cmake@3.11:")

var/spack/repos/spack_repo/builtin/packages/amp/package.py

@@ -2,10 +2,11 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Amp(CMakePackage):
     """The Advanced Multi-Physics (AMP) package.

var/spack/repos/spack_repo/builtin/packages/aocc/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
+from ..llvm.package import LlvmDetection
+
 
 class Aocc(Package, LlvmDetection, CompilerPackage):
     """

var/spack/repos/spack_repo/builtin/packages/aoflagger/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Aoflagger(CMakePackage):
     """RFI detector and quality analysis

var/spack/repos/spack_repo/builtin/packages/apple_clang/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems.bundle import BundlePackage
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
-from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
+from ..llvm.package import LlvmDetection
+
 
 class AppleClang(BundlePackage, LlvmDetection, CompilerPackage):
     """Apple's Clang compiler"""

var/spack/repos/spack_repo/builtin/packages/apple_glu/package.py

@@ -1,10 +1,10 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack_repo.builtin.packages.apple_gl.package import AppleGlBase
-
 from spack.package import *
 
+from ..apple_gl.package import AppleGlBase
+
 
 class AppleGlu(AppleGlBase):
     """Shim package for Apple implementation of OpenGL Utility Libray (GLU)"""

var/spack/repos/spack_repo/builtin/packages/apptainer/package.py

@@ -6,10 +6,10 @@
 from glob import glob
 from os.path import basename
 
-from spack_repo.builtin.packages.singularityce.package import SingularityBase
-
 from spack.package import *
 
+from ..singularityce.package import SingularityBase
+
 
 # Apptainer is the new name of Singularity, piggy-back on the original package
 class Apptainer(SingularityBase):

var/spack/repos/spack_repo/builtin/packages/aqlprofile/package.py

@@ -10,6 +10,20 @@
 from spack.package import *
 
 _versions = {
+    "6.4.0": {
+        "apt": (
+            "5ec56bc3c227ad37227072bd513c58c9501e1ceefb06692ad4812f337853dca4",
+            "https://repo.radeon.com/rocm/apt/6.4/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.60400-47~22.04_amd64.deb",
+        ),
+        "yum": (
+            "22ed4c6a999ca6823e5e6bf9f4ab560cba68025f354346b1ac2ebb4757239c56",
+            "https://repo.radeon.com/rocm/rhel8/6.4/main/hsa-amd-aqlprofile-1.0.0.60400-47.el8.x86_64.rpm",
+        ),
+        "zyp": (
+            "7a4c9ca0e6ca178c65776f9b1d9d01ca7576eaa555fdcbf49a42def1ce6d6041",
+            "https://repo.radeon.com/rocm/zyp/6.4/main/hsa-amd-aqlprofile-1.0.0.60400-sles156.47.x86_64.rpm",
+        ),
+    },
     "6.3.3": {
         "apt": (
             "5fe2b18e75e8c0a66069af8446399796818f7340a9ef5f2b52adaa79ee8e2a37",
@@ -307,6 +321,7 @@ class Aqlprofile(Package):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/augustus/package.py

@@ -5,10 +5,11 @@
 import glob
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Augustus(MakefilePackage):
     """AUGUSTUS is a program that predicts genes in eukaryotic

var/spack/repos/spack_repo/builtin/packages/automaded/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Automaded(CMakePackage):
     """AutomaDeD (Automata-based Debugging for Dissimilar parallel

var/spack/repos/spack_repo/builtin/packages/bcl2fastq2/package.py

@@ -6,10 +6,11 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 # This application uses cmake to build, but they wrap it with a
 # configure script that performs dark magic.  This package does it

var/spack/repos/spack_repo/builtin/packages/bohrium/package.py

@@ -6,11 +6,12 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 from spack.package_test import compare_output
 
+from ..boost.package import Boost
+
 
 class Bohrium(CMakePackage, CudaPackage):
     """Library for automatic acceleration of array operations"""

var/spack/repos/spack_repo/builtin/packages/branson/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Branson(CMakePackage):
     """Branson's purpose is to study different algorithms for parallel Monte

var/spack/repos/spack_repo/builtin/packages/cabana/package.py

@@ -5,10 +5,11 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.kokkos.package import Kokkos
 
 from spack.package import *
 
+from ..kokkos.package import Kokkos
+
 
 class Cabana(CMakePackage, CudaPackage, ROCmPackage):
     """The Exascale Co-Design Center for Particle Applications Toolkit"""

var/spack/repos/spack_repo/builtin/packages/caffe/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Caffe(CMakePackage, CudaPackage):
     """Caffe is a deep learning framework made with expression, speed, and

var/spack/repos/spack_repo/builtin/packages/cantera/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.scons import SConsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Cantera(SConsPackage):
     """Cantera is a suite of object-oriented software tools for problems

var/spack/repos/spack_repo/builtin/packages/care/package.py

@@ -12,10 +12,11 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
+from ..blt.package import llnl_link_helpers
+
 
 class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
     """

var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class CbtfArgonavis(CMakePackage):
     """CBTF Argo Navis project contains the CUDA collector and supporting

var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis_gui/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.qmake import QMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class CbtfArgonavisGui(QMakePackage):
     """CBTF Argo Navis GUI project contains the GUI that views OpenSpeedShop

var/spack/repos/spack_repo/builtin/packages/chafa/package.py

@@ -13,13 +13,14 @@ class Chafa(AutotoolsPackage):
     suitable for display in a terminal."""
 
     homepage = "https://hpjansson.org/chafa/"
-    url = "https://hpjansson.org/chafa/releases/chafa-1.16.0.tar.xz"
+    url = "https://hpjansson.org/chafa/releases/chafa-1.16.1.tar.xz"
     git = "https://github.com/hpjansson/chafa.git"
 
     license("LGPL-3.0-or-later", checked_by="Buldram")
     maintainers("Buldram")
 
     version("master", branch="master")
+    version("1.16.1", sha256="4a25debb71530baf0a748b15cfee6b8da6b513f696d9484987eaf410ecce1129")
     version("1.16.0", sha256="bf863e57b6200b696bde1742aa95d7feb8cd23b9df1e91e91859b2b1e54fd290")
     version("1.14.5", sha256="7b5b384d5fb76a641d00af0626ed2115fb255ea371d9bef11f8500286a7b09e5")
     version("1.14.4", sha256="d0708a63f05b79269dae862a42671e38aece47fbd4fc852904bca51a65954454")
@@ -82,7 +83,7 @@ def install_completions(self):
         install(
             "tools/completions/zsh-completion.zsh", zsh_completion_path(self.prefix) / "_chafa"
         )
-        if self.spec.satisfies("@master"):
+        if self.spec.satisfies("@1.16.1:"):
             mkdirp(fish_completion_path(self.prefix))
             install(
                 "tools/completions/fish-completion.fish",

var/spack/repos/spack_repo/builtin/packages/chai/package.py

@@ -12,10 +12,11 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
+from ..blt.package import llnl_link_helpers
+
 
 class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
     """

var/spack/repos/spack_repo/builtin/packages/channelflow/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Channelflow(CMakePackage):
     """Channelflow is a software system for numerical analysis of the

var/spack/repos/spack_repo/builtin/packages/cleverleaf/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Cleverleaf(CMakePackage):
     """CleverLeaf is a hydrodynamics mini-app that extends CloverLeaf with

var/spack/repos/spack_repo/builtin/packages/clfft/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Clfft(CMakePackage):
     """a software library containing FFT functions written in OpenCL"""

var/spack/repos/spack_repo/builtin/packages/clingo_bootstrap/package.py

@@ -4,12 +4,12 @@
 import glob
 import os
 
-from spack_repo.builtin.packages.clingo.package import Clingo
-
 import spack.paths
 import spack.user_environment
 from spack.package import *
 
+from ..clingo.package import Clingo
+
 
 class ClingoBootstrap(Clingo):
     """Clingo with some options used for bootstrapping"""

var/spack/repos/spack_repo/builtin/packages/cntk/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Cntk(Package):
     """The Microsoft Cognitive Toolkit is a unified deep-learning toolkit

var/spack/repos/spack_repo/builtin/packages/coin3d/package.py

@@ -5,10 +5,11 @@
 from spack_repo.builtin.build_systems import autotools, cmake
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Coin3d(AutotoolsPackage, CMakePackage):
     """Coin is an OpenGL-based, 3D graphics library that has its roots in the

var/spack/repos/spack_repo/builtin/packages/comgr/package.py

@@ -31,6 +31,7 @@ def url_for_version(self, version):
     license("NCSA")
 
     version("master", branch="amd-stg-open", deprecated=True)
+    version("6.4.0", sha256="dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c")
     version("6.3.3", sha256="4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d")
     version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827")
     version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c")
@@ -94,6 +95,7 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         # llvm libs are linked statically, so this *could* be a build dep
@@ -123,6 +125,7 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/composable_kernel/package.py

@@ -21,6 +21,7 @@ class ComposableKernel(CMakePackage):
     license("MIT")
 
     version("master", branch="develop", deprecated=True)
+    version("6.4.0", sha256="8dbfea0bdc4950ca60e8d1ea43edf1f515c4a34e47ead951415c49a0669a3baf")
     version("6.3.3", sha256="b7102efba044455416a6127af1951019fe8365a653ea7eb0b1d83bb4542c9309")
     version("6.3.2", sha256="875237fe493ff040f8f63b827cddf2ff30a8d3aa18864f87d0e35323c7d62a2d")
     version("6.3.1", sha256="3e8c8c832ca3f9ceb99ab90f654b93b7db876f08d90eda87a70bc629c854052a")
@@ -65,6 +66,7 @@ class ComposableKernel(CMakePackage):
 
     for ver in [
         "master",
+        "6.4.0",
         "6.3.3",
         "6.3.2",
         "6.3.1",

var/spack/repos/spack_repo/builtin/packages/cray_mpich/package.py

@@ -7,11 +7,12 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.generic import Package
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 from spack.util.module_cmd import get_path_args_from_module_line, module
 
+from ..mpich.package import MpichEnvironmentModifications
+
 
 class CrayMpich(MpichEnvironmentModifications, Package, CudaPackage, ROCmPackage):
     """Cray's MPICH is a high performance and widely portable implementation of

var/spack/repos/spack_repo/builtin/packages/cray_mvapich2/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 
+from ..mpich.package import MpichEnvironmentModifications
+
 
 class CrayMvapich2(MpichEnvironmentModifications, Package):
     """Cray/HPE packaging of MVAPICH2 for HPE Apollo systems"""

var/spack/repos/spack_repo/builtin/packages/dakota/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 def submodules(package):
     submodules = []

var/spack/repos/spack_repo/builtin/packages/dbow2/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Dbow2(CMakePackage):
     """DBoW2 is an improved version of the DBow library, an open source C++

var/spack/repos/spack_repo/builtin/packages/dealii/package.py

@@ -6,10 +6,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Dealii(CMakePackage, CudaPackage):
     """C++ software library providing well-documented tools to build finite

var/spack/repos/spack_repo/builtin/packages/dssp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Dssp(AutotoolsPackage):
     """'mkdssp' utility. (dictionary of protein secondary structure)"""

var/spack/repos/spack_repo/builtin/packages/ecflow/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Ecflow(CMakePackage):
     """ecFlow is a work flow package that enables users to run a large number

var/spack/repos/spack_repo/builtin/packages/edm4hep/package.py

@@ -22,6 +22,7 @@ class Edm4hep(CMakePackage):
     license("Apache-2.0")
 
     version("main", branch="main")
+    version("0.99.2", sha256="b3e7abb61fd969e4c9aef55dd6839a2186bf0b0d3801174fe6e0b9df8e0ebace")
     version("0.99.1", sha256="84d990f09dbd0ad2198596c0c51238a4b15391f51febfb15dd3d191dc7aae9f4")
     version("0.99", sha256="3636e8c14474237029bf1a8be11c53b57ad3ed438fd70a7e9b87c5d08f1f2ea6")
     version("0.10.5", sha256="003c8e0c8e1d1844592d43d41384f4320586fbfa51d4d728ae0870b9c4f78d81")
@@ -79,6 +80,7 @@ class Edm4hep(CMakePackage):
     depends_on("podio@1:", when="@0.99:")
     depends_on("podio@0.15:", when="@:0.10.5")
     depends_on("podio@:1.1", when="@:0.99.0")
+    depends_on("podio@1.3:", when="@0.99.2:")
     for _std in _cxxstd_values:
         for _v in _std:
             depends_on(f"podio cxxstd={_v.value}", when=f"cxxstd={_v.value}")
@@ -109,6 +111,8 @@ def cmake_args(self):
             self.define("BUILD_TESTING", self.run_tests),
             self.define_from_variant("EDM4HEP_WITH_JSON", "json"),
         ]
+        if self.spec.satisfies("@:0.99.1 ^podio@1.3:"):
+            args.append(self.define("PODIO_USE_CLANG_FORMAT", False))
         return args
 
     def setup_run_environment(self, env: EnvironmentModifications) -> None:

var/spack/repos/spack_repo/builtin/packages/ethminer/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Ethminer(CMakePackage):
     """The ethminer is an Ethereum GPU mining worker."""

var/spack/repos/spack_repo/builtin/packages/exaca/package.py

@@ -5,10 +5,11 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.kokkos.package import Kokkos
 
 from spack.package import *
 
+from ..kokkos.package import Kokkos
+
 
 class Exaca(CMakePackage, CudaPackage, ROCmPackage):
     """ExaCA: an exascale cellular automata application for alloy solidification modeling"""

var/spack/repos/spack_repo/builtin/packages/extrae/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 # typical working line with extrae 3.0.1
 # ./configure
 #   --prefix=/usr/local

var/spack/repos/spack_repo/builtin/packages/fenics/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.python import PythonPipBuilder
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Fenics(CMakePackage):
     """FEniCS is organized as a collection of interoperable components

var/spack/repos/spack_repo/builtin/packages/foam_extend/package.py

@@ -33,15 +33,11 @@
 import re
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.openfoam.package import (
-    OpenfoamArch,
-    add_extra_files,
-    rewrite_environ_files,
-    write_environ,
-)
 
 from spack.package import *
 
+from ..openfoam.package import OpenfoamArch, add_extra_files, rewrite_environ_files, write_environ
+
 
 class FoamExtend(Package):
     """The Extend Project is a fork of the OpenFOAM opensource library

var/spack/repos/spack_repo/builtin/packages/foundationdb/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Foundationdb(CMakePackage):
     """FoundationDB is a distributed database designed to handle large

var/spack/repos/spack_repo/builtin/packages/fujitsu_fftw/package.py

@@ -1,10 +1,10 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack_repo.builtin.packages.fftw.package import FftwBase
-
 from spack.package import *
 
+from ..fftw.package import FftwBase
+
 
 class FujitsuFftw(FftwBase):
     """FFTW (Fujitsu Optimized version) is a comprehensive collection of

var/spack/repos/spack_repo/builtin/packages/fujitsu_frontistr/package.py

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack_repo.builtin.packages.frontistr.package import FrontistrBase
-
 from spack.package import *
 
+from ..frontistr.package import FrontistrBase
+
 
 class FujitsuFrontistr(FrontistrBase):
     """This is a fork repository of the FrontISTR tuned for A64FX."""

var/spack/repos/spack_repo/builtin/packages/gnuradio/package.py

@@ -4,10 +4,11 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Gnuradio(CMakePackage):
     """GNU Radio is a free & open-source software development toolkit

var/spack/repos/spack_repo/builtin/packages/gource/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Gource(AutotoolsPackage):
     """Software version control visualization."""

var/spack/repos/spack_repo/builtin/packages/graphblast/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Graphblast(MakefilePackage, CudaPackage):
     """High-Performance Linear Algebra-based Graph Primitives on GPUs"""

var/spack/repos/spack_repo/builtin/packages/gromacs/package.py

@@ -52,215 +52,82 @@ class Gromacs(CMakePackage, CudaPackage):
     # 2025 is supported.
     version("main", branch="main")
     version("master", branch="main", deprecated=True)
+    version("2025.2", sha256="0df09f9d45a99ef00e66b9baa9493a27e906813763a3b6c7672217c66b43ea11")
+    version("2025.1", sha256="0adf621a80fd8043f8defec84ce02811c0cdf42a052232890932d81f25c4d28a")
+    version("2025.0", sha256="a27ad35a646295bbec129abe684d9d03d1e2e0bd76b0d625e9055746aaefae82")
+    version("2024.5", sha256="fecf06b186cddb942cfb42ee8da5f3eb2b9993e6acc0a2f18d14ac0b014424f3")
     version("2024.4", sha256="ac618ece2e58afa86b536c5a2c4fcb937f0760318f12d18f10346b6bdebd86a8")
     version("2024.3", sha256="bbda056ee59390be7d58d84c13a9ec0d4e3635617adf2eb747034922cba1f029")
     version("2024.2", sha256="802a7e335f2e895770f57b159e4ec368ebb0ff2ce6daccf706c6e8025c36852b")
     version("2024.1", sha256="937d8f12a36fffbf2af7add71adbb5aa5c5537892d46c9a76afbecab1aa0aac7")
     version("2024", sha256="04d226d52066a8bc3a42e00d6213de737b4ec292e26703065924ff01956801e2")
-    version("2023.5", sha256="9cc491d3601a5fe0ec0de727e4432c34877f596fe8a463d4cf0f0f53fb34d08b")
-    version("2023.4", sha256="e5d6c4d9e7ccacfaccb0888619bd21b5ea8911f82b410e68d6db5d40f695f231")
-    version("2023.3", sha256="4ec8f8d0c7af76b13f8fd16db8e2c120e749de439ae9554d9f653f812d78d1cb")
-    version("2023.2", sha256="bce1480727e4b2bb900413b75d99a3266f3507877da4f5b2d491df798f9fcdae")
-    version("2023.1", sha256="eef2bb4a6cb6314cf9da47f26df2a0d27af4bf7b3099723d43601073ab0a42f4")
-    version("2023", sha256="ac92c6da72fbbcca414fd8a8d979e56ecf17c4c1cdabed2da5cfb4e7277b7ba8")
-    version("2022.6", sha256="75d277138475679dd3e334e384a71516570cde767310476687f2a5b72333ea41")
-    version("2022.5", sha256="083cc3c424bb93ffe86c12f952e3e5b4e6c9f6520de5338761f24b75e018c223")
-    version("2022.4", sha256="c511be602ff29402065b50906841def98752639b92a95f1b0a1060d9b5e27297")
-    version("2022.3", sha256="14cfb130ddaf8f759a3af643c04f5a0d0d32b09bc3448b16afa5b617f5e35dae")
-    version("2022.2", sha256="656404f884d2fa2244c97d2a5b92af148d0dbea94ad13004724b3fcbf45e01bf")
-    version("2022.1", sha256="85ddab5197d79524a702c4959c2c43be875e0fc471df3a35224939dce8512450")
-    version("2022", sha256="fad60d606c02e6164018692c6c9f2c159a9130c2bf32e8c5f4f1b6ba2dda2b68")
     version(
-        "2021.7",
+        "2023.5",
-        sha256="4db7bbbfe5424de48373686ec0e8c5bfa7175d5cd74290ef1c1e840e6df67f06",
+        sha256="9cc491d3601a5fe0ec0de727e4432c34877f596fe8a463d4cf0f0f53fb34d08b",
         deprecated=True,
     )
     version(
-        "2021.6",
+        "2023.4",
-        sha256="52df2c1d7586fd028d9397985c68bd6dd26e6e905ead382b7e6c473d087902c3",
+        sha256="e5d6c4d9e7ccacfaccb0888619bd21b5ea8911f82b410e68d6db5d40f695f231",
         deprecated=True,
     )
     version(
-        "2021.5",
+        "2023.3",
-        sha256="eba63fe6106812f72711ef7f76447b12dd1ee6c81b3d8d4d0e3098cd9ea009b6",
+        sha256="4ec8f8d0c7af76b13f8fd16db8e2c120e749de439ae9554d9f653f812d78d1cb",
         deprecated=True,
     )
     version(
-        "2021.4",
+        "2023.2",
-        sha256="cb708a3e3e83abef5ba475fdb62ef8d42ce8868d68f52dafdb6702dc9742ba1d",
+        sha256="bce1480727e4b2bb900413b75d99a3266f3507877da4f5b2d491df798f9fcdae",
         deprecated=True,
     )
     version(
-        "2021.3",
+        "2023.1",
-        sha256="e109856ec444768dfbde41f3059e3123abdb8fe56ca33b1a83f31ed4575a1cc6",
+        sha256="eef2bb4a6cb6314cf9da47f26df2a0d27af4bf7b3099723d43601073ab0a42f4",
         deprecated=True,
     )
     version(
-        "2021.2",
+        "2023",
-        sha256="d940d865ea91e78318043e71f229ce80d32b0dc578d64ee5aa2b1a4be801aadb",
+        sha256="ac92c6da72fbbcca414fd8a8d979e56ecf17c4c1cdabed2da5cfb4e7277b7ba8",
         deprecated=True,
     )
     version(
-        "2021.1",
+        "2022.6",
-        sha256="bc1d0a75c134e1fb003202262fe10d3d32c59bbb40d714bc3e5015c71effe1e5",
+        sha256="75d277138475679dd3e334e384a71516570cde767310476687f2a5b72333ea41",
         deprecated=True,
     )
     version(
-        "2021",
+        "2022.5",
-        sha256="efa78ab8409b0f5bf0fbca174fb8fbcf012815326b5c71a9d7c385cde9a8f87b",
+        sha256="083cc3c424bb93ffe86c12f952e3e5b4e6c9f6520de5338761f24b75e018c223",
         deprecated=True,
     )
     version(
-        "2020.7",
+        "2022.4",
-        sha256="744158d8f61b0d36ffe89ec934519b7e0981a7af438897740160da648d36c2f0",
+        sha256="c511be602ff29402065b50906841def98752639b92a95f1b0a1060d9b5e27297",
         deprecated=True,
     )
     version(
-        "2020.6",
+        "2022.3",
-        sha256="d8bbe57ed3c9925a8cb99ecfe39e217f930bed47d5268a9e42b33da544bdb2ee",
+        sha256="14cfb130ddaf8f759a3af643c04f5a0d0d32b09bc3448b16afa5b617f5e35dae",
         deprecated=True,
     )
     version(
-        "2020.5",
+        "2022.2",
-        sha256="7b6aff647f7c8ee1bf12204d02cef7c55f44402a73195bd5f42cf11850616478",
+        sha256="656404f884d2fa2244c97d2a5b92af148d0dbea94ad13004724b3fcbf45e01bf",
         deprecated=True,
     )
     version(
-        "2020.4",
+        "2022.1",
-        sha256="5519690321b5500c7951aaf53ff624042c3edd1a5f5d6dd1f2d802a3ecdbf4e6",
+        sha256="85ddab5197d79524a702c4959c2c43be875e0fc471df3a35224939dce8512450",
         deprecated=True,
     )
     version(
-        "2020.3",
+        "2022",
-        sha256="903183691132db14e55b011305db4b6f4901cc4912d2c56c131edfef18cc92a9",
+        sha256="fad60d606c02e6164018692c6c9f2c159a9130c2bf32e8c5f4f1b6ba2dda2b68",
-        deprecated=True,
-    )
-    version(
-        "2020.2",
-        sha256="7465e4cd616359d84489d919ec9e4b1aaf51f0a4296e693c249e83411b7bd2f3",
-        deprecated=True,
-    )
-    version(
-        "2020.1",
-        sha256="e1666558831a3951c02b81000842223698016922806a8ce152e8f616e29899cf",
-        deprecated=True,
-    )
-    version(
-        "2020",
-        sha256="477e56142b3dcd9cb61b8f67b24a55760b04d1655e8684f979a75a5eec40ba01",
         deprecated=True,
     )
+    # See exception documented above
     version("2019.6", sha256="bebe396dc0db11a9d4cc205abc13b50d88225617642508168a2195324f06a358")
-    version(
-        "2019.5",
-        sha256="438061a4a2d45bbb5cf5c3aadd6c6df32d2d77ce8c715f1c8ffe56156994083a",
-        deprecated=True,
-    )
-    version(
-        "2019.4",
-        sha256="ba4366eedfc8a1dbf6bddcef190be8cd75de53691133f305a7f9c296e5ca1867",
-        deprecated=True,
-    )
-    version(
-        "2019.3",
-        sha256="4211a598bf3b7aca2b14ad991448947da9032566f13239b1a05a2d4824357573",
-        deprecated=True,
-    )
-    version(
-        "2019.2",
-        sha256="bcbf5cc071926bc67baa5be6fb04f0986a2b107e1573e15fadcb7d7fc4fb9f7e",
-        deprecated=True,
-    )
-    version(
-        "2019.1",
-        sha256="b2c37ed2fcd0e64c4efcabdc8ee581143986527192e6e647a197c76d9c4583ec",
-        deprecated=True,
-    )
-    version(
-        "2019",
-        sha256="c5b281a5f0b5b4eeb1f4c7d4dc72f96985b566561ca28acc9c7c16f6ee110d0b",
-        deprecated=True,
-    )
-    version(
-        "2018.8",
-        sha256="776923415df4bc78869d7f387c834141fdcda930b2e75be979dc59ecfa6ebecf",
-        deprecated=True,
-    )
-    version(
-        "2018.5",
-        sha256="32261df6f7ec4149fc0508f9af416953d056e281590359838c1ed6644ba097b8",
-        deprecated=True,
-    )
-    version(
-        "2018.4",
-        sha256="6f2ee458c730994a8549d6b4f601ecfc9432731462f8bd4ffa35d330d9aaa891",
-        deprecated=True,
-    )
-    version(
-        "2018.3",
-        sha256="4423a49224972969c52af7b1f151579cea6ab52148d8d7cbae28c183520aa291",
-        deprecated=True,
-    )
-    version(
-        "2018.2",
-        sha256="4bdde8120c510b6543afb4b18f82551fddb11851f7edbd814aa24022c5d37857",
-        deprecated=True,
-    )
-    version(
-        "2018.1",
-        sha256="4d3533340499323fece83b4a2d4251fa856376f2426c541e00b8e6b4c0d705cd",
-        deprecated=True,
-    )
-    version(
-        "2018",
-        sha256="deb5d0b749a52a0c6083367b5f50a99e08003208d81954fb49e7009e1b1fd0e9",
-        deprecated=True,
-    )
-    version(
-        "2016.6",
-        sha256="bac0117d2cad21f9b94fe5b854fb9ae7435b098a6da4e732ee745f18e52473d7",
-        deprecated=True,
-    )
-    version(
-        "2016.5",
-        sha256="57db26c6d9af84710a1e0c47a1f5bf63a22641456448dcd2eeb556ebd14e0b7c",
-        deprecated=True,
-    )
-    version(
-        "2016.4",
-        sha256="4be9d3bfda0bdf3b5c53041e0b8344f7d22b75128759d9bfa9442fe65c289264",
-        deprecated=True,
-    )
-    version(
-        "2016.3",
-        sha256="7bf00e74a9d38b7cef9356141d20e4ba9387289cbbfd4d11be479ef932d77d27",
-        deprecated=True,
-    )
-    version(
-        "5.1.5",
-        sha256="c25266abf07690ecad16ed3996899b1d489cbb1ef733a1befb3b5c75c91a703e",
-        deprecated=True,
-    )
-    version(
-        "5.1.4",
-        sha256="0f3793d8f1f0be747cf9ebb0b588fb2b2b5dc5acc32c3046a7bee2d2c03437bc",
-        deprecated=True,
-    )
-    version(
-        "5.1.2",
-        sha256="39d6f1d7ae8ba38cea6089da40676bfa4049a49903d21551abc030992a58f304",
-        deprecated=True,
-    )
-    version(
-        "4.6.7",
-        sha256="6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9",
-        deprecated=True,
-    )
-    version(
-        "4.5.5",
-        sha256="e0605e4810b0d552a8761fef5540c545beeaf85893f4a6e21df9905a33f871ba",
-        deprecated=True,
-    )
 
     depends_on("c", type="build")
     depends_on("cxx", type="build")

var/spack/repos/spack_repo/builtin/packages/gromacs_chain_coordinate/package.py

@@ -2,11 +2,11 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.packages.gromacs.package import CMakeBuilder as GromacsCMakeBuilder
-from spack_repo.builtin.packages.gromacs.package import Gromacs
-
 from spack.package import *
 
+from ..gromacs.package import CMakeBuilder as GromacsCMakeBuilder
+from ..gromacs.package import Gromacs
+
 
 class GromacsChainCoordinate(Gromacs):
     """

var/spack/repos/spack_repo/builtin/packages/gromacs_swaxs/package.py

@@ -2,11 +2,11 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.packages.gromacs.package import CMakeBuilder as GromacsCMakeBuilder
-from spack_repo.builtin.packages.gromacs.package import Gromacs
-
 from spack.package import *
 
+from ..gromacs.package import CMakeBuilder as GromacsCMakeBuilder
+from ..gromacs.package import Gromacs
+
 
 class GromacsSwaxs(Gromacs):
     """Modified Gromacs for small-angle scattering calculations (SAXS/WAXS/SANS)"""

var/spack/repos/spack_repo/builtin/packages/gunrock/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Gunrock(CMakePackage, CudaPackage):
     """High-Performance Graph Primitives on GPUs"""

var/spack/repos/spack_repo/builtin/packages/helics/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Helics(CMakePackage):
     """HELICS is a general-purpose, modular, highly-scalable co-simulation

var/spack/repos/spack_repo/builtin/packages/herwigpp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Herwigpp(AutotoolsPackage):
     """Herwig is a multi-purpose particle physics event generator.

var/spack/repos/spack_repo/builtin/packages/highfive/package.py

@@ -4,10 +4,11 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Highfive(CMakePackage):
     """HighFive - Header only C++ HDF5 interface"""

var/spack/repos/spack_repo/builtin/packages/hip/package.py

@@ -27,6 +27,7 @@ class Hip(CMakePackage):
     license("MIT")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="bec899ba67df9aa7056297e5ad104b8e36938b1bab22f1f418f69a8e0043d07f")
     version("6.3.3", sha256="aa3a5466304d1dbee0d976b50fccb710dd12e2e1d5534793396447c0ff845e2c")
     version("6.3.2", sha256="66a4eba98bd74fc7126ce7cb4d59653b22075fe95a70412fe283dc806ae366e0")
     version("6.3.1", sha256="76f862493c4912a06e0e0b8da3917c2ba7481f1e05f2c23ffd5e05f8c44e3037")
@@ -123,6 +124,7 @@ class Hip(CMakePackage):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
             depends_on(f"comgr@{ver}", when=f"@{ver}")
@@ -151,6 +153,7 @@ class Hip(CMakePackage):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"hipify-clang@{ver}", when=f"@{ver}")
 
@@ -173,6 +176,7 @@ class Hip(CMakePackage):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
@@ -192,10 +196,11 @@ class Hip(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hipcc@{ver}", when=f"@{ver}")
 
-    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}")
 
     # roc-obj-ls requirements
@@ -257,6 +262,7 @@ class Hip(CMakePackage):
         )
     # Add hip-clr sources thru the below
     for d_version, d_shasum in [
+        ("6.4.0", "76fd0ad83da0dabf7c91ca4cff6c51f2be8ab259e08ad9743af47d1b3473c2ff"),
         ("6.3.3", "8e5adca8f8c2d99d4a4e49605dd6b56b7881b762ee8ce15b4a7000e3cd982fec"),
         ("6.3.2", "ec13dc4ffe212beee22171cb2825d2b16cdce103c835adddb482b9238cf4f050"),
         ("6.3.1", "bfb8a4a59e7bd958e2cd4bf6f14c6cdea601d9827ebf6dc7af053a90e963770f"),
@@ -317,6 +323,7 @@ class Hip(CMakePackage):
         )
     # Add hipother sources thru the below
     for d_version, d_shasum in [
+        ("6.4.0", "53d5654d34e00f4bfa0846b291fe87ef6d43087349917159e663a842ea29a783"),
         ("6.3.3", "95cb2aab4bd996f0bd5f38427412cd768692a11fad70b97d20e402f32b1ef03e"),
         ("6.3.2", "1623d823de49471aae3ecb1fad0e9cdddf9301a4089f1fd44f78ac2ff0c20fb2"),
         ("6.3.1", "caa69147227bf72fa7b076867f84579456ef55af63efec29914265a80602df42"),
@@ -676,4 +683,6 @@ def cmake_args(self):
             args.append(self.define("HIPCC_BIN_DIR", self.stage.source_path + "/hipcc/bin"))
         if self.spec.satisfies("@6.0:"):
             args.append(self.define("HIPCC_BIN_DIR", self.spec["hipcc"].prefix.bin))
+        if self.spec.satisfies("@6.4.0:"):
+            args.append(self.define("clang", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang"))
         return args

var/spack/repos/spack_repo/builtin/packages/hip_tensor/package.py

@@ -19,6 +19,7 @@ class HipTensor(CMakePackage, ROCmPackage):
     maintainers("srekolam", "afzpatel")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="cc2a738defa72cd2b39f4d358c7967dc93b490160b6eb74f893c4626ad334310")
     version("6.3.3", sha256="2f4e34c5a96004e24fcdf70f9157f1079ab177a78f6dbf96ea8290f668257c23")
     version("6.3.2", sha256="094db6d759eb32e9d15c36fce7f5b5d46ba81416953a8d9435b2fb9c161d8c83")
     version("6.3.1", sha256="142401331526e6da3fa172cce283f1c053056cb59cf431264443da76cee2f168")
@@ -36,6 +37,7 @@ class HipTensor(CMakePackage, ROCmPackage):
 
     variant("asan", default=False, description="Build with address-sanitizer enabled or disabled")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     for ver in [
@@ -53,6 +55,7 @@ class HipTensor(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"composable-kernel@{ver}", when=f"@{ver}")
@@ -69,6 +72,7 @@ class HipTensor(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hipcc@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/hip_tests/package.py

@@ -20,6 +20,8 @@ class HipTests(CMakePackage):
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
 
+    version("6.4.0", sha256="bf609b7b4c7a567ed265d3cb305510321a47c5f311a80ae8d1beed1f4891c070")
+    version("6.3.3", sha256="7c8ccc78bdc7d684f2bc55ef1affa64e7ddad4b2bf28f12a5aede079002b8a12")
     version("6.3.2", sha256="5af72efd608962df5a73c8b66b479954dc432fe01828b671a91bce0451ac688b")
     version("6.3.1", sha256="0fc1cf4f46f2bbef377d65803d86c2489b01b598c468070c79c5114a661f07c6")
     version("6.3.0", sha256="8081d4ab1a43ffa1cebd646668d83008b799ab98c14daf7b455922355a439c8a")
@@ -34,7 +36,19 @@ class HipTests(CMakePackage):
     depends_on("cxx", type="build")  # generated
     depends_on("cmake", type="run")
 
-    for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]:
+    for ver in [
+        "6.1.0",
+        "6.1.1",
+        "6.1.2",
+        "6.2.0",
+        "6.2.1",
+        "6.2.4",
+        "6.3.0",
+        "6.3.1",
+        "6.3.2",
+        "6.3.3",
+        "6.4.0",
+    ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/hipblas/package.py

@@ -27,6 +27,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="544a302bdc494af02147dc14c75d088031927e1c3a2f7a349d817497000b1c34")
     version("6.3.3", sha256="8f645a5c9298170e71354437188eeca8272ff2b98077e9f34d1ca0fd7f27b7f8")
     version("6.3.2", sha256="6e86d4f8657e13665e37fdf3174c3a30f4c7dff2c4e2431d1be110cd7d463971")
     version("6.3.1", sha256="77a1845254d738c43a48bc52fa3e94499ed83535b5771408ff476122bc4b7b7c")
@@ -99,6 +100,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}", when=f"+rocm @{ver}")
         depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"+rocm @{ver}")
@@ -128,6 +130,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
         "develop",
     ]:
@@ -136,7 +139,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
     for tgt in ROCmPackage.amdgpu_targets:
         depends_on(f"rocblas amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}")
         depends_on(f"rocsolver amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}")
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hipblas-common@{ver}", when=f"@{ver}")
 
     @classmethod

var/spack/repos/spack_repo/builtin/packages/hipblas_common/package.py

@@ -17,6 +17,7 @@ class HipblasCommon(CMakePackage):
 
     license("MIT")
 
+    version("6.4.0", sha256="8953bcf13ba1aa03cb29481bd90eaef373bf0e41cadff68e567ecd2ec0b07363")
     version("6.3.3", sha256="b2b77abb5c851674839b583dc313684b5f6aa676e8186ff0a5696b6962c2b4da")
     version("6.3.2", sha256="29aa1ac1a0f684a09fe2ea8a34ae8af3622c27708c7df403a7481e75174e1984")
     version("6.3.1", sha256="512e652483b5580713eca14db3fa633d0441cd7c02cdb0d26e631ea605b9231b")

var/spack/repos/spack_repo/builtin/packages/hipblaslt/002-link-roctracer.patch

@@ -0,0 +1,51 @@
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 24e25ab..1907108 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -72,6 +72,7 @@ include(src/CMakeLists.txt)
+ # Create hipBLASLt library
+ add_library(hipblaslt ${hipblaslt_source} ${hipblaslt_headers_public})
+ add_library(roc::hipblaslt ALIAS hipblaslt)
++target_include_directories( hipblaslt PRIVATE ${MSGPACK_DIR}/include )
+ 
+ # Target compile definitions
+ if(NOT BUILD_CUDA)
+@@ -159,7 +160,9 @@ if(NOT BUILD_CUDA)
+ endif()
+ 
+ if(HIPBLASLT_ENABLE_MARKER)
+-  target_link_libraries(hipblaslt PRIVATE -lroctx64)
++  find_path(ROCTRACER_INCLUDE_DIR "roctracer/roctx.h")
++  target_include_directories(hipblaslt PRIVATE ${ROCTRACER_INCLUDE_DIR})
++  target_link_libraries(hipblaslt PRIVATE ${rocTracer})
+ endif()
+ 
+ if( NOT BUILD_CUDA AND NOT LEGACY_HIPBLAS_DIRECT )
+diff --git a/tensilelite/Tensile/Source/client/CMakeLists.txt b/tensilelite/Tensile/Source/client/CMakeLists.txt
+index 8dc7401..e6d0ba9 100644
+--- a/tensilelite/Tensile/Source/client/CMakeLists.txt
++++ b/tensilelite/Tensile/Source/client/CMakeLists.txt
+@@ -64,7 +64,9 @@ target_include_directories(TensileClient PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc
+ target_link_libraries(TensileClient PRIVATE TensileHost Boost::program_options Boost::filesystem rocm_smi)
+ 
+ if(Tensile_ENABLE_MARKER)
+-    target_link_libraries(TensileClient PRIVATE -lroctx64)
++    find_path(ROCTRACER_INCLUDE_DIR "roctracer/roctx.h")
++    target_include_directories(TensileClient PRIVATE ${ROCTRACER_INCLUDE_DIR})
++    target_link_libraries(TensileClient PRIVATE ${rocTracer})
+ endif()
+ 
+ if(TENSILE_USE_OPENMP)
+diff --git a/tensilelite/Tensile/cmake/TensileConfig.cmake b/tensilelite/Tensile/cmake/TensileConfig.cmake
+index 7627780..ac3560a 100644
+--- a/tensilelite/Tensile/cmake/TensileConfig.cmake
++++ b/tensilelite/Tensile/cmake/TensileConfig.cmake
+@@ -234,6 +234,8 @@ function(TensileCreateLibraryFiles
+     set(Options ${Options} "--build-id=${Tensile_BUILD_ID}")
+   endif()
+ 
++  set(Options ${Options} "--offload-bundler=$ENV{TENSILE_ROCM_OFFLOAD_BUNDLER_PATH}")
++
+   set(CommandLine ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} ${Script} ${Options} ${Tensile_LOGIC_PATH} ${Tensile_OUTPUT_PATH} HIP)
+   message(STATUS "Tensile_CREATE_COMMAND: ${CommandLine}")
+ 

var/spack/repos/spack_repo/builtin/packages/hipblaslt/003-use-rocm-smi-config.patch

@@ -0,0 +1,15 @@
+diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
+index 02ae47d..6b66209 100755
+--- a/clients/CMakeLists.txt
++++ b/clients/CMakeLists.txt
+@@ -97,8 +97,8 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+ 
+   # Find the package ROCmSMI
+   if(NOT WIN32)
+-      find_package(ROCmSMI REQUIRED)
+-      list( APPEND COMMON_LINK_LIBS rocm_smi )
++      find_package(rocm_smi CONFIG REQUIRED)
++      list( APPEND COMMON_LINK_LIBS rocm_smi64 )
+   endif()
+ 
+   # common source files used in subdirectories benchmarks and gtest thus ../common

var/spack/repos/spack_repo/builtin/packages/hipblaslt/package.py

@@ -19,6 +19,7 @@ class Hipblaslt(CMakePackage):
     maintainers("srekolam", "afzpatel", "renjithravindrankannath")
 
     license("MIT")
+    version("6.4.0", sha256="a4baa0c7336db9d46a0884c8ccfd0fb7e00a502b478aed9f588aa26fa8773353")
     version("6.3.3", sha256="f32d666b37bdbecbf924cc98653fa3d30a0de629039d4dad44d35a2082e39e5a")
     version("6.3.2", sha256="cc4875b1a5cf1708a7576c42aff6b4cb790cb7337f5dc2df33119a4aadcef027")
     version("6.3.1", sha256="9a18a2e44264a21cfe58ed102fd3e34b336f23d6c191ca2da726e8e0883ed663")
@@ -45,6 +46,8 @@ class Hipblaslt(CMakePackage):
     depends_on("c", type="build")
     depends_on("cxx", type="build")
     depends_on("cmake@3.25.2:", type="build", when="@6.2.0:")
+    depends_on("python@3.7:")
+    depends_on("python@3.8:", when="@6.4:")
 
     for ver in [
         "6.0.0",
@@ -59,6 +62,7 @@ class Hipblaslt(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
@@ -67,15 +71,19 @@ class Hipblaslt(CMakePackage):
     for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
         depends_on(f"hipblas@{ver}", when=f"@{ver}")
 
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hipblas-common@{ver}", when=f"@{ver}")
         depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
 
+    for ver in ["6.4.0"]:
+        depends_on(f"roctracer-dev@{ver}", when=f"@{ver}")
+
     depends_on("msgpack-c")
     depends_on("py-joblib", type=("build", "link"))
     depends_on("googletest@1.10.0:", type="test")
     depends_on("netlib-lapack@3.7.1:", type="test")
     depends_on("py-pyyaml", type="test")
+    depends_on("python-venv", when="@6.4:")
 
     # Sets the proper for clang++ and clang-offload-blunder.
     # Also adds hipblas and msgpack include directories
@@ -83,7 +91,9 @@ class Hipblaslt(CMakePackage):
     # Below patch sets the proper path for clang++ and clang-offload-blunder.
     # Also adds hipblas and msgpack include directories for 6.1.0 release.
     patch("0001-Set-LLVM_Path-Add-Hiblas-Include-to-CmakeLists-6.1.Patch", when="@6.1:6.2")
-    patch("0001-Set-LLVM-Path-6.3.Patch", when="@6.3:")
+    patch("0001-Set-LLVM-Path-6.3.Patch", when="@6.3")
+    patch("002-link-roctracer.patch", when="@6.4")
+    patch("003-use-rocm-smi-config.patch", when="@6.4")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("CXX", self.spec["hip"].hipcc)
@@ -115,6 +125,13 @@ def patch(self):
                 "library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh",
                 string=True,
             )
+        if self.spec.satisfies("@6.3:"):
+            filter_file(
+                "${rocm_path}/bin/amdclang++",
+                f'{self.spec["llvm-amdgpu"].prefix}/bin/amdclang++',
+                "tensilelite/Tensile/Ops/gen_assembly.sh",
+                string=True,
+            )
 
     def cmake_args(self):
         args = [
@@ -129,4 +146,6 @@ def cmake_args(self):
             args.append(
                 self.define("ROCM_OPENMP_EXTRAS_DIR", self.spec["rocm-openmp-extras"].prefix)
             )
+        if self.spec.satisfies("@6.4:"):
+            args.append(self.define("Python_ROOT", self.spec["python"].prefix.bin))
         return args

var/spack/repos/spack_repo/builtin/packages/hipcc/package.py

@@ -25,6 +25,7 @@ def url_for_version(self, version):
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
 
     license("MIT")
+    version("6.4.0", sha256="dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c")
     version("6.3.3", sha256="4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d")
     version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827")
     version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c")

var/spack/repos/spack_repo/builtin/packages/hipcub/package.py

@@ -20,6 +20,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
     license("BSD-3-Clause")
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="2c044ed9bf53b9410ef6de4ca578384569b0a89cac4e8604dfdde390b2918481")
     version("6.3.3", sha256="4ce22aba007c6c8a8b2231adefa7785b1869e5fdd4af29b0371a499a523c2dc6")
     version("6.3.2", sha256="4a1443c2ea12c3aa05fb65703eb309ccf8b893f9e6cbebec4ccf5502ba54b940")
     version("6.3.1", sha256="e5d100c7b8f95fe6243ad9f22170c136aa34db4e588136bec54ede7cb2e7f12f")
@@ -91,6 +92,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocprim@{ver}", when=f"+rocm @{ver}")
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/hipfft/package.py

@@ -27,6 +27,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
     license("MIT")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="f16859ba3823f8b29f2aac120cef3395109babf93a0a5069c3b4c7c67ef35e96")
     version("6.3.3", sha256="c032d59a45b0eb4441539498bd4c22d8442fbc554cb08d6cb452a1d27be6c57c")
     version("6.3.2", sha256="5d9e662c7d67f4c814cad70476b57651df5ae6b65f371ca6dbb5aa51d9eeb6f5")
     version("6.3.1", sha256="b709df2d0115748ed004d0cddce829cb0f9ec3761eb855e61f0097cab04e4806")
@@ -98,6 +99,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/hipfort/package.py

@@ -18,6 +18,7 @@ class Hipfort(CMakePackage):
     license("MIT")
 
     maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="a2e4c10f1c6561789208ba5a41a00b562c8048ec503339cb4eed236ee3cf6131")
     version("6.3.3", sha256="dacb7d5a30689e6a8f81ec251daaa4a74b40f1d28145953c7d42ccd29cecee7c")
     version("6.3.2", sha256="d2438971199637eb2e09519c1f2300cdd7a84b4d948034a7cd1ce3e441faf5de")
     version("6.3.1", sha256="8141bf3d05ab4f91c561815134707123e3d06486bf775224b9a3a4cc8ee8f56f")
@@ -42,6 +43,7 @@ class Hipfort(CMakePackage):
         version("5.3.3", sha256="593be86502578b68215ffe767c26849fd27d4dbd92c8e76762275805f99e64f5")
         version("5.3.0", sha256="9e2aa142de45b2d2c29449d6f82293fb62844d511fbf51fa597845ba05c700fa")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
     depends_on("fortran", type="build")  # generated
 
@@ -74,6 +76,7 @@ class Hipfort(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", type="build", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/hipify_clang/package.py

@@ -21,6 +21,7 @@ class HipifyClang(CMakePackage):
     license("MIT")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="874e3ee9801f795aaae30d6ea86e5edc991d5f71a5dee0a8e8eb7ce6379a51eb")
     version("6.3.3", sha256="94d32b0e02c0c34debb9a8034cb5fcd6c2ee35b67350c64690034cf94cd38ddd")
     version("6.3.2", sha256="c0da5118be8207fab6d19803417c0b8d2db5bc766279038527cbd6fa92b25c67")
     version("6.3.1", sha256="5f9d9a65545f97b18c6a0d4394dca1bcdee10737a5635b79378ea505081f9315")
@@ -82,6 +83,7 @@ class HipifyClang(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
@@ -105,6 +107,7 @@ class HipifyClang(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/hiprand/package.py

@@ -27,6 +27,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="60e9153edf617e984361696aa60af3ad44c5ae01ed75ad610c617a387b0559a4")
     version("6.3.3", sha256="ea0d7638a463c06d30692205f8c591d3fe025b58a772226ca1c972e723118a2f")
     version("6.3.2", sha256="0a08ed7554c161b095c866cd5e6f0d63cdf063e5b3c1183afa6ac18bad94a575")
     version("6.3.1", sha256="ec43bf64eda348cf53c2767e553fd9561540dc50ae3ce95ca916404aa9a3eafb")
@@ -110,6 +111,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
         "develop",
     ]:

var/spack/repos/spack_repo/builtin/packages/hipsolver/package.py

@@ -32,6 +32,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="d6cf798c5f2d1d00a442f7a3f07c6f3a9e4ce5b3be36608aac7c97175dac9eb0")
     version("6.3.3", sha256="529263f9abe5b7485bbabedc3993630abaa0d5fd547c4add0993d1cb0d71e226")
     version("6.3.2", sha256="885c999da8e4aa0b4cb9584bc0fc0d6a8c8d56f5e7ee6d211c608003eff22aa7")
     version("6.3.1", sha256="793074ebaa4a3b16dc6e4d2a54ecbb259f1e0ec7fdcd7f885da622a1d1478b76")
@@ -116,6 +117,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
         "develop",
     ]:

var/spack/repos/spack_repo/builtin/packages/hipsparse/package.py

@@ -24,6 +24,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
     libraries = ["libhipsparse"]
 
     license("MIT")
+    version("6.4.0", sha256="aaab3e9a905f5c5f470634ed7a0929ef93e28d2c5fe4f6f89338b39a937f1825")
     version("6.3.3", sha256="61c26eb93e857c942a03ea4350a403e20191be465041e542ad7da00058e89ead")
     version("6.3.2", sha256="9fbc3468632fdc828d7bae386c2737eb371d78811f53da7348b417fb00d62808")
     version("6.3.1", sha256="d64bc48e0aa5ec2f48853272a9c554b37ec98cb0724135e45f21b1340df7bccb")
@@ -66,6 +67,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
     conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive")
     conflicts("~cuda ~rocm", msg="CUDA or ROCm support is required")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
     depends_on("fortran", type="build")  # generated
 
@@ -98,6 +100,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
         depends_on(f"rocsparse@{ver}", when=f"+rocm @{ver}")

var/spack/repos/spack_repo/builtin/packages/hipsparselt/0002-add-hipsparse-include.patch

@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5904f78..a0b0c92 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,7 +204,7 @@ else()
+         set( tensile_fork "ROCmSoftwarePlatform" CACHE STRING "Tensile fork to use" )
+         file (STRINGS "tensilelite_tag.txt" read_tensile_tag)
+         set( tensile_tag ${read_tensile_tag} CACHE STRING "Tensile tag to download" )
+-        virtualenv_install("git+https://github.com/${tensile_fork}/hipBLASLt.git@${tensile_tag}#subdirectory=tensilelite")
++        virtualenv_install("git+https://github.com/ROCm/hipBLASLt.git@modify-tensilelite-spack-6.4#subdirectory=tensilelite")
+ 
+         message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}")
+       endif()
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index aac8506..345147f 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -123,6 +123,7 @@ target_include_directories(hipsparselt
+                            PUBLIC  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include>
+                                    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+                                    $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}>
++                                   $<BUILD_INTERFACE:${HIPSPARSE_INCLUDE_DIRS}>
+                                    $<INSTALL_INTERFACE:include>
+ )
+ 

var/spack/repos/spack_repo/builtin/packages/hipsparselt/package.py

@@ -23,6 +23,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     maintainers("srekolam", "afzpatel", "renjithravindrankannath")
 
     license("MIT")
+    version("6.4.0", sha256="3950f424c5623bdf764e23c263f3a63de62e3690f491251b88054e27560dc604")
     version("6.3.3", sha256="6b756e20fddb37b8c1237ef8e124452c9bdd46acad8a40699d10b609d0d2ebfc")
     version("6.3.2", sha256="a0b30b478eff822dd7fa1c116ad99dcdf14ece1c33aae04ac71b594efd4d9866")
     version("6.3.1", sha256="403d4c0ef47f89510452a20be6cce72962f21761081fc19a7e0e27e7f0c4ccfd")
@@ -50,6 +51,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     )
     variant("asan", default=False, description="Build with address-sanitizer enabled or disabled")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     for ver in [
@@ -65,13 +67,14 @@ class Hipsparselt(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"hipsparse@{ver}", when=f"@{ver}")
         depends_on(f"rocm-openmp-extras@{ver}", when=f"@{ver}", type="test")
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
 
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
 
     depends_on("cmake@3.5:", type="build")
@@ -92,6 +95,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     patch("0001-update-llvm-path-add-hipsparse-include-dir-for-spack-6.1.patch", when="@6.1")
     patch("0001-update-llvm-path-add-hipsparse-include-dir-for-spack-6.2.patch", when="@6.2")
     patch("0001-update-llvm-path-add-hipsparse-include-dir-for-spack-6.3.patch", when="@6.3")
+    patch("0002-add-hipsparse-include.patch", when="@6.4")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("CXX", self.spec["hip"].hipcc)
@@ -106,6 +110,7 @@ def setup_build_environment(self, env: EnvironmentModifications) -> None:
             "ROCM_AGENT_ENUMERATOR_PATH",
             f"{self.spec['rocminfo'].prefix}/bin/rocm_agent_enumerator",
         )
+        if self.spec.satisfies("@6.3:"):
             env.set("ROCM_SMI_PATH", f"{self.spec['rocm-smi-lib'].prefix}/bin/rocm-smi")
 
     def cmake_args(self):

var/spack/repos/spack_repo/builtin/packages/hisea/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Hisea(MakefilePackage):
     """HISEA is an efficient all-vs-all long read aligner for SMRT sequencing

var/spack/repos/spack_repo/builtin/packages/hpx/package.py

@@ -8,10 +8,11 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Hpx(CMakePackage, CudaPackage, ROCmPackage):
     """C++ runtime system for parallel and distributed applications."""

var/spack/repos/spack_repo/builtin/packages/hsa_rocr_dev/package.py

@@ -25,6 +25,7 @@ class HsaRocrDev(CMakePackage):
     libraries = ["libhsa-runtime64"]
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="ff740e8c8f2229c6dc47577363f707b1a44ea4254f8ad74f8f0a669998829535")
     version("6.3.3", sha256="aa2e30d3d68707d6df4840e954bb08cc13cd312cec1a98a64d97adbe07262f50")
     version("6.3.2", sha256="aaecaa7206b6fa1d5d7b8f7c1f7c5057a944327ba4779448980d7e7c7122b074")
     version("6.3.1", sha256="547ceeeda9a41cdffa21e57809dc5834f94938a0a2809c283aebcbcf01901df0")
@@ -112,6 +113,7 @@ class HsaRocrDev(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
@@ -137,9 +139,13 @@ class HsaRocrDev(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
+        depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}")
+
     patch("0002-Remove-explicit-RPATH-again.patch", when="@3.7.0:5.6")
 
     @property
@@ -206,5 +212,7 @@ def cmake_args(self):
             args.append(self.define("ROCM_PATCH_VERSION", "60300"))
         if self.spec.satisfies("@5.7.0:"):
             args.append(self.define_from_variant("ADDRESS_SANITIZER", "asan"))
-
+        if self.spec.satisfies("@6.3.2:"):
+            args.append(self.define("SHARED_LIBS", "ON"))
+            args.append(self.define("BUILD_SHARED_LIBS", "ON"))
         return args

var/spack/repos/spack_repo/builtin/packages/hssp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Hssp(AutotoolsPackage):
     """The source code for building the mkhssp and hsspconv programs is bundled

var/spack/repos/spack_repo/builtin/packages/hybrid_lambda/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class HybridLambda(AutotoolsPackage):
     """Hybrid-Lambda is a software package that can simulate gene trees

var/spack/repos/spack_repo/builtin/packages/ibmisc/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Ibmisc(CMakePackage):
     """Misc. reusable utilities used by IceBin."""

var/spack/repos/spack_repo/builtin/packages/imp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Imp(CMakePackage):
     """IMP, the Integrative Modeling Platform."""

var/spack/repos/spack_repo/builtin/packages/intel_oneapi_runtime/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems.generic import Package
 from spack_repo.builtin.build_systems.oneapi import IntelOneApiPackage
-from spack_repo.builtin.packages.gcc_runtime.package import get_elf_libraries
 
 from spack.package import *
 
+from ..gcc_runtime.package import get_elf_libraries
+
 
 @IntelOneApiPackage.update_description
 class IntelOneapiRuntime(Package):

var/spack/repos/spack_repo/builtin/packages/jali/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Jali(CMakePackage):
     """Jali is a parallel, unstructured mesh infrastructure library designed

var/spack/repos/spack_repo/builtin/packages/kea/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Kea(AutotoolsPackage):
     """Modern, open source DHCPv4 & DHCPv6 server."""

var/spack/repos/spack_repo/builtin/packages/kicad/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Kicad(CMakePackage):
     """KiCad is an open source software suite for Electronic Design

var/spack/repos/spack_repo/builtin/packages/lammps_example_plugin/package.py

@@ -5,10 +5,11 @@
 import datetime as dt
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.lammps.package import Lammps
 
 from spack.package import *
 
+from ..lammps.package import Lammps
+
 
 class LammpsExamplePlugin(CMakePackage):
     """LAMMPS Example Plugin"""

var/spack/repos/spack_repo/builtin/packages/libcudf/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libcudf(CMakePackage):
     """Built based on the Apache Arrow columnar memory format,

var/spack/repos/spack_repo/builtin/packages/libfive/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libfive(CMakePackage):
     """libfive is a software library and set of tools for solid modeling."""

var/spack/repos/spack_repo/builtin/packages/libint/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 TUNE_VARIANTS = (
     "none",
     "cp2k-lmax-4",

var/spack/repos/spack_repo/builtin/packages/libkml/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libkml(CMakePackage):
     """Reference implementation of OGC KML 2.2."""