Merge pull request #1508 from LLNL/task/white238/pull_in_spack_changes

Changes from Spack repo

Author: white238

.uberenv_config.json

@@ -4,7 +4,7 @@
 "package_final_phase": "initconfig",
 "package_source_dir": "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_commit": "cade66d842a894075938bc5528475d9fcd8bd559",
+"spack_commit": "82358642aa54ce7fb37e6b19dc20e6740c62bff7",
 "spack_configs_path": "scripts/spack/configs",
 "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"],
 "spack_concretizer": "clingo",

scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml

@@ -217,6 +217,11 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /usr
+    git:
+      buildable: false
+      externals:
+      - spec: [email protected]
+        prefix: /usr/tce/packages/git/git-2.45.0
     gmake:
       buildable: false
       externals:
@@ -345,14 +350,16 @@ spack:
       version: [2.24.0]
     mfem:
       require: "@4.6.0"
+    opencascade:
+      require: "@7.8.1+data_exchange~draw"
+    py-jsonschema:
+      require: "@:4.17" #Anything after this requires py-rpds which requires rust and adds 40 minutes
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     scr:
       require: "@3.0.1~shared~tests~examples"
     umpire:
       require: "@2024.07.0~shared~examples~werror"
-    opencascade:
-      require: "@7.8.1+data_exchange~draw"
 
     # Globally lock in versions of Devtools
     cmake:

scripts/spack/configs/toss_4_x86_64_ib/spack.yaml

@@ -205,6 +205,11 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /usr
+    git:
+      buildable: false
+      externals:
+      - spec: [email protected]
+        prefix: /collab/usr/global/tools/tce4/opt/git-2.45.0
     gmake:
       buildable: false
       externals:
@@ -276,6 +281,11 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /usr
+    slurm:
+      buildable: false
+      externals:
+      - spec: [email protected]
+        prefix: /usr
     swig:
       buildable: false
       externals:
@@ -312,14 +322,18 @@ spack:
       version: [2.24.0]
     mfem:
       require: "@4.6.0"
+    opencascade:
+      require: "@7.8.1+data_exchange~draw"
+    py-jsonschema:
+      require: "@:4.17" #Anything after this requires py-rpds which requires rust and adds 40 minutes
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     scr:
       require: "@3.0.1~shared~tests~examples"
     umpire:
       require: "@2024.07.0~shared~examples~werror"
-    opencascade:
-      require: "@7.8.1+data_exchange~draw"
+    libyogrt:
+      require: "scheduler=slurm"
 
   # Lock in versions of Devtools
     cmake:

scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml

@@ -354,6 +354,11 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /usr
+    git:
+      buildable: false
+      externals:
+      - spec: [email protected]
+        prefix: /collab/usr/global/tools/tce4/opt/git-2.45.0
     gmake:
       buildable: false
       externals:
@@ -486,6 +491,8 @@ spack:
       version: [2.24.0]
     mfem:
       require: "@4.6.0"
+    py-jsonschema:
+      require: "@:4.17" #Anything after this requires py-rpds which requires rust and adds 40 minutes
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     scr:

scripts/spack/packages/axom/package.py

@@ -1,9 +1,7 @@
-# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
+# Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-import glob
 import os
 import shutil
 import socket
@@ -41,10 +39,14 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
     git = "https://github.com/LLNL/axom.git"
     tags = ["radiuss"]
 
+    test_requires_compiler = True
+
     license("BSD-3-Clause")
 
     version("main", branch="main")
     version("develop", branch="develop")
+    version("0.10.1", tag="v0.10.1", commit="6626ee1c5668176fb64dd9a52dec3e8596b3ba6b")
+    version("0.10.0", tag="v0.10.0", commit="ea853a34a834415ea75f824160fc44cba9a0755d")
     version("0.9.0", tag="v0.9.0", commit="5f531595d941d16fa3b8583bfc347a845d9feb6d")
     version("0.8.1", tag="v0.8.1", commit="0da8a5b1be596887158ac2fcd321524ba5259e15")
     version("0.8.0", tag="v0.8.0", commit="71fab3262eb7e1aa44a04c21d072b77f06362f7b")
@@ -59,6 +61,10 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
     version("0.3.0", tag="v0.3.0", commit="20068ccab4b4f70055918b4f17960ec3ed6dbce8")
     version("0.2.9", tag="v0.2.9", commit="9e9a54ede3326817c05f35922738516e43b5ec3d")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+    depends_on("fortran", type="build", when="+fortran")
+
     # https://github.com/spack/spack/issues/31829
     patch("examples-oneapi.patch", when="@0.6.1 +examples %oneapi")
 
@@ -250,11 +256,11 @@ def cache_name(self):
             # Are we on a LLNL system then strip node number
             hostname = hostname.rstrip("1234567890")
         special_case = ""
-        if "+cuda" in self.spec:
+        if self.spec.satisfies("+cuda"):
             special_case += "_cuda"
-        if "~fortran" in self.spec:
+        if self.spec.satisfies("~fortran"):
             special_case += "_nofortran"
-        if "+rocm" in self.spec:
+        if self.spec.satisfies("+rocm"):
             special_case += "_hip"
         return "{0}-{1}-{2}@{3}{4}.cmake".format(
             hostname,
@@ -268,7 +274,7 @@ def initconfig_compiler_entries(self):
         spec = self.spec
         entries = super().initconfig_compiler_entries()
 
-        if "+fortran" in spec:
+        if spec.satisfies("+fortran"):
             entries.append(cmake_cache_option("ENABLE_FORTRAN", True))
             if self.is_fortran_compiler("gfortran") and "clang" in self.compiler.cxx:
                 libdir = pjoin(os.path.dirname(os.path.dirname(self.compiler.cxx)), "lib")
@@ -285,7 +291,7 @@ def initconfig_compiler_entries(self):
         else:
             entries.append(cmake_cache_option("ENABLE_FORTRAN", False))
 
-        if "+cpp14" in spec and spec.satisfies("@:0.6.1"):
+        if spec.satisfies("+cpp14") and spec.satisfies("@:0.6.1"):
             entries.append(cmake_cache_string("BLT_CXX_STD", "c++14", ""))
 
         # Add optimization flag workaround for builds with cray compiler
@@ -298,7 +304,7 @@ def initconfig_hardware_entries(self):
         spec = self.spec
         entries = super().initconfig_hardware_entries()
 
-        if "+cuda" in spec:
+        if spec.satisfies("+cuda"):
             entries.append(cmake_cache_option("ENABLE_CUDA", True))
             entries.append(cmake_cache_option("CMAKE_CUDA_SEPARABLE_COMPILATION", True))
 
@@ -311,7 +317,7 @@ def initconfig_hardware_entries(self):
 
             if spec.satisfies("^blt@:0.5.1"):
                 # This is handled internally by BLT now
-                if "+cpp14" in spec:
+                if spec.satisfies("+cpp14"):
                     cudaflags += " -std=c++14"
                 else:
                     cudaflags += " -std=c++11"
@@ -320,7 +326,7 @@ def initconfig_hardware_entries(self):
             entries.append("# nvcc does not like gtest's 'pthreads' flag\n")
             entries.append(cmake_cache_option("gtest_disable_pthreads", True))
 
-        if "+rocm" in spec:
+        if spec.satisfies("+rocm"):
             entries.append("#------------------{0}\n".format("-" * 60))
             entries.append("# Axom ROCm specifics\n")
             entries.append("#------------------{0}\n\n".format("-" * 60))
@@ -335,22 +341,26 @@ def initconfig_hardware_entries(self):
             # Recommended MPI flags
             hip_link_flags += "-lxpmem "
             hip_link_flags += "-L/opt/cray/pe/mpich/{0}/gtl/lib ".format(spec["mpi"].version)
-            hip_link_flags += "-Wl,-rpath,/opt/cray/pe/mpich/{0}/gtl/lib ".format(spec["mpi"].version)
+            hip_link_flags += "-Wl,-rpath,/opt/cray/pe/mpich/{0}/gtl/lib ".format(
+                spec["mpi"].version
+            )
             hip_link_flags += "-lmpi_gtl_hsa "
 
             # Fixes for mpi for rocm until wrapper paths are fixed
             # These flags are already part of the wrapped compilers on TOSS4 systems
-            if "+fortran" in spec and self.is_fortran_compiler("amdflang"):
+            if spec.satisfies("+fortran") and self.is_fortran_compiler("amdflang"):
                 hip_link_flags += "-Wl,--disable-new-dtags "
 
                 if spec.satisfies("^[email protected]:"):
-                    hip_link_flags += "-L{0}/lib/llvm/lib -Wl,-rpath,{0}/lib/llvm/lib ".format(rocm_root)
+                    hip_link_flags += "-L{0}/lib/llvm/lib -Wl,-rpath,{0}/lib/llvm/lib ".format(
+                        rocm_root
+                    )
                 else:
                     hip_link_flags += "-L{0}/llvm/lib -Wl,-rpath,{0}/llvm/lib ".format(rocm_root)
                 hip_link_flags += "-lpgmath -lflang -lflangrti -lompstub "
 
             # Remove extra link library for crayftn
-            if "+fortran" in spec and self.is_fortran_compiler("crayftn"):
+            if spec.satisfies("+fortran") and self.is_fortran_compiler("crayftn"):
                 entries.append(
                     cmake_cache_string("BLT_CMAKE_IMPLICIT_LINK_LIBRARIES_EXCLUDE", "unwind")
                 )
@@ -374,7 +384,7 @@ def initconfig_hardware_entries(self):
             )
         )
 
-        if "+fortran" in spec and self.is_fortran_compiler("xlf"):
+        if spec.satisfies("+fortran") and self.is_fortran_compiler("xlf"):
             # Grab lib directory for the current fortran compiler
             libdir = pjoin(os.path.dirname(os.path.dirname(self.compiler.fc)), "lib")
             description = (
@@ -385,7 +395,7 @@ def initconfig_hardware_entries(self):
 
             entries.append(cmake_cache_string("BLT_EXE_LINKER_FLAGS", linker_flags, description))
 
-            if "+shared" in spec:
+            if spec.satisfies("+shared"):
                 linker_flags = "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath," + libdir
                 entries.append(
                     cmake_cache_string("CMAKE_SHARED_LINKER_FLAGS", linker_flags, description)
@@ -399,9 +409,9 @@ def initconfig_hardware_entries(self):
             )
 
         if (
-            "+openmp" in spec
+            spec.satisfies("+openmp")
             and "clang" in self.compiler.cxx
-            and "+fortran" in spec
+            and spec.satisfies("+fortran")
             and self.is_fortran_compiler("xlf")
         ):
             openmp_gen_exp = (
@@ -440,7 +450,7 @@ def initconfig_mpi_entries(self):
         spec = self.spec
         entries = super().initconfig_mpi_entries()
 
-        if "+mpi" in spec:
+        if spec.satisfies("+mpi"):
             entries.append(cmake_cache_option("ENABLE_MPI", True))
             if spec["mpi"].name == "spectrum-mpi":
                 entries.append(cmake_cache_string("BLT_MPI_COMMAND_APPEND", "mpibind"))
@@ -491,25 +501,25 @@ def initconfig_package_entries(self):
 
         # optional tpls
         for dep in ("c2c", "mfem", "hdf5", "lua", "raja", "umpire", "opencascade"):
-            if "+%s" % dep in spec:
+            if spec.satisfies("+%s" % dep):
                 dep_dir = get_spec_path(spec, dep, path_replacements)
                 entries.append(cmake_cache_path("%s_DIR" % dep.upper(), dep_dir))
             else:
                 entries.append("# %s not built\n" % dep.upper())
 
-        if "+profiling" in spec:
+        if spec.satisfies("+profiling"):
             dep_dir = get_spec_path(spec, "adiak", path_replacements)
             entries.append(cmake_cache_path("ADIAK_DIR", dep_dir))
 
             dep_dir = get_spec_path(spec, "caliper", path_replacements)
             entries.append(cmake_cache_path("CALIPER_DIR", dep_dir))
 
-        if "+umpire" in spec and spec.satisfies("^camp"):
+        if spec.satisfies("+umpire") and spec.satisfies("^camp"):
             dep_dir = get_spec_path(spec, "camp", path_replacements)
             entries.append(cmake_cache_path("CAMP_DIR", dep_dir))
 
         # SCR does not export it's targets so we need to pull in its dependencies
-        if "+scr" in spec:
+        if spec.satisfies("+scr"):
             dep_dir = get_spec_path(spec, "scr", path_replacements)
             entries.append(cmake_cache_path("SCR_DIR", dep_dir))
 
@@ -542,20 +552,20 @@ def initconfig_package_entries(self):
         entries.append("#------------------{0}\n".format("-" * 60))
 
         # Add common prefix to path replacement list
-        if "+devtools" in spec:
+        if spec.satisfies("+devtools"):
             # Grab common devtools root and strip the trailing slash
             path1 = os.path.realpath(spec["cppcheck"].prefix)
             path2 = os.path.realpath(spec["doxygen"].prefix)
             self.find_path_replacement(path1, path2, path_replacements, "DEVTOOLS_ROOT", entries)
 
-        if "+devtools" in spec and spec.satisfies("^llvm"):
+        if spec.satisfies("+devtools") and spec.satisfies("^llvm"):
             clang_fmt_path = spec["llvm"].prefix.bin.join("clang-format")
             entries.append(cmake_cache_path("CLANGFORMAT_EXECUTABLE", clang_fmt_path))
         else:
             entries.append("# ClangFormat disabled due to llvm and devtools not in spec\n")
             entries.append(cmake_cache_option("ENABLE_CLANGFORMAT", False))
 
-        if "+python" in spec or "+devtools" in spec:
+        if spec.satisfies("+python") or spec.satisfies("+devtools"):
             python_path = os.path.realpath(spec["python"].command.path)
             for key in path_replacements:
                 python_path = python_path.replace(key, path_replacements[key])
@@ -601,7 +611,7 @@ def cmake_args(self):
         options.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared"))
         options.append(self.define_from_variant("AXOM_ENABLE_EXAMPLES", "examples"))
         options.append(self.define_from_variant("AXOM_ENABLE_TOOLS", "tools"))
-        if "+raja" not in self.spec or "+umpire" not in self.spec:
+        if self.spec.satisfies("~raja") or self.spec.satisfies("+umpire"):
             options.append("-DAXOM_ENABLE_MIR:BOOL=OFF")
 
         return options
@@ -623,34 +633,29 @@ def build_test(self):
 
     @run_after("install")
     @on_package_attributes(run_tests=True)
-    def check_install(self):
-        """
-        Checks the spack install of axom using axom's
-        using-with-cmake example
-        """
-
-        print("Checking Axom installation...")
-        spec = self.spec
-        install_prefix = spec.prefix
-        example_src_dir = join_path(install_prefix, "examples", "axom", "using-with-cmake")
-        example_build_dir = join_path(example_src_dir, "build")
-        print("Checking using-with-cmake example...")
-        with working_dir(example_build_dir, create=True):
+    def test_install_using_cmake(self):
+        """build example with cmake and run"""
+        example_src_dir = join_path(self.prefix.examples.axom, "using-with-cmake")
+        example_stage_dir = "./cmake"
+        shutil.copytree(example_src_dir, example_stage_dir)
+        with working_dir(join_path(example_stage_dir, "build"), create=True):
             cmake_args = ["-C ../host-config.cmake", example_src_dir]
+            cmake = self.spec["cmake"].command
             cmake(*cmake_args)
             make()
             example = Executable("./example")
             example()
-        print("Checking using-with-make example...")
-        example_src_dir = join_path(install_prefix, "examples", "axom", "using-with-make")
-        example_build_dir = join_path(example_src_dir, "build")
-        example_files = glob.glob(join_path(example_src_dir, "*"))
-        with working_dir(example_build_dir, create=True):
-            for example_file in example_files:
-                shutil.copy(example_file, ".")
-            make("AXOM_DIR={0}".format(install_prefix))
+            make("clean")
+
+    @run_after("install")
+    @on_package_attributes(run_tests=True)
+    def test_install_using_make(self):
+        """build example with make and run"""
+        example_src_dir = join_path(self.prefix.examples.axom, "using-with-make")
+        example_stage_dir = "./make"
+        shutil.copytree(example_src_dir, example_stage_dir)
+        with working_dir(example_stage_dir, create=True):
+            make(f"AXOM_DIR={self.prefix}")
             example = Executable("./example")
             example()
-
-    def test_install(self):
-        self.check_install()
+            make("clean")

scripts/spack/packages/axomdevtools/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class Axomdevtools(BundlePackage):
     """This is a set of tools necessary for the developers of Axom"""