flake

* Add gsl-lite from JCSDA/NOAA-EMC spack fork
* Black-format var/spack/repos/builtin/packages/gsl-lite/package.py
* Update maintainers and remove redundant dependency in var/spack/repos/builtin/packages/gsl-lite/package.py

.github/workflows/build-containers.yml

@@ -89,7 +89,7 @@ jobs:
         uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # @v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # @v1
+        uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # @v1
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # @v1
@@ -106,7 +106,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build & Deploy ${{ matrix.dockerfile[0] }}
-        uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3 # @v2
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # @v2
         with:
           context: dockerfiles/${{ matrix.dockerfile[0] }}
           platforms: ${{ matrix.dockerfile[1] }}

.github/workflows/valid-style.yml

@@ -44,7 +44,7 @@ jobs:
         cache: 'pip'
     - name: Install Python packages
       run: |
-        python3 -m pip install --upgrade pip six setuptools types-six black mypy isort clingo flake8
+        python3 -m pip install --upgrade pip six setuptools types-six black==22.12.0 mypy isort clingo flake8
     - name: Setup git configuration
       run: |
         # Need this for the git tests to succeed.

bin/spack.bat

@@ -83,6 +83,16 @@ if defined _sp_flags (
         exit /B 0
     )
 )
+if not defined _sp_subcommand (
+   if not defined _sp_args (
+      if not defined _sp_flags (
+         python "%spack%" --help
+         exit /B 0
+      )
+   )
+)
+
+
 :: pass parsed variables outside of local scope. Need to do
 :: this because delayedexpansion can only be set by setlocal
 echo %_sp_flags%>flags
@@ -92,24 +102,24 @@ endlocal
 set /p _sp_subcommand=<subcmd
 set /p _sp_flags=<flags
 set /p _sp_args=<args
-set str_subcommand=%_sp_subcommand:"='%
-set str_flags=%_sp_flags:"='%
-set str_args=%_sp_args:"='%
-if "%str_subcommand%"=="ECHO is off." (set "_sp_subcommand=")
-if "%str_flags%"=="ECHO is off." (set "_sp_flags=")
-if "%str_args%"=="ECHO is off." (set "_sp_args=")
+if "%_sp_subcommand%"=="ECHO is off." (set "_sp_subcommand=")
+if "%_sp_subcommand%"=="ECHO is on." (set "_sp_subcommand=")
+if "%_sp_flags%"=="ECHO is off." (set "_sp_flags=")
+if "%_sp_flags%"=="ECHO is on." (set "_sp_flags=")
+if "%_sp_args%"=="ECHO is off." (set "_sp_args=")
+if "%_sp_args%"=="ECHO is on." (set "_sp_args=")
 del subcmd
 del flags
 del args
 
 :: Filter out some commands. For any others, just run the command.
-if "%_sp_subcommand%" == "cd" (
+if %_sp_subcommand% == "cd" (
     goto :case_cd
-) else if "%_sp_subcommand%" == "env" (
+) else if %_sp_subcommand% == "env" (
     goto :case_env
-) else if "%_sp_subcommand%" == "load" (
+) else if %_sp_subcommand% == "load" (
     goto :case_load
-) else if "%_sp_subcommand%" == "unload" (
+) else if %_sp_subcommand% == "unload" (
     goto :case_load
 ) else (
     goto :default_case
@@ -143,19 +153,21 @@ goto :end_switch
 :: If no args or args contain --bat or -h/--help: just execute.
 if NOT defined _sp_args (
     goto :default_case
-)else if NOT "%_sp_args%"=="%_sp_args:--help=%" (
+)
+set args_no_quote=%_sp_args:"=%
+if NOT "%args_no_quote%"=="%args_no_quote:--help=%" (
     goto :default_case
-) else if NOT "%_sp_args%"=="%_sp_args: -h=%" (
+) else if NOT "%args_no_quote%"=="%args_no_quote: -h=%" (
     goto :default_case
-) else if NOT "%_sp_args%"=="%_sp_args:--bat=%" (
+) else if NOT "%args_no_quote%"=="%args_no_quote:--bat=%" (
     goto :default_case
-) else if NOT "%_sp_args%"=="%_sp_args:deactivate=%" (
+) else if NOT "%args_no_quote%"=="%args_no_quote:deactivate=%" (
     for /f "tokens=* USEBACKQ" %%I in (
-        `call python "%spack%" %_sp_flags% env deactivate --bat %_sp_args:deactivate=%`
+        `call python %spack% %_sp_flags% env deactivate --bat %args_no_quote:deactivate=%`
     ) do %%I
-) else if NOT "%_sp_args%"=="%_sp_args:activate=%" (
+) else if NOT "%args_no_quote%"=="%args_no_quote:activate=%" (
     for /f "tokens=* USEBACKQ" %%I in (
-        `call python "%spack%" %_sp_flags% env activate --bat %_sp_args:activate=%`
+        `python %spack% %_sp_flags% env activate --bat %args_no_quote:activate=%`
     ) do %%I
 ) else (
     goto :default_case
@@ -220,4 +232,4 @@ for %%I in (%~2) do (
         :pathadd "%~1" "%%I\%%Z"
     )
 )
-exit /B %ERRORLEVEL%
+exit /B %ERRORLEVEL%

lib/spack/docs/environments.rst

@@ -346,7 +346,7 @@ the Environment and then install the concretized specs.
    (see :ref:`build-jobs`). To speed up environment builds further, independent
    packages can be installed in parallel by launching more Spack instances. For
    example, the following will build at most four packages in parallel using
-   three background jobs: 
+   three background jobs:
 
    .. code-block:: console
 
@@ -394,7 +394,7 @@ version (and other constraints) passed as the spec argument to the
 
 For packages with ``git`` attributes, git branches, tags, and commits can
 also be used as valid concrete versions (see :ref:`version-specifier`).
-This means that for a package ``foo``, ``spack develop foo@git.main`` will clone 
+This means that for a package ``foo``, ``spack develop foo@git.main`` will clone
 the ``main`` branch of the package, and ``spack install`` will install from
 that git clone if ``foo`` is in the environment.
 Further development on ``foo`` can be tested by reinstalling the environment,
@@ -630,6 +630,35 @@ The following two Environment manifests are identical:
 Spec matrices can be used to install swaths of software across various
 toolchains.
 
+Note that ordering of matrices is important. For example, the
+following environments are identical:
+
+.. code-block:: yaml
+
+   spack:
+     specs:
+       - matrix:
+           - [hdf5@1.10.2+mpi]
+           - [^mpich, ^openmpi]
+           - ['%gcc']
+       - matrix:
+           - [hdf5@1.12.1+mpi]
+           - ['%gcc']
+           - [^mpich, ^openmpi]
+
+   spack:
+     specs:
+       - hdf5@1.10.2+mpi ^mpich%gcc
+       - hdf5@1.10.2+mpi ^openmpi%gcc
+       - hdf5@1.12.1+mpi %gcc ^mpich
+       - hdf5@1.12.1+mpi %gcc ^openmpi
+
+Notice how the first matrix applies the compiler constraints to the
+mpi dependencies, whereas the second matrix applies the compiler
+constraints directly to the root hdf5 node. This gives users the full
+breadth of expressiveness of the spec syntax through the matrix
+interface.
+
 ^^^^^^^^^^^^^^^^^^^^
 Spec List References
 ^^^^^^^^^^^^^^^^^^^^
@@ -1120,19 +1149,19 @@ index once every package is pushed. Note how this target uses the generated
 
    SPACK ?= spack
    BUILDCACHE_DIR = $(CURDIR)/tarballs
-   
+
    .PHONY: all
-   
+
    all: push
-   
+
    include env.mk
-   
+
    example/push/%: example/install/%
    	@mkdir -p $(dir $@)
    	$(info About to push $(SPEC) to a buildcache)
    	$(SPACK) -e . buildcache create --allow-root --only=package --directory $(BUILDCACHE_DIR) /$(HASH)
    	@touch $@
-   
+
    push: $(addprefix example/push/,$(example/SPACK_PACKAGE_IDS))
    	$(info Updating the buildcache index)
    	$(SPACK) -e . buildcache update-index --directory $(BUILDCACHE_DIR)

lib/spack/llnl/util/filesystem.py

@@ -23,7 +23,7 @@
 from llnl.util.lang import dedupe, memoized
 from llnl.util.symlink import islink, symlink
 
-from spack.util.executable import CommandNotFoundError, Executable, which
+from spack.util.executable import Executable, which
 from spack.util.path import path_to_os_path, system_path_filter
 
 is_windows = _platform == "win32"
@@ -117,13 +117,7 @@ def path_contains_subdirectory(path, root):
 @memoized
 def file_command(*args):
     """Creates entry point to `file` system command with provided arguments"""
-    try:
-        file_cmd = which("file", required=True)
-    except CommandNotFoundError as e:
-        if is_windows:
-            raise CommandNotFoundError("`file` utility is not available on Windows")
-        else:
-            raise e
+    file_cmd = which("file", required=True)
     for arg in args:
         file_cmd.add_default_arg(arg)
     return file_cmd
@@ -134,7 +128,11 @@ def _get_mime_type():
     """Generate method to call `file` system command to aquire mime type
     for a specified path
     """
-    return file_command("-b", "-h", "--mime-type")
+    if is_windows:
+        # -h option (no-dereference) does not exist in Windows
+        return file_command("-b", "--mime-type")
+    else:
+        return file_command("-b", "-h", "--mime-type")
 
 
 @memoized

lib/spack/spack/binary_distribution.py

@@ -294,10 +294,12 @@ def update_spec(self, spec, found_list):
                         cur_entry["spec"] = new_entry["spec"]
                         break
                 else:
-                    current_list.append = {
-                        "mirror_url": new_entry["mirror_url"],
-                        "spec": new_entry["spec"],
-                    }
+                    current_list.append(
+                        {
+                            "mirror_url": new_entry["mirror_url"],
+                            "spec": new_entry["spec"],
+                        }
+                    )
 
     def update(self, with_cooldown=False):
         """Make sure local cache of buildcache index files is up to date.

lib/spack/spack/bootstrap/environment.py

@@ -171,7 +171,7 @@ def mypy_root_spec():
 
 def black_root_spec():
     """Return the root spec used to bootstrap black"""
-    return _root_spec("py-black")
+    return _root_spec("py-black@:22.12.0")
 
 
 def flake8_root_spec():

lib/spack/spack/build_systems/generic.py

@@ -8,7 +8,7 @@
 import spack.directives
 import spack.package_base
 
-from ._checks import BaseBuilder, apply_macos_rpath_fixups
+from ._checks import BaseBuilder, apply_macos_rpath_fixups, execute_install_time_tests
 
 
 class Package(spack.package_base.PackageBase):
@@ -38,7 +38,16 @@ class GenericBuilder(BaseBuilder):
     legacy_methods: Tuple[str, ...] = ()
 
     #: Names associated with package attributes in the old build-system format
-    legacy_attributes: Tuple[str, ...] = ("archive_files",)
+    legacy_attributes: Tuple[str, ...] = (
+        "archive_files",
+        "install_time_test_callbacks",
+    )
+
+    #: Callback names for post-install phase tests
+    install_time_test_callbacks = []
 
     # On macOS, force rpaths for shared library IDs and remove duplicate rpaths
     spack.builder.run_after("install", when="platform=darwin")(apply_macos_rpath_fixups)
+
+    # unconditionally perform any post-install phase tests
+    spack.builder.run_after("install")(execute_install_time_tests)

lib/spack/spack/build_systems/msbuild.py

@@ -77,7 +77,7 @@ def toolchain_version(self):
         Override this method to select a specific version of the toolchain or change
         selection heuristics.
         Default is whatever version of msvc has been selected by concretization"""
-        return self.compiler.msvc_version
+        return "v" + self.pkg.compiler.platform_toolset_ver
 
     @property
     def std_msbuild_args(self):

lib/spack/spack/build_systems/nmake.py

@@ -92,7 +92,7 @@ def makefile_root(self):
         This path is relative to the root of the extracted tarball,
         not to the ``build_directory``. Defaults to the current directory.
         """
-        return self.stage.source_dir
+        return self.stage.source_path
 
     @property
     def nmakefile_name(self):

lib/spack/spack/cmd/ci.py

@@ -530,10 +530,9 @@ def ci_rebuild(args):
     if not verify_binaries:
         install_args.append("--no-check-signature")
 
-    cdash_args = []
     if cdash_handler:
         # Add additional arguments to `spack install` for CDash reporting.
-        cdash_args.extend(cdash_handler.args())
+        install_args.extend(cdash_handler.args())
 
     slash_hash = "/{}".format(job_spec.dag_hash())
     deps_install_args = install_args

lib/spack/spack/cmd/common/arguments.py

@@ -6,6 +6,7 @@
 
 import argparse
 import os.path
+import textwrap
 
 from llnl.util.lang import stable_partition
 
@@ -415,6 +416,40 @@ def add_cdash_args(subparser, add_help):
     cdash_subgroup.add_argument("--cdash-buildstamp", default=None, help=cdash_help["buildstamp"])
 
 
+def print_cdash_help():
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=textwrap.dedent(
+            """\
+environment variables:
+SPACK_CDASH_AUTH_TOKEN
+                    authentication token to present to CDash
+                    """
+        ),
+    )
+    add_cdash_args(parser, True)
+    parser.print_help()
+
+
+def sanitize_reporter_options(namespace: argparse.Namespace):
+    """Sanitize options that affect generation and configuration of reports, like
+    CDash or JUnit.
+
+    Args:
+        namespace: options parsed from cli
+    """
+    has_any_cdash_option = (
+        namespace.cdash_upload_url or namespace.cdash_build or namespace.cdash_site
+    )
+    if namespace.log_format == "junit" and has_any_cdash_option:
+        raise argparse.ArgumentTypeError("cannot pass any cdash option when --log-format=junit")
+
+    # If any CDash option is passed, assume --log-format=cdash is implied
+    if namespace.log_format is None and has_any_cdash_option:
+        namespace.log_format = "cdash"
+        namespace.reporter = _cdash_reporter(namespace)
+
+
 class ConfigSetAction(argparse.Action):
     """Generic action for setting spack config options from CLI.
 

lib/spack/spack/cmd/help.py

@@ -49,9 +49,9 @@
       @r{-variant} or @r{~variant}          disable <variant>
       @r{--variant} or @r{~~variant}        propagate disable <variant>
       @B{variant=value}                 set non-boolean <variant> to <value>
-      @B{variant==value}                 propagate non-boolean <variant> to <value>
+      @B{variant==value}                propagate non-boolean <variant> to <value>
       @B{variant=value1,value2,value3}  set multi-value <variant> values
-      @B{variant==value1,value2,value3}  propagate multi-value <variant> values
+      @B{variant==value1,value2,value3} propagate multi-value <variant> values
 
     architecture variants:
       @m{platform=platform}             linux, darwin, cray, etc.

lib/spack/spack/cmd/install.py

@@ -7,7 +7,6 @@
 import os
 import shutil
 import sys
-import textwrap
 from typing import List
 
 import llnl.util.filesystem as fs
@@ -260,7 +259,7 @@ def default_log_file(spec):
 
 def report_filename(args: argparse.Namespace, specs: List[spack.spec.Spec]) -> str:
     """Return the filename to be used for reporting to JUnit or CDash format."""
-    result = args.log_file or args.cdash_upload_url or default_log_file(specs[0])
+    result = args.log_file or default_log_file(specs[0])
     return result
 
 
@@ -348,21 +347,6 @@ def install_specs_outside_environment(specs, install_kwargs):
     builder.install()
 
 
-def print_cdash_help():
-    parser = argparse.ArgumentParser(
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog=textwrap.dedent(
-            """\
-environment variables:
-SPACK_CDASH_AUTH_TOKEN
-                    authentication token to present to CDash
-                    """
-        ),
-    )
-    arguments.add_cdash_args(parser, True)
-    parser.print_help()
-
-
 def install_all_specs_from_active_environment(
     install_kwargs, only_concrete, cli_test_arg, reporter_factory
 ):
@@ -496,7 +480,7 @@ def install(parser, args):
     tty.set_verbose(args.verbose or args.install_verbose)
 
     if args.help_cdash:
-        print_cdash_help()
+        spack.cmd.common.arguments.print_cdash_help()
         return
 
     if args.no_checksum:
@@ -505,6 +489,8 @@ def install(parser, args):
     if args.deprecated:
         spack.config.set("config:deprecated", True, scope="command_line")
 
+    spack.cmd.common.arguments.sanitize_reporter_options(args)
+
     def reporter_factory(specs):
         if args.log_format is None:
             return None

lib/spack/spack/cmd/test.py

@@ -11,7 +11,6 @@
 import re
 import shutil
 import sys
-import textwrap
 
 from llnl.util import lang, tty
 from llnl.util.tty import colify
@@ -171,20 +170,11 @@ def test_run(args):
 
     # cdash help option
     if args.help_cdash:
-        parser = argparse.ArgumentParser(
-            formatter_class=argparse.RawDescriptionHelpFormatter,
-            epilog=textwrap.dedent(
-                """\
-environment variables:
-  SPACK_CDASH_AUTH_TOKEN
-                        authentication token to present to CDash
-                        """
-            ),
-        )
-        arguments.add_cdash_args(parser, True)
-        parser.print_help()
+        arguments.print_cdash_help()
         return
 
+    arguments.sanitize_reporter_options(args)
+
     # set config option for fail-fast
     if args.fail_fast:
         spack.config.set("config:fail_fast", True, scope="command_line")
@@ -237,22 +227,22 @@ def test_run(args):
         )
 
 
+def report_filename(args, test_suite):
+    if args.log_file:
+        if os.path.isabs(args.log_file):
+            return args.log_file
+        else:
+            log_dir = os.getcwd()
+            return os.path.join(log_dir, args.log_file)
+    else:
+        return os.path.join(os.getcwd(), "test-%s" % test_suite.name)
+
+
 def create_reporter(args, specs_to_test, test_suite):
     if args.log_format is None:
         return None
 
-    filename = args.cdash_upload_url
-    if not filename:
-        if args.log_file:
-            if os.path.isabs(args.log_file):
-                log_file = args.log_file
-            else:
-                log_dir = os.getcwd()
-                log_file = os.path.join(log_dir, args.log_file)
-        else:
-            log_file = os.path.join(os.getcwd(), "test-%s" % test_suite.name)
-        filename = log_file
-
+    filename = report_filename(args, test_suite)
     context_manager = spack.report.test_context_manager(
         reporter=args.reporter(),
         filename=filename,

lib/spack/spack/cmd/tutorial.py

@@ -63,7 +63,7 @@ def tutorial(parser, args):
         if not tty.get_yes_or_no("Are you sure you want to proceed?"):
             tty.die("Aborted")
 
-    rm_cmds = ["rm -f %s" % f for f in rm_configs]
+    rm_cmds = [f"rm -f {f}" for f in rm_configs]
     tty.msg("Reverting compiler and repository configuration", *rm_cmds)
     for path in rm_configs:
         if os.path.exists(path):
@@ -71,19 +71,19 @@ def tutorial(parser, args):
 
     tty.msg(
         "Ensuring that the tutorial binary mirror is configured:",
-        "spack mirror add tutorial %s" % tutorial_mirror,
+        f"spack mirror add tutorial {tutorial_mirror}",
     )
     mirror_config = syaml_dict()
     mirror_config["tutorial"] = tutorial_mirror
     spack.config.set("mirrors", mirror_config, scope="user")
 
-    tty.msg("Ensuring that we trust tutorial binaries", "spack gpg trust %s" % tutorial_key)
+    tty.msg("Ensuring that we trust tutorial binaries", f"spack gpg trust {tutorial_key}")
     spack.util.gpg.trust(tutorial_key)
 
     # Note that checkout MUST be last. It changes Spack under our feet.
     # If you don't put this last, you'll get import errors for the code
     # that follows (exacerbated by the various lazy singletons we use)
-    tty.msg("Ensuring we're on the releases/v{0}.{1} branch".format(*spack.spack_version_info[:2]))
+    tty.msg(f"Ensuring we're on the {tutorial_branch} branch")
     git = spack.util.git.git(required=True)
     with working_dir(spack.paths.prefix):
         git("checkout", tutorial_branch)

lib/spack/spack/compilers/cce.py

@@ -89,6 +89,11 @@ def cxx14_flag(self):
             return "-std=c++14"
         return "-h std=c++14"
 
+    @property
+    def cxx17_flag(self):
+        if self.is_clang_based:
+            return "-std=c++17"
+
     @property
     def c99_flag(self):
         if self.is_clang_based:

lib/spack/spack/compilers/msvc.py

@@ -103,11 +103,22 @@ def short_msvc_version(self):
         """
         This is the shorthand VCToolset version of form
         MSVC<short-ver> *NOT* the full version, for that see
-        Msvc.msvc_version
+        Msvc.msvc_version or MSVC.platform_toolset_ver for the
+        raw platform toolset version
         """
-        ver = self.msvc_version[:2].joined.string[:3]
+        ver = self.platform_toolset_ver
         return "MSVC" + ver
 
+    @property
+    def platform_toolset_ver(self):
+        """
+        This is the platform toolset version of current MSVC compiler
+        i.e. 142.
+        This is different from the VC toolset version as established
+        by `short_msvc_version`
+        """
+        return self.msvc_version[:2].joined.string[:3]
+
     @property
     def cl_version(self):
         """Cl toolset version"""

lib/spack/spack/environment/environment.py

@@ -2265,15 +2265,12 @@ def _concretize_from_constraints(spec_constraints, tests=False):
         m += "concretization target. all specs must have a single name "
         m += "constraint for concretization."
         raise InvalidSpecConstraintError(m)
-    spec_constraints.remove(root_spec[0])
 
     invalid_constraints = []
     while True:
-        # Attach all anonymous constraints to one named spec
-        s = root_spec[0].copy()
-        for c in spec_constraints:
-            if c not in invalid_constraints:
-                s.constrain(c)
+        # Combine constraints into a single spec
+        s = Spec(" ".join([str(c) for c in spec_constraints if c not in invalid_constraints]))
+
         try:
             return s.concretized(tests=tests)
         except spack.spec.InvalidDependencyError as e:

lib/spack/spack/spec_list.py

@@ -51,7 +51,9 @@ def specs_as_constraints(self):
             constraints = []
             for item in self.specs_as_yaml_list:
                 if isinstance(item, dict):  # matrix of specs
-                    constraints.extend(_expand_matrix_constraints(item))
+                    expanded = _expand_matrix_constraints(item)
+                    for e in expanded:
+                        constraints.append([Spec(x) for x in e])
                 else:  # individual spec
                     constraints.append([Spec(item)])
             self._constraints = constraints
@@ -62,13 +64,11 @@ def specs_as_constraints(self):
     def specs(self):
         if self._specs is None:
             specs = []
-            # This could be slightly faster done directly from yaml_list,
-            # but this way is easier to maintain.
-            for constraint_list in self.specs_as_constraints:
-                spec = constraint_list[0].copy()
-                for const in constraint_list[1:]:
-                    spec.constrain(const)
-                specs.append(spec)
+            for item in self.specs_as_yaml_list:
+                if isinstance(item, dict):  # matrix of specs
+                    specs.extend([Spec(" ".join(x)) for x in _expand_matrix_constraints(item)])
+                else:  # individual spec
+                    specs.append(Spec(item))
             self._specs = specs
 
         return self._specs
@@ -193,11 +193,7 @@ def _expand_matrix_constraints(matrix_config):
     for combo in itertools.product(*expanded_rows):
         # Construct a combined spec to test against excludes
         flat_combo = [constraint for constraint_list in combo for constraint in constraint_list]
-        flat_combo = [Spec(x) for x in flat_combo]
-
-        test_spec = flat_combo[0].copy()
-        for constraint in flat_combo[1:]:
-            test_spec.constrain(constraint)
+        test_spec = Spec(" ".join(flat_combo))
 
         # Abstract variants don't have normal satisfaction semantics
         # Convert all variants to concrete types.
@@ -213,7 +209,7 @@ def _expand_matrix_constraints(matrix_config):
             continue
 
         if sigil:
-            flat_combo[0] = Spec(sigil + str(flat_combo[0]))
+            flat_combo[0] = sigil + flat_combo[0]
 
         # Add to list of constraints
         results.append(flat_combo)

lib/spack/spack/test/cmd/install.py

@@ -1187,3 +1187,16 @@ def test_padded_install_runtests_root(install_mockery_mutable_config, mock_fetch
     spack.config.set("config:install_tree:padded_length", 255)
     output = install("--test=root", "--no-cache", "test-build-callbacks", fail_on_error=False)
     assert output.count("method not implemented") == 1
+
+
+@pytest.mark.regression("35337")
+def test_report_filename_for_cdash(install_mockery_mutable_config, mock_fetch):
+    """Test that the temporary file used to write the XML for CDash is not the upload URL"""
+    parser = argparse.ArgumentParser()
+    spack.cmd.install.setup_parser(parser)
+    args = parser.parse_args(
+        ["--cdash-upload-url", "https://blahblah/submit.php?project=debugging", "a"]
+    )
+    _, specs = spack.cmd.install.specs_from_cli(args, {})
+    filename = spack.cmd.install.report_filename(args, specs)
+    assert filename != "https://blahblah/submit.php?project=debugging"

lib/spack/spack/test/cmd/maintainers.py

@@ -49,6 +49,8 @@ def test_all(mock_packages, capfd):
         "user2,",
         "user3",
         "py-extension1:",
+        "adamjstewart,",
+        "pradyunsg,",
         "user1,",
         "user2",
     ]
@@ -66,6 +68,10 @@ def test_all_by_user(mock_packages, capfd):
     with capfd.disabled():
         out = split(maintainers("--all", "--by-user"))
     assert out == [
+        "adamjstewart:",
+        "py-extension1",
+        "pradyunsg:",
+        "py-extension1",
         "user0:",
         "maintainers-3",
         "user1:",

lib/spack/spack/test/cmd/test.py

@@ -319,3 +319,26 @@ def test_test_results_status(mock_packages, mock_test_stage, status, expected):
         else:
             assert status in results
         assert expected in results
+
+
+@pytest.mark.regression("35337")
+def test_report_filename_for_cdash(install_mockery_mutable_config, mock_fetch):
+    """Test that the temporary file used to write Testing.xml for CDash is not the upload URL"""
+    name = "trivial"
+    spec = spack.spec.Spec("trivial-smoke-test").concretized()
+    suite = spack.install_test.TestSuite([spec], name)
+    suite.ensure_stage()
+
+    parser = argparse.ArgumentParser()
+    spack.cmd.test.setup_parser(parser)
+    args = parser.parse_args(
+        [
+            "run",
+            "--cdash-upload-url=https://blahblah/submit.php?project=debugging",
+            "trivial-smoke-test",
+        ]
+    )
+
+    spack.cmd.common.arguments.sanitize_reporter_options(args)
+    filename = spack.cmd.test.report_filename(args, suite)
+    assert filename != "https://blahblah/submit.php?project=debugging"

lib/spack/spack/test/directives.py

@@ -76,7 +76,7 @@ def test_error_on_anonymous_dependency(config, mock_packages):
     [
         ("maintainers-1", ["user1", "user2"]),
         # Reset from PythonPackage
-        ("py-extension1", ["user1", "user2"]),
+        ("py-extension1", ["adamjstewart", "pradyunsg", "user1", "user2"]),
         # Extends maintainers-1
         ("maintainers-3", ["user0", "user1", "user2", "user3"]),
     ],

lib/spack/spack/test/env.py

@@ -75,8 +75,8 @@ def test_env_change_spec(tmpdir, mock_packages, config):
   - desired_specs: ["mpileaks@2.1"]
   specs:
   - matrix:
-    - [$compilers]
     - [$desired_specs]
+    - [$compilers]
 """
 
 

lib/spack/spack/test/spec_list.py

@@ -61,25 +61,25 @@ def test_spec_list_expansions(self):
     @pytest.mark.parametrize(
         "specs,expected",
         [
-            # Constraints are ordered randomly
+            # Constraints are ordered carefully to apply to appropriate node
             (
                 [
                     {
                         "matrix": [
-                            ["^zmpi"],
-                            ["%gcc@4.5.0"],
                             ["hypre", "libelf"],
                             ["~shared"],
-                            ["cflags=-O3", 'cflags="-g -O0"'],
                             ["^foo"],
+                            ["^zmpi"],
+                            ["%gcc@4.5.0"],
+                            ["cflags=-O3", 'cflags="-g -O0"'],
                         ]
                     }
                 ],
                 [
-                    "hypre cflags=-O3 ~shared %gcc@4.5.0 ^foo ^zmpi",
-                    'hypre cflags="-g -O0" ~shared %gcc@4.5.0 ^foo ^zmpi',
-                    "libelf cflags=-O3 ~shared %gcc@4.5.0 ^foo ^zmpi",
-                    'libelf cflags="-g -O0" ~shared %gcc@4.5.0 ^foo ^zmpi',
+                    "hypre ~shared ^foo ^zmpi cflags=-O3 %gcc@4.5.0",
+                    'hypre ~shared ^foo ^zmpi cflags="-g -O0" %gcc@4.5.0',
+                    "libelf ~shared ^foo ^zmpi cflags=-O3 %gcc@4.5.0",
+                    'libelf ~shared ^foo ^zmpi cflags="-g -O0" %gcc@4.5.0',
                 ],
             ),
             # A constraint affects both the root and a dependency

lib/spack/spack/test/util/package_hash.py

@@ -238,7 +238,7 @@ class HasManyMetadataAttributes:
     url = "https://example.com/foo.tar.gz"
     git = "https://example.com/foo/bar.git"
 
-    maintainers = ["alice", "bob"]
+    maintainers("alice", "bob")
     tags = ["foo", "bar", "baz"]
 
     depends_on("foo")

lib/spack/spack/util/environment.py

@@ -912,7 +912,7 @@ def inspect_path(root, inspections, exclude=None):
     env = EnvironmentModifications()
     # Inspect the prefix to check for the existence of common directories
     for relative_path, variables in inspections.items():
-        expected = os.path.join(root, relative_path)
+        expected = os.path.join(root, os.path.normpath(relative_path))
 
         if os.path.isdir(expected) and not exclude(expected):
             for variable in variables:

share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml

@@ -7,10 +7,22 @@ default:
 # Job templates
 ########################################
 
-.pr:
+.aws-pr-creds:
+  variables:
+    AWS_ACCESS_KEY_ID: ${PR_MIRRORS_AWS_ACCESS_KEY_ID}
+    AWS_SECRET_ACCESS_KEY: ${PR_MIRRORS_AWS_SECRET_ACCESS_KEY}
+
+.aws-protected-creds:
+  variables:
+    AWS_ACCESS_KEY_ID: ${PROTECTED_MIRRORS_AWS_ACCESS_KEY_ID}
+    AWS_SECRET_ACCESS_KEY: ${PROTECTED_MIRRORS_AWS_SECRET_ACCESS_KEY}
+
+.pr-refs:
   only:
   - /^pr[\d]+_.*$/
-  - /^github\/pr[\d]+_.*$/
+
+.pr:
+  extends: [ ".pr-refs" ]
   variables:
     SPACK_BUILDCACHE_DESTINATION: "s3://spack-binaries-prs/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}"
     SPACK_PIPELINE_TYPE: "spack_pull_request"
@@ -21,7 +33,6 @@ default:
   - /^develop$/
   - /^releases\/v.*/
   - /^v.*/
-  - /^github\/develop$/
 
 .protected:
   extends: [ ".protected-refs" ]
@@ -30,7 +41,7 @@ default:
     SPACK_COPY_BUILDCACHE: "s3://spack-binaries/${CI_COMMIT_REF_NAME}"
     SPACK_PIPELINE_TYPE: "spack_protected_branch"
 
-.generate:
+.generate-base:
   stage: generate
   script:
     - uname -a || true
@@ -49,7 +60,6 @@ default:
   artifacts:
     paths:
       - "${CI_PROJECT_DIR}/jobs_scratch_dir"
-  tags: ["spack", "aws", "public", "medium", "x86_64"]
   variables:
     KUBERNETES_CPU_REQUEST: 4000m
     KUBERNETES_MEMORY_REQUEST: 16G
@@ -58,12 +68,15 @@ default:
   retry:
     max: 2
     when:
-      - runner_system_failure
-      - stuck_or_timeout_failure
+      - always
+
+.generate:
+  extends: [ ".generate-base" ]
+  tags: ["spack", "public", "medium", "x86_64"]
 
 .generate-aarch64:
   extends: [ ".generate" ]
-  tags: ["spack", "aws", "public", "medium", "aarch64"]
+  tags: ["spack", "public", "medium", "aarch64"]
 
 .pr-generate:
   extends: [ ".pr", ".generate" ]
@@ -81,20 +94,14 @@ default:
   stage: build
 
 .pr-build:
-  extends: [ ".pr", ".build" ]
-  variables:
-    AWS_ACCESS_KEY_ID: ${PR_MIRRORS_AWS_ACCESS_KEY_ID}
-    AWS_SECRET_ACCESS_KEY: ${PR_MIRRORS_AWS_SECRET_ACCESS_KEY}
+  extends: [ ".pr", ".build", ".aws-pr-creds" ]
 
 .protected-build:
-  extends: [ ".protected", ".build" ]
-  variables:
-    AWS_ACCESS_KEY_ID: ${PROTECTED_MIRRORS_AWS_ACCESS_KEY_ID}
-    AWS_SECRET_ACCESS_KEY: ${PROTECTED_MIRRORS_AWS_SECRET_ACCESS_KEY}
+  extends: [ ".protected", ".build", ".aws-protected-creds" ]
 
 protected-publish:
   stage: publish
-  extends: [ ".protected" ]
+  extends: [ ".protected", ".aws-protected-creds" ]
   image: "ghcr.io/spack/python-aws-bash:0.0.1"
   tags: ["spack", "public", "medium", "aws", "x86_64"]
   retry:
@@ -199,7 +206,6 @@ protected-publish:
 #   variables:
 #     AWS_ACCESS_KEY_ID: ${PR_MIRRORS_AWS_ACCESS_KEY_ID}
 #     AWS_SECRET_ACCESS_KEY: ${PR_MIRRORS_AWS_SECRET_ACCESS_KEY}
-
 # .mac-protected-build:
 #   extends: [ ".mac-protected", ".build" ]
 #   variables:
@@ -317,6 +323,43 @@ e4s-protected-build:
     - artifacts: True
       job: e4s-protected-generate
 
+########################################
+# GPU Testing Pipeline
+########################################
+.gpu-tests:
+  variables:
+    SPACK_CI_STACK_NAME: gpu-tests
+
+gpu-tests-pr-generate:
+  extends: [ ".gpu-tests", ".pr-generate"]
+  image: ecpe4s/ubuntu20.04-runner-x86_64:2023-01-01
+
+gpu-tests-protected-generate:
+  extends: [ ".gpu-tests", ".protected-generate"]
+  image: ecpe4s/ubuntu20.04-runner-x86_64:2023-01-01
+
+gpu-tests-pr-build:
+  extends: [ ".gpu-tests", ".pr-build" ]
+  trigger:
+    include:
+      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
+        job: gpu-tests-pr-generate
+    strategy: depend
+  needs:
+    - artifacts: True
+      job: gpu-tests-pr-generate
+
+gpu-tests-protected-build:
+  extends: [ ".gpu-tests", ".protected-build" ]
+  trigger:
+    include:
+      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
+        job: gpu-tests-protected-generate
+    strategy: depend
+  needs:
+    - artifacts: True
+      job: gpu-tests-protected-generate
+
 ########################################
 # E4S OneAPI Pipeline
 ########################################
@@ -326,11 +369,11 @@ e4s-protected-build:
 
 e4s-oneapi-pr-generate:
   extends: [ ".e4s-oneapi", ".pr-generate"]
-  image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2022-07-01
+  image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2023-01-01
 
 e4s-oneapi-protected-generate:
   extends: [ ".e4s-oneapi", ".protected-generate"]
-  image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2022-07-01
+  image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2023-01-01
 
 e4s-oneapi-pr-build:
   extends: [ ".e4s-oneapi", ".pr-build" ]
@@ -357,41 +400,41 @@ e4s-oneapi-protected-build:
 ########################################
 # E4S on Power
 ########################################
-# .power-e4s-generate-tags-and-image:
-#   image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu20.04-runner-ppc64le:2021-07-01", "entrypoint": [""] }
-#   tags: ["spack", "public", "medium", "ppc64le"]
+.e4s-power-generate-tags-and-image:
+  image: { "name": "ecpe4s/ubuntu20.04-runner-ppc64le:2023-01-01", "entrypoint": [""] }
+  tags: ["spack", "public", "large", "ppc64le"]
 
-# .e4s-on-power:
-#   variables:
-#     SPACK_CI_STACK_NAME: e4s-on-power
+.e4s-power:
+  variables:
+    SPACK_CI_STACK_NAME: e4s-power
 
-# e4s-on-power-pr-generate:
-#   extends: [ ".e4s-on-power", ".pr-generate", ".power-e4s-generate-tags-and-image"]
+e4s-power-pr-generate:
+  extends: [ ".e4s-power", ".pr-generate", ".e4s-power-generate-tags-and-image"]
 
-# e4s-on-power-protected-generate:
-#   extends: [ ".e4s-on-power", ".protected-generate", ".power-e4s-generate-tags-and-image"]
+e4s-power-protected-generate:
+  extends: [ ".e4s-power", ".protected-generate", ".e4s-power-generate-tags-and-image"]
 
-# e4s-on-power-pr-build:
-#   extends: [ ".e4s-on-power", ".pr-build" ]
-#   trigger:
-#     include:
-#       - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-#         job: e4s-on-power-pr-generate
-#     strategy: depend
-#   needs:
-#     - artifacts: True
-#       job: e4s-on-power-pr-generate
+e4s-power-pr-build:
+  extends: [ ".e4s-power", ".pr-build" ]
+  trigger:
+    include:
+      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
+        job: e4s-power-pr-generate
+    strategy: depend
+  needs:
+    - artifacts: True
+      job: e4s-power-pr-generate
 
-# e4s-on-power-protected-build:
-#   extends: [ ".e4s-on-power", ".protected-build" ]
-#   trigger:
-#     include:
-#       - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-#         job: e4s-on-power-protected-generate
-#     strategy: depend
-#   needs:
-#     - artifacts: True
-#       job: e4s-on-power-protected-generate
+e4s-power-protected-build:
+  extends: [ ".e4s-power", ".protected-build" ]
+  trigger:
+    include:
+      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
+        job: e4s-power-protected-generate
+    strategy: depend
+  needs:
+    - artifacts: True
+      job: e4s-power-protected-generate
 
 #########################################
 # Build tests for different build-systems

share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml

@@ -1,269 +0,0 @@
-spack:
-  view: false
-
-  concretizer:
-    reuse: false
-    unify: false
-
-  config:
-    concretizer: clingo
-    install_tree:
-      root: /home/software/spack
-      padded_length: 512
-      projections:
-        all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'
-
-  packages:
-    all:
-      compiler:
-        - gcc@9.3.0
-      providers:
-        blas:
-          - openblas
-        mpi:
-          - mpich
-      target:
-        - ppc64le
-      variants: +mpi
-    binutils:
-      variants: +ld +gold +headers +libiberty ~nls +plugins
-      version:
-      - 2.36.1
-    doxygen:
-      version:
-      - 1.8.20
-    elfutils:
-      variants: +bzip2 ~nls +xz
-    hdf5:
-      variants: +fortran +hl +shared api=v18
-      version:
-      - 1.12.0
-    libfabric:
-      variants: fabrics=sockets,tcp,udp,rxm
-    libunwind:
-      variants: +pic +xz
-    mesa:
-      variants: ~llvm
-    mesa18:
-      variants: ~llvm
-    mpich:
-      variants: ~wrapperrpath
-    ncurses:
-      variants: +termlib
-    openblas:
-      variants: threads=openmp
-    trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
-    xz:
-      variants: +pic
-
-  definitions:
-
-  - cuda_specs:
-    - amrex +cuda cuda_arch=70
-    - caliper +cuda cuda_arch=70
-    - chai ~benchmarks ~tests +cuda cuda_arch=70 ^umpire ~shared
-    - ginkgo +cuda cuda_arch=70
-    - heffte +cuda cuda_arch=70
-    - hpx +cuda cuda_arch=70
-    - hypre +cuda cuda_arch=70
-    - kokkos +wrapper +cuda cuda_arch=70
-    - kokkos-kernels +cuda cuda_arch=70 ^kokkos +wrapper +cuda cuda_arch=70
-    - magma +cuda cuda_arch=70
-    - mfem +cuda cuda_arch=70
-    - parsec +cuda cuda_arch=70
-    - petsc +cuda cuda_arch=70
-    - raja +cuda cuda_arch=70
-    - slate +cuda cuda_arch=70
-    - slepc +cuda cuda_arch=70
-    - strumpack ~slate +cuda cuda_arch=70
-    - sundials +cuda cuda_arch=70
-    - superlu-dist +cuda cuda_arch=70
-    - tasmanian +cuda cuda_arch=70
-    - trilinos@13.2.0 +cuda cuda_arch=70
-    - umpire ~shared +cuda cuda_arch=70
-    - vtk-m +cuda cuda_arch=70
-    - zfp +cuda cuda_arch=70
-   #- ascent ~shared +cuda cuda_arch=70
-   #- axom +cuda cuda_arch=70 ^umpire ~shared
-   #- dealii +cuda cuda_arch=70 # gmsh
-   #- flecsi +cuda cuda_arch=70
-   #- paraview +cuda cuda_arch=70
-
-  - default_specs:
-    - adios
-    - adios2
-    - aml
-    - amrex
-    - arborx
-    - archer
-    - argobots
-    - ascent
-    - axom ^umpire@4.1.2
-    - bolt
-    - cabana
-    - caliper
-    - chai ~benchmarks ~tests ^umpire@4.1.2
-    - charliecloud
-    - conduit
-    - darshan-runtime
-    - darshan-util
-    - datatransferkit
-    - dyninst
-    - faodel ~tcmalloc
-    - flecsi
-    - flit
-    - flux-core
-    - fortrilinos
-    - gasnet
-    - ginkgo
-    - globalarrays
-    - gmp
-    - gotcha
-    - gptune
-    - hdf5
-    - heffte +fftw
-    - hpctoolkit
-    - hpx
-    - hypre
-    - kokkos +openmp
-    - kokkos-kernels +openmp
-    - legion
-    - libnrm
-    - libquo
-    - libunwind
-    - llvm targets=amdgpu,nvptx +clang +compiler-rt +libcxx +lld +lldb +llvm_dylib +flang ~cuda
-    - loki
-    - mercury
-    - metall
-    - mfem
-    - mpark-variant
-    - mpifileutils ~xattr
-    - netlib-scalapack
-    - ninja
-    - nrm
-    - nvhpc
-    - omega-h
-    - openmpi
-    - openpmd-api ^hdf5@1.12.0 +fortran +shared +hl api=default
-    - papi
-    - papyrus@1.0.1
-    - parallel-netcdf
-    - paraview
-    - parsec ~cuda
-    - pdt
-    - petsc
-    - plasma
-    - precice
-    - pumi
-    - py-jupyterhub
-    - py-libensemble
-    - py-petsc4py
-    - py-warpx ^warpx dims=2 ^hdf5@1.12.0 +fortran +shared +hl api=default
-    - py-warpx ^warpx dims=3 ^hdf5@1.12.0 +fortran +shared +hl api=default
-    - py-warpx ^warpx dims=rz ^hdf5@1.12.0 +fortran +shared +hl api=default
-    - qthreads scheduler=distrib
-    - raja
-    - rempi
-    - scr
-    - slate ~cuda
-    - slepc
-    - stc
-    - strumpack ~slate
-    - sundials
-    - superlu
-    - superlu-dist
-    - swig
-    - swig@4.0.2-fortran
-    - sz
-    - tasmanian
-    - tau +mpi +python
-    - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
-    - turbine
-    - umap
-    - unifyfs@0.9.1
-    - upcxx
-    - variorum
-    - veloc
-    - vtk-m
-    - zfp
-    #- dealii
-    #- geopm
-    #- phist
-    #- qt
-    #- qwt
-    #- stat
-    #- umpire
-
-  - arch:
-    - '%gcc target=ppc64le'
-
-
-  specs:
-
-  - matrix:
-    - - $default_specs
-    - - $arch
-
-  - matrix:
-    - - $cuda_specs
-    - - $arch
-
-  mirrors: { "mirror": "s3://spack-binaries/e4s" }
-
-  gitlab-ci:
-
-    script:
-      - uname -a || true
-      - grep -E 'vendor|model name' /proc/cpuinfo 2>/dev/null | sort -u || head -n10 /proc/cpuinfo 2>/dev/null || true
-      - nproc
-      - curl -Lfs 'https://github.com/JuliaBinaryWrappers/GNUMake_jll.jl/releases/download/GNUMake-v4.3.0+1/GNUMake.v4.3.0.powerpc64le-linux-gnu.tar.gz' -o gmake.tar.gz
-      - printf '8096d202fe0a0c400b8c0573c4b9e009f2f10d2fa850a3f495340f16e9c42454 gmake.tar.gz' | sha256sum --check --strict --quiet
-      - tar -xzf gmake.tar.gz -C /usr bin/make 2> /dev/null
-      - . "./share/spack/setup-env.sh"
-      - spack --version
-      - spack arch
-      - cd ${SPACK_CONCRETE_ENV_DIR}
-      - spack env activate --without-view .
-      - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'"
-      - spack --color=always --backtrace ci rebuild
-    after_script:
-      - cat /proc/loadavg || true
-
-    match_behavior: first
-    mappings:
-      - match:
-        - cuda
-        - dyninst
-        - hpx
-        - llvm
-        - llvm-amdgpu
-        - precice
-        - rocblas
-        - rocsolver
-        - strumpack
-        - sundials
-        - trilinos
-        - vtk-h
-        - vtk-m
-        - warpx
-        runner-attributes:
-          image: { "name": "ghcr.io/spack/e4s-ubuntu-20.04:v2021-10-18", "entrypoint": [""] }
-          tags: ["spack", "public", "xlarge", "ppc64le"]
-      - match: ['os=ubuntu20.04']
-        runner-attributes:
-          image: { "name": "ghcr.io/spack/e4s-ubuntu-20.04:v2021-10-18", "entrypoint": [""] }
-          tags: ["spack", "public", "large", "ppc64le"]
-    broken-specs-url: "s3://spack-binaries-develop/broken-specs"
-    service-job-attributes:
-      before_script:
-        - . "./share/spack/setup-env.sh"
-        - spack --version
-      image: { "name": "ghcr.io/spack/e4s-ubuntu-20.04:v2021-10-18", "entrypoint": [""] }
-      tags: ["spack", "public", "medium", "ppc64le"]
-
-  cdash:
-    build-group: New PR testing workflow
-    url: https://cdash.spack.io
-    project: Spack Testing
-    site: Cloud Gitlab Infrastructure

share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml

@@ -3,7 +3,7 @@ spack:
 
   concretizer:
     reuse: false
-    unify: when_possible
+    unify: false
 
   config:
     build_jobs: 32
@@ -16,37 +16,37 @@ spack:
 
   compilers:
   - compiler:
-      spec: dpcpp@2022.1.0
+      spec: dpcpp@2023.0.0
       paths:
-        cc: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/icx
-        cxx: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/dpcpp
-        f77: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/ifx
-        fc: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/ifx
+        cc: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/icx
+        cxx: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/dpcpp
+        f77: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/ifx
+        fc: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/ifx
       flags: {}
       operating_system: ubuntu20.04
       target: x86_64
       modules: [compiler]
       environment:
         prepend_path:
-          LD_LIBRARY_PATH: /opt/intel/oneapi/compiler/2022.1.0/linux/compiler/lib/intel64_lin
+          LD_LIBRARY_PATH: /opt/intel/oneapi/compiler/2023.0.0/linux/compiler/lib/intel64_lin
       extra_rpaths: []
   - compiler:
-      spec: oneapi@2022.1.0
+      spec: oneapi@2023.0.0
       paths:
-        cc: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/icx
-        cxx: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/icpx
-        f77: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/ifx
-        fc: /opt/intel/oneapi/compiler/2022.1.0/linux/bin/ifx
+        cc: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/icx
+        cxx: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/icpx
+        f77: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/ifx
+        fc: /opt/intel/oneapi/compiler/2023.0.0/linux/bin/ifx
       flags: {}
       operating_system: ubuntu20.04
       target: x86_64
       modules: [compiler]
       environment:
         prepend_path:
-          LD_LIBRARY_PATH: /opt/intel/oneapi/compiler/2022.1.0/linux/compiler/lib/intel64_lin
+          LD_LIBRARY_PATH: /opt/intel/oneapi/compiler/2023.0.0/linux/compiler/lib/intel64_lin
       extra_rpaths: []
   - compiler:
-      spec: gcc@9.4.0
+      spec: gcc@11.1.0
       paths:
         cc: /usr/bin/gcc
         cxx: /usr/bin/g++
@@ -60,20 +60,13 @@ spack:
       extra_rpaths: []
 
   packages:
-    adios2:
-      require: "%gcc"
     all:
-      require: "%oneapi"
+      require: '%oneapi'
       providers:
         blas: [openblas]
         mpi: [mpich]
       target: [x86_64]
       variants: +mpi
-    binutils:
-      require: "%gcc"
-      variants: +ld +gold +headers +libiberty ~nls
-    cuda:
-      version: [11.4.2]
     elfutils:
       variants: +bzip2 ~nls +xz
     hdf5:
@@ -82,8 +75,6 @@ spack:
       variants: fabrics=sockets,tcp,udp,rxm
     libunwind:
       variants: +pic +xz
-    llvm:
-      require: "%gcc" # undefined reference to `_intel_fast_memset' becauase of -nodefaultlibs
     mpich:
       variants: ~wrapperrpath
     ncurses:
@@ -92,35 +83,55 @@ spack:
       variants: threads=openmp
     python:
       version: [3.8.13]
-    ruby:
-      require: "%gcc" # https://github.com/spack/spack/issues/31954
-    rust:
-      require: "%gcc" # undefined reference becauase of -nodefaultlibs
     trilinos:
       variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
         +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
         +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
-      require: "~openmp"
+      require: ~openmp
     xz:
       variants: +pic
     mesa:
       version: [21.3.8]
 
+    binutils:
+      require: '%gcc'
+      variants: +ld +gold +headers +libiberty ~nls
+    bison:
+      require: '%gcc'
+    krb5:
+      require: '%gcc'
+    llvm:
+      require: '%gcc'
+    m4:
+      require: '%gcc'
+    openssh:
+      require: '%gcc'
+    papi:
+      require: '%gcc'
+    py-scipy:
+      require: '%gcc'
+    ruby:
+      require: '%gcc'
+    rust:
+      require: '%gcc'
+    unzip:
+      require: '%gcc'
+
   specs:
   # CPU
   - adios
+  - adios2
   - alquimia
   - aml
-  - amrex
   - arborx
   - archer
   - argobots
   - ascent
+  - amrex
   - axom
   - bolt
-  - bricks
   - butterflypack
   - cabana
   - caliper
@@ -129,20 +140,15 @@ spack:
   - darshan-runtime
   - darshan-util
   - datatransferkit
-  - exaworks
   - faodel
   - flit
-  - flux-core
   - fortrilinos
   - gasnet
-  - ginkgo
   - globalarrays
   - gmp
   - gotcha
-  - gptune
   - hdf5 +fortran +hl +shared
   - heffte +fftw
-  - hpx max_cpu_count=512 networking=mpi
   - hypre
   - kokkos-kernels +openmp
   - kokkos +openmp
@@ -160,7 +166,6 @@ spack:
   - nccmp
   - nco
   - netlib-scalapack
-  - nrm
   - omega-h
   - openmpi
   - openpmd-api
@@ -174,17 +179,11 @@ spack:
   - plumed
   - precice
   - pumi
-  - py-cinemasci
-  - py-jupyterhub
   - py-libensemble
   - py-petsc4py
-  - py-warpx ^warpx dims=2
-  - py-warpx ^warpx dims=3
-  - py-warpx ^warpx dims=rz
   - qthreads scheduler=distrib
   - raja
   - rempi
-  - scr
   - slate ~cuda
   - slepc
   - stc
@@ -193,14 +192,12 @@ spack:
   - superlu-dist
   - superlu
   - swig
-  - swig@4.0.2-fortran
   - sz
   - tasmanian
-  - tau +mpi +python
   - trilinos@13.0.1 +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-   +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-   +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
-   +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+    +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
+    +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+    +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
   - turbine
   - umap
   - umpire
@@ -213,54 +210,72 @@ spack:
 
   # GPU
   - aml +ze
-  - amrex +sycl
   - arborx +sycl ^kokkos +sycl +openmp std=17 +tests +examples
-  - cabana +sycl ^kokkos+sycl +openmp std=17 +tests +examples
+  - cabana +sycl ^kokkos +sycl +openmp std=17 +tests +examples
   - kokkos +sycl +openmp std=17 +tests +examples %oneapi
-  - kokkos-kernels build_type=Release %oneapi ^kokkos +sycl +openmp std=17 +tests +examples %oneapi
+  - kokkos-kernels build_type=Release ^kokkos +sycl +openmp std=17 +tests +examples %oneapi
 
-  # CPU BUILD FAILURES
-  #- adios2@2.8.0                                     # adios2
-  #- charliecloud@0.26                                # charliecloud
-  #- dyninst@12.1.0                                   # old intel-tbb
-  #- geopm@1.1.0                                      # geopm
-  #- h5bench@1.2                                      # h5bench
-  #- hpctoolkit                                       # dyninst
-  #- phist@1.9.5                                      # phist
-  #- paraview +qt                                     # qt
-  #- pruners-ninja@1.0.1                              # pruners-ninja
-  #- variorum@0.4.1                                   # variorum
-
-  # CPU BUILD FAILURES - NOTES
-  # adios2: /usr/bin/ld: ../../lib/libadios2_fortran.so.2.8.2: version node not found for symbol adios2_adios_init_mod@adios2_adios_init_serial_smod._; /usr/bin/ld: failed to set dynamic section sizes: bad value
+  # CPU FAILURES
+  # - bricks                                    # bricks
+  # - charliecloud                              # charliecloud
+  # - dyninst                                   # old intel-tbb
+  # - exaworks                                  # py-setuptools-scm
+  # - flux-core                                 # py-setuptools-scm
+  # - geopm                                     # geopm
+  # - ginkgo                                    # ginkgo
+  # - gptune                                    # py-scipy@1.3.3
+  # - h5bench                                   # h5bench
+  # - hpctoolkit                                # dyninst
+  # - hpx max_cpu_count=512 networking=mpi      # boost cxxstd=17
+  # - nrm                                       # py-scipy
+  # - paraview +qt                              # qt
+  # - phist                                     # phist
+  # - pruners-ninja                             # pruners-ninja
+  # - py-cinemasci                              # py-scipy@1.3.3, py-setuptools-scm
+  # - py-jupyterhub                             # py-setuptools-scm
+  # - py-warpx ^warpx dims=2                    # py-scipy@1.5.4
+  # - py-warpx ^warpx dims=3                    # py-scipy@1.5.4
+  # - py-warpx ^warpx dims=rz                   # py-scipy@1.5.4
+  # - scr                                       # libyogrt
+  # - swig@4.0.2-fortran                        # swig
+  # - tau +mpi +python                          # tau
+  # - variorum                                  # variorum
+  # --
+  # amrex: /opt/intel/oneapi/compiler/2023.0.0/linux/bin-llvm/../include/sycl/detail/defines_elementary.hpp:52:40: note: expanded from macro '__SYCL2020_DEPRECATED'
+  # amrex: /opt/intel/oneapi/compiler/2023.0.0/linux/bin-llvm/../include/sycl/detail/defines_elementary.hpp:52:40: note: expanded from macro '__SYCL2020_DEPRECATED'
   # binutils: gold/powerpc.cc:3590: undefined reference to `gold::Sized_symbol<64>::Value_type gold::Symbol_table::compute_final_value<64>(gold::Sized_symbol<64> const*, gold::Symbol_table::Compute_final_value_status*) const'
+  # boost cxxstd=17: ./boost/mpl/aux_/integral_wrapper.hpp:73:31: error: integer value -1 is outside the valid range of values [0, 3] for this enumeration type [-Wenum-constexpr-conversion]
+  # bricks: cc1plus: error: bad value ('OFF') for '-mtune=' switch
   # charliecloud: autoreconf phase: RuntimeError: configure script not found in ...
   # flux-sched: include/yaml-cpp/emitter.h:164:9: error: comparison with NaN always evaluates to false in fast floating point modes [-Werror,-Wtautological-constant-compare]
   # flux-sched: include/yaml-cpp/emitter.h:171:24: error: comparison with infinity always evaluates to false in fast floating point modes [-Werror,-Wtautological-constant-compare]
+  # ginkgo: icpx: error: clang frontend command failed with exit code 139
   # h5bench: commons/h5bench_util.h:196: multiple definition of `has_vol_async';
   # intel-tbb: clang++clang++clang++clang++clang++clang++clang++: : : : : : : clang++error: : unknown argument: '-flifetime-dse=1'
+  # libyogrt: configure: error: slurm is not in specified location!
   # phist: fortran_bindings/test/kernels.F90(63): error #8284: If the actual argument is scalar, the dummy argument shall be scalar unless the actual argument is of type character or is an element of an array that is not assumed shape, pointer, or polymorphic.   [ARGV]
   # pruners-ninja: test/ninja_test_util.c:34: multiple definition of `a';
+  # py-cryptography: ??
+  # py-scipy@1.3.3: gcc: error: unrecognized command-line option '-fp-model=strict'
+  # py-scipy@1.5.4: gcc: error: unrecognized command-line option '-fp-model=strict'
+  # py-setuptools-scm: ??
   # ruby: limits.c:415:34: error: invalid suffix 'D' on floating constant
   # rust: /usr/bin/ld: /opt/intel/oneapi/compiler/2022.1.0/linux/bin-llvm/../compiler/lib/intel64_lin/libimf.a(libm_feature_flag.o): in function `__libm_feature_flag_init': libm_feature_flag.c:(.text+0x25): undefined reference to `__intel_cpu_feature_indicator_x'
+  # swig@4.0.2-fortran: /spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-11.1.0/m4-1.4.19-p3otmjixpi6zibdsyoqib5dpzfshq3nj/bin/m4:/spack/opt/spack/linux-ubuntu20.04-x86_64/oneapi-2023.0.0/bison-3.8.2-xca2sot4jhd72hvj2m2b3ajchagczvau/share/bison/skeletons/yacc.c:420: undefined macro `b4_symbol(103, tag)'
+  # tau: Error: Unable to identify ifort lib directory
   # variorum: ld: Intel/CMakeFiles/variorum_intel.dir/msr_core.c.o:(.bss+0x0): multiple definition of `g_platform'; CMakeFiles/variorum.dir/config_architecture.c.o:(.bss+0x0): first defined here
   # vtk-m +openmp: clang++: error: clang frontend command failed with exit code 139 (use -v to see invocation)
 
-  # GPU BUILD FAILURES
-  #- ginkgo@1.4.0 +oneapi %dpcpp ^cmake%oneapi                                              # ginkgo
-  #- hpctoolkit@2022.04.15 +level_zero                                                      # dyninst
-  #- sundials@6.2.0 +sycl cxxstd=17                                                         # sundials
-  #- tau@2.31.1 +mpi +opencl +level_zero ~pdt %oneapi ^binutils%gcc@9.4.0 ^papi%gcc@9.4.0   # tau
-
-  # GPU BUILD FAILURES - NOTES
-  # berkeley-db %dpcpp: dpcpp: dpcpperror: : no such file or directory: '/tmp/conftest-9d8d34.o'
-  # ginkgo %dpcpp: CMakeTestCXXCompiler.cmake:62: /usr/bin/ld: warning: libsvml.so, needed by /opt/intel/oneapi/compiler/2022.1.0/linux/bin-llvm/../lib/libsycl.so, not found (try using -rpath or -rpath-link) ...
-  # ncurses %dpcpp: If you have ncurses 4.2 applications, you should read the INSTALL document, and install the terminfo without the -x optiontic: error while loading shared libraries: libsvml.so: cannot open shared object file: No such file or directory
-  # sundials: include/sunmemory/sunmemory_sycl.h:20:10: fatal error: 'CL/sycl.hpp' file not found
-  # tau: requires libdrm-dev
+  # GPU FAILURES
+  # - amrex +sycl                           # amrex
+  # - ginkgo +oneapi                        # ginkgo
+  # - hpctoolkit +level_zero                # dyninst
+  # - sundials +sycl cxxstd=17              # sundials
+  # - tau +mpi +opencl +level_zero ~pdt     # tau
+  # --
 
   # SKIPPED
-  #- flecsi@1.4.2    # dependency pfunit marks oneapi as an unsupported compiler
+  # - flecsi                                # dependency pfunit marks oneapi as an unsupported compiler
 
   mirrors: { "mirror": "s3://spack-binaries/develop/e4s-oneapi" }
 
@@ -286,14 +301,14 @@ spack:
       - if [[ -r /mnt/key/intermediate_ci_signing_key.gpg ]]; then spack gpg trust /mnt/key/intermediate_ci_signing_key.gpg; fi
       - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi
       - export PATH=/bootstrap/runner/view/bin:${PATH}
-      - . /bootstrap/runner/install/linux-ubuntu20.04-x86_64/gcc-9.4.0/lmod-8.7.2-ri26z7qy6ixtgpsqinswx3w6tuggluv5/lmod/8.7.2/init/bash
+      - . /bootstrap/runner/install/linux-ubuntu20.04-x86_64/gcc-11.1.0/lmod-8.7.2-b7eq7rjeckn3m4o4lglsakilibkznjom/lmod/8.7.2/init/bash
       - module use /opt/intel/oneapi/modulefiles
       - module load compiler
       - spack --color=always --backtrace ci rebuild > >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt) 2> >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt >&2)
     after_script:
       - cat /proc/loadavg || true
 
-    image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2022-07-01
+    image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2023-01-01
 
     match_behavior: first
     mappings:
@@ -478,7 +493,7 @@ spack:
       before_script:
         - . "./share/spack/setup-env.sh"
         - spack --version
-      image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2022-07-01
+      image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2023-01-01
       tags: ["spack", "public", "x86_64"]
 
     signing-job-attributes:

share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml

@@ -0,0 +1,423 @@
+spack:
+  view: false
+
+  concretizer:
+    reuse: false
+    unify: false
+
+  config:
+    concretizer: clingo
+    install_tree:
+      root: /home/software/spack
+      padded_length: 512
+      projections:
+        all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'
+
+  packages:
+    all:
+      compiler: [gcc@11.1.0]
+      providers:
+        blas: [openblas]
+        mpi: [mpich]
+      target: [ppc64le]
+      variants: +mpi cuda_arch=70
+    tbb:
+      require: intel-tbb
+    binutils:
+      variants: +ld +gold +headers +libiberty ~nls
+    cuda:
+      version: [11.7.0]
+    elfutils:
+      variants: +bzip2 ~nls +xz
+    hdf5:
+      variants: +fortran +hl +shared
+    libfabric:
+      variants: fabrics=sockets,tcp,udp,rxm
+    libunwind:
+      variants: +pic +xz
+    mpich:
+      variants: ~wrapperrpath
+    ncurses:
+      variants: +termlib
+    openblas:
+      variants: threads=openmp
+    paraview:
+      require: '@5.11 ~qt+osmesa'
+    python:
+      version: [3.7.15]
+    trilinos:
+      require: +amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
+        +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro
+        +phalanx +rol +rythmos +sacado +stk +shards +shylu +stratimikos +teko +tempus
+        +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+    xz:
+      variants: +pic
+    mesa:
+      version: [21.3.8]
+    faodel:
+      require: ~tcmalloc # needed for ppc64le
+
+  specs:
+  # CPU
+  - adios
+  - alquimia
+  - aml
+  - amrex
+  - arborx
+  - argobots
+  - axom
+  - bolt
+  - butterflypack
+  - cabana
+  - caliper
+  - chai ~benchmarks ~tests
+  - charliecloud
+  - conduit
+  - datatransferkit
+  - dyninst
+  - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 ~paraview +pnetcdf +sz +unifyfs +veloc +visit +vtkm +zfp # +paraview fails: FAILED: VTK/Filters/Statistics/CMakeFiles/FiltersStatistics-objects.dir/vtkPCAStatistics.cxx.o: /tmp/ccgvkIk5.s: Assembler messages: /tmp/ccgvkIk5.s:260012: Error: invalid machine `power10'
+  - exaworks
+  - flecsi
+  - flit
+  - flux-core
+  - fortrilinos
+  - gasnet
+  - ginkgo
+  - globalarrays
+  - gmp
+  - gotcha
+  - gptune
+  - h5bench
+  - hdf5-vol-async
+  - heffte +fftw
+  - hpctoolkit
+  - hpx max_cpu_count=512 networking=mpi
+  - hypre
+  - kokkos +openmp
+  - kokkos-kernels +openmp
+  - lammps
+  - legion
+  - libnrm
+  - libquo
+  - libunwind
+  - mercury
+  - metall
+  - mfem
+  - mpark-variant
+  - mpifileutils ~xattr
+  - nccmp
+  - nco
+  - netlib-scalapack
+  - nrm
+  - nvhpc
+  - omega-h
+  - openmpi
+  - openpmd-api
+  - papi
+  - papyrus
+  - parsec ~cuda
+  - pdt
+  - petsc
+  - phist
+  - plasma
+  - plumed
+  - pumi
+  - py-h5py
+  - py-jupyterhub
+  - py-libensemble +mpi +nlopt
+  - py-petsc4py
+  - py-warpx ^warpx dims=2
+  - py-warpx ^warpx dims=3
+  - py-warpx ^warpx dims=rz
+  - qthreads scheduler=distrib
+  - quantum-espresso
+  - raja
+  - rempi
+  - scr
+  - slate ~cuda
+  - slepc
+  - stc
+  - strumpack ~slate
+  - sundials
+  - superlu
+  - superlu-dist
+  - swig
+  - swig@4.0.2-fortran
+  - tasmanian
+  - tau +mpi +python
+  - trilinos@13.0.1 +belos +ifpack2 +stokhos
+  - turbine
+  - umap
+  - umpire
+  - upcxx
+  - wannier90
+
+  # CUDA
+  - amrex +cuda
+  - arborx +cuda ^kokkos +wrapper
+  - cabana +cuda ^kokkos +wrapper +cuda_lambda +cuda
+  - caliper +cuda
+  - chai ~benchmarks ~tests +cuda ^umpire ~shared
+  - ecp-data-vis-sdk +cuda cuda_arch=70 +adios2 +hdf5 ~paraview +vtkm +zfp # +paraview fails:  FAILED: VTK/Filters/Statistics/CMakeFiles/FiltersStatistics-objects.dir/vtkPCAStatistics.cxx.o; /tmp/ccjmJhb6.s: Assembler messages: /tmp/ccjmJhb6.s:260012: Error: invalid machine `power10'
+  - flecsi +cuda
+  - flux-core +cuda
+  - ginkgo +cuda
+  - heffte +cuda
+  - hpctoolkit +cuda
+  - hpx max_cpu_count=512 +cuda
+  - hypre +cuda
+  - kokkos +wrapper +cuda
+  - kokkos-kernels +cuda ^kokkos +wrapper +cuda
+  - magma +cuda
+  - mfem +cuda
+  - omega-h +cuda
+  - papi +cuda
+  - petsc +cuda
+  - py-torch +cuda
+  - raja +cuda
+  - slate +cuda
+  - slepc +cuda
+  - strumpack ~slate +cuda
+  - sundials +cuda
+  - superlu-dist +cuda
+  - tasmanian +cuda
+  - tau +mpi +cuda
+  - trilinos@13.4.0 +belos +ifpack2 +stokhos +cuda
+  - umpire ~shared +cuda
+  - parsec +cuda
+
+  # CPU FAILURES
+  # - archer                  # llvm@8
+  # - bricks                  # bricks
+  # - geopm                   # geopm
+  # - loki                    # loki
+  # - precice                 # precice
+  # - pruners-ninja           # pruners-ninja
+  # - variorum                # Intel/variorum_cpuid.c:11:5: error: impossible constraint in 'asm'
+  # --
+  # bricks: VSBrick-7pt.py-Scalar-8x8x8-1:30:3: error: 'vfloat512' was not declared in this scope
+  # fltk: /usr/bin/ld: ../lib/libfltk_png.a(pngrutil.o): in function `png_read_filter_row': pngrutil.c:(.text.png_read_filter_row+0x90): undefined reference to `png_init_filter_functions_vsx'
+  # geopm: libtool.m4: error: problem compiling CXX test program
+  # llvm@8: clang/lib/Lex/Lexer.cpp:2547:34: error: ISO C++ forbids declaration of 'type name' with no type [-fpermissive]
+  # loki: include/loki/SmallObj.h:462:57: error: ISO C++17 does not allow dynamic exception specifications
+  # precice: /tmp/ccYNMwgE.s: Assembler messages: /tmp/ccYNMwgE.s:278115: Error: invalid machine `power10'
+  # pruners-ninja: test/ninja_test_util.c:34: multiple definition of `a';
+
+  # CUDA FAILURES
+  # - bricks +cuda              # bricks
+  # - dealii +cuda              # fltk
+  # --
+  # bricks: VSBrick-7pt.py-Scalar-8x8x8-1:30:3: error: 'vfloat512' was not declared in this scope
+
+
+  mirrors: { "mirror": "s3://spack-binaries/develop/e4s-power" }
+
+  gitlab-ci:
+
+    script:
+      - uname -a || true
+      - grep -E 'vendor|model name' /proc/cpuinfo 2>/dev/null | sort -u || head -n10 /proc/cpuinfo 2>/dev/null || true
+      - nproc
+      - . "./share/spack/setup-env.sh"
+      - spack --version
+      - spack arch
+      - cd ${SPACK_CONCRETE_ENV_DIR}
+      - spack env activate --without-view .
+      - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'"
+      - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data
+      - if [[ -r /mnt/key/e4s.gpg ]]; then spack gpg trust /mnt/key/e4s.gpg; fi
+      - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi
+      - spack --color=always --backtrace ci rebuild > >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt) 2> >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt >&2)
+    after_script:
+      - cat /proc/loadavg || true
+
+    image: ecpe4s/ubuntu20.04-runner-ppc64le:2023-01-01
+
+    match_behavior: first
+    mappings:
+      - match:
+          - hipblas
+          - llvm
+          - llvm-amdgpu
+          - rocblas
+        runner-attributes:
+          tags: [ "spack", "huge", "ppc64le" ]
+          variables:
+            CI_JOB_SIZE: huge
+
+      - match:
+          - cuda
+          - dyninst
+          - ginkgo
+          - hpx
+          - kokkos-kernels
+          - kokkos-nvcc-wrapper
+          - magma
+          - mfem
+          - mpich
+          - openturns
+          - precice
+          - raja
+          - rust
+          - slate
+          - trilinos
+          - vtk-m
+          - warpx
+        runner-attributes:
+          tags: [ "spack", "large", "ppc64le" ]
+          variables:
+            CI_JOB_SIZE: large
+
+      - match:
+          - adios2
+          - amrex
+          - archer
+          - ascent
+          - axom
+          - binutils
+          - blaspp
+          - boost
+          - butterflypack
+          - cabana
+          - caliper
+          - camp
+          - chai
+          - conduit
+          - datatransferkit
+          - faodel
+          - ffmpeg
+          - fftw
+          - fortrilinos
+          - gperftools
+          - gptune
+          - hdf5
+          - heffte
+          - hpctoolkit
+          - hwloc
+          - hypre
+          - kokkos
+          - lammps
+          - lapackpp
+          - legion
+          - libzmq
+          - llvm-openmp-ompt
+          - mbedtls
+          - netlib-scalapack
+          - omega-h
+          - openmpi
+          - openpmd-api
+          - pagmo2
+          - papyrus
+          - parsec
+          - pdt
+          - petsc
+          - pumi
+          - py-ipython-genutils
+          - py-petsc4py
+          - py-scipy
+          - py-statsmodels
+          - py-warlock
+          - py-warpx
+          - pygmo
+          - slepc
+          - slurm
+          - strumpack
+          - sundials
+          - superlu-dist
+          - tasmanian
+          - tau
+          - upcxx
+          - vtk-h
+          - zfp
+        runner-attributes:
+          tags: [ "spack", "medium", "ppc64le" ]
+          variables:
+            CI_JOB_SIZE: "medium"
+
+      - match:
+          - alsa-lib
+          - ant
+          - antlr
+          - argobots
+          - automake
+          - berkeley-db
+          - bison
+          - blt
+          - cmake
+          - curl
+          - darshan-util
+          - diffutils
+          - exmcutils
+          - expat
+          - flit
+          - freetype
+          - gdbm
+          - gotcha
+          - hpcviewer
+          - jansson
+          - json-c
+          - libbsd
+          - libevent
+          - libjpeg-turbo
+          - libnrm
+          - libpng
+          - libunistring
+          - lua-luaposix
+          - m4
+          - mpfr
+          - ncurses
+          - openblas
+          - openjdk
+          - papi
+          - parallel-netcdf
+          - pcre2
+          - perl-data-dumper
+          - pkgconf
+          - py-alembic
+          - py-idna
+          - py-testpath
+          - qhull
+          - snappy
+          - swig
+          - tar
+          - tcl
+          - texinfo
+          - unzip
+          - util-linux-uuid
+          - util-macros
+          - yaml-cpp
+          - zlib
+          - zstd
+        runner-attributes:
+          tags: [ "spack", "small", "ppc64le" ]
+          variables:
+            CI_JOB_SIZE: "small"
+
+      - match: ['os=ubuntu20.04']
+        runner-attributes:
+          tags: ["spack", "ppc64le"]
+          variables:
+            CI_JOB_SIZE: "default"
+
+    broken-specs-url: "s3://spack-binaries/broken-specs"
+
+    service-job-attributes:
+      before_script:
+        - . "./share/spack/setup-env.sh"
+        - spack --version
+      image: ecpe4s/ubuntu20.04-runner-ppc64le:2023-01-01
+      tags: ["spack", "public", "ppc64le"]
+
+    signing-job-attributes:
+      image: { "name": "ghcr.io/spack/notary:latest", "entrypoint": [""] }
+      tags: ["spack", "aws"]
+      script:
+        - aws s3 sync --exclude "*" --include "*spec.json*" ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache /tmp
+        - /sign.sh
+        - aws s3 sync --exclude "*" --include "*spec.json.sig*" /tmp ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache
+
+  cdash:
+    build-group: E4S Power
+    url: https://cdash.spack.io
+    project: Spack Testing
+    site: Cloud Gitlab Infrastructure

share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml

@@ -26,6 +26,8 @@ spack:
       require: "intel-tbb"
     binutils:
       variants: +ld +gold +headers +libiberty ~nls
+    boost:
+      variants: +python +filesystem +iostreams +system
     cuda:
       version: [11.7.0]
     elfutils:
@@ -70,6 +72,7 @@ spack:
   - bolt
   - bricks
   - butterflypack
+  - boost +python +filesystem +iostreams +system
   - cabana
   - caliper
   - chai ~benchmarks ~tests
@@ -267,6 +270,7 @@ spack:
 
     match_behavior: first
     mappings:
+
       - match:
           - hipblas
           - llvm

share/spack/gitlab/cloud_pipelines/stacks/gpu-tests/spack.yaml

@@ -0,0 +1,325 @@
+spack:
+  view: false
+
+  concretizer:
+    reuse: false
+    unify: false
+
+  config:
+    build_jobs: 32
+    concretizer: clingo
+    install_tree:
+      root: /home/software/spack
+      padded_length: 512
+      projections:
+        all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'
+
+  packages:
+    all:
+      compiler: [gcc@11.1.0]
+      providers:
+        blas: [openblas]
+        mpi: [mpich]
+      target: [x86_64]
+      variants: +mpi amdgpu_target=gfx90a cuda_arch=80
+    tbb:
+      require: "intel-tbb"
+    binutils:
+      variants: +ld +gold +headers +libiberty ~nls
+    boost:
+      variants: +python +filesystem +iostreams +system
+    elfutils:
+      variants: +bzip2 ~nls +xz
+    hdf5:
+      variants: +fortran +hl +shared
+    libfabric:
+      variants: fabrics=sockets,tcp,udp,rxm
+    libunwind:
+      variants: +pic +xz
+    mpich:
+      variants: ~wrapperrpath
+    ncurses:
+      variants: +termlib
+    openblas:
+      variants: threads=openmp
+    paraview:
+      # Don't build GUI support or GLX rendering for HPC/container deployments
+      require: "@5.11 ~qt+osmesa"
+    python:
+      version: [3.8.13]
+    trilinos:
+      require: +amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext
+        +ifpack +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
+        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stratimikos
+        +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+    xz:
+      variants: +pic
+    mesa:
+      version: [21.3.8]
+
+  specs:
+  - kokkos +rocm amdgpu_target=gfx90a
+  - raja +cuda cuda_arch=80 ^cuda@12.0.0
+
+  # FAILURES
+  # - kokkos +wrapper +cuda cuda_arch=80 ^cuda@12.0.0     # https://github.com/spack/spack/issues/35378
+
+  mirrors: { "mirror": "s3://spack-binaries/develop/gpu-tests" }
+
+  gitlab-ci:
+
+    script:
+    - uname -a || true
+    - grep -E 'vendor|model name' /proc/cpuinfo 2>/dev/null | sort -u || head -n10 /proc/cpuinfo 2>/dev/null || true
+    - nproc
+    - nvidia-smi || true
+    - curl -Lfs 'https://github.com/JuliaBinaryWrappers/GNUMake_jll.jl/releases/download/GNUMake-v4.3.0+1/GNUMake.v4.3.0.x86_64-linux-gnu.tar.gz' -o gmake.tar.gz
+    - printf 'fef1f59e56d2d11e6d700ba22d3444b6e583c663d6883fd0a4f63ab8bd280f0f gmake.tar.gz' | sha256sum --check --strict --quiet
+    - tar -xzf gmake.tar.gz -C /usr bin/make 2> /dev/null
+    - . "./share/spack/setup-env.sh"
+    - spack --version
+    - spack arch
+    - cd ${SPACK_CONCRETE_ENV_DIR}
+    - spack env activate --without-view .
+    - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'"
+    - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data
+    # AWS runners mount E4S public key (verification), UO runners mount public/private (signing/verification)
+    - if [[ -r /mnt/key/e4s.gpg ]]; then spack gpg trust /mnt/key/e4s.gpg; fi
+    # UO runners mount intermediate ci public key (verification), AWS runners mount public/private (signing/verification)
+    - if [[ -r /mnt/key/intermediate_ci_signing_key.gpg ]]; then spack gpg trust /mnt/key/intermediate_ci_signing_key.gpg; fi
+    - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi
+    - spack --color=always --backtrace ci rebuild --tests > >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt) 2> >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt >&2)
+
+    after_script:
+    - cat /proc/loadavg || true
+
+    image: ecpe4s/ubuntu20.04-runner-x86_64:2023-01-01
+
+    broken-tests-packages:
+    - gptune
+
+    match_behavior: first
+    mappings:
+      - match:
+        - kokkos +rocm amdgpu_target=gfx90a
+        runner-attributes:
+          tags: [ "rocm-5.4.0", "mi210" ]
+          variables:
+            CI_JOB_SIZE: large
+
+      - match:
+        - kokkos +cuda cuda_arch=80 ^cuda@12.0.0
+        - raja +cuda cuda_arch=80 ^cuda@12.0.0
+        runner-attributes:
+          tags: [ "nvidia-525.85.12", "cuda-12.0", "a100" ]
+          variables:
+            CI_JOB_SIZE: large
+
+      - match:
+        - hipblas
+        - llvm
+        - llvm-amdgpu
+        - rocblas
+        - paraview
+        - py-torch
+        runner-attributes:
+          tags: [ "spack", "huge", "x86_64" ]
+          variables:
+            CI_JOB_SIZE: huge
+            KUBERNETES_CPU_REQUEST: 11000m
+            KUBERNETES_MEMORY_REQUEST: 42G
+
+      - match:
+        - cuda
+        - dealii
+        - dray
+        - dyninst
+        - ginkgo
+        - hpx
+        - kokkos-kernels
+        - kokkos-nvcc-wrapper
+        - magma
+        - mfem
+        - mpich
+        - nvhpc
+        - oce
+        - openturns
+        - plumed
+        - precice
+        - py-tensorflow
+        - qt
+        - raja
+        - rocfft
+        - rocsolver
+        - rocsparse
+        - rust
+        - slate
+        - trilinos
+        - visit
+        - vtk
+        - vtk-m
+        - warpx
+        runner-attributes:
+          tags: [ "spack", "large", "x86_64" ]
+          variables:
+            CI_JOB_SIZE: large
+            KUBERNETES_CPU_REQUEST: 8000m
+            KUBERNETES_MEMORY_REQUEST: 12G
+
+      - match:
+        - adios2
+        - amrex
+        - archer
+        - ascent
+        - axom
+        - binutils
+        - blaspp
+        - boost
+        - butterflypack
+        - cabana
+        - caliper
+        - camp
+        - chai
+        - conduit
+        - datatransferkit
+        - faodel
+        - ffmpeg
+        - fftw
+        - fortrilinos
+        - gperftools
+        - gptune
+        - hdf5
+        - heffte
+        - hpctoolkit
+        - hwloc
+        - hypre
+        - kokkos
+        - lammps
+        - lapackpp
+        - legion
+        - libzmq
+        - llvm-openmp-ompt
+        - mbedtls
+        - netlib-scalapack
+        - omega-h
+        - openmpi
+        - openpmd-api
+        - pagmo2
+        - papyrus
+        - parsec
+        - pdt
+        - petsc
+        - pumi
+        - py-ipython-genutils
+        - py-petsc4py
+        - py-scipy
+        - py-statsmodels
+        - py-warlock
+        - py-warpx
+        - pygmo
+        - slepc
+        - slurm
+        - strumpack
+        - sundials
+        - superlu-dist
+        - tasmanian
+        - tau
+        - upcxx
+        - vtk-h
+        - zfp
+        runner-attributes:
+          tags: [ "spack", "medium", "x86_64" ]
+          variables:
+            CI_JOB_SIZE: "medium"
+            KUBERNETES_CPU_REQUEST: "2000m"
+            KUBERNETES_MEMORY_REQUEST: "4G"
+
+      - match:
+        - alsa-lib
+        - ant
+        - antlr
+        - argobots
+        - automake
+        - berkeley-db
+        - bison
+        - blt
+        - cmake
+        - curl
+        - darshan-util
+        - diffutils
+        - exmcutils
+        - expat
+        - flit
+        - freetype
+        - gdbm
+        - gotcha
+        - hpcviewer
+        - jansson
+        - json-c
+        - libbsd
+        - libevent
+        - libjpeg-turbo
+        - libnrm
+        - libpng
+        - libunistring
+        - lua-luaposix
+        - m4
+        - mpfr
+        - ncurses
+        - openblas
+        - openjdk
+        - papi
+        - parallel-netcdf
+        - pcre2
+        - perl-data-dumper
+        - pkgconf
+        - py-alembic
+        - py-idna
+        - py-testpath
+        - qhull
+        - snappy
+        - swig
+        - tar
+        - tcl
+        - texinfo
+        - unzip
+        - util-linux-uuid
+        - util-macros
+        - yaml-cpp
+        - zlib
+        - zstd
+        runner-attributes:
+          tags: [ "spack", "small", "x86_64" ]
+          variables:
+            CI_JOB_SIZE: "small"
+            KUBERNETES_CPU_REQUEST: "500m"
+            KUBERNETES_MEMORY_REQUEST: "500M"
+
+      - match: ['os=ubuntu20.04']
+        runner-attributes:
+          tags: ["spack", "x86_64"]
+          variables:
+            CI_JOB_SIZE: "default"
+
+    broken-specs-url: "s3://spack-binaries/broken-specs"
+
+    service-job-attributes:
+      before_script:
+        - . "./share/spack/setup-env.sh"
+        - spack --version
+      image: ecpe4s/ubuntu20.04-runner-x86_64:2023-01-01
+      tags: ["spack", "public", "x86_64"]
+
+    signing-job-attributes:
+      image: { "name": "ghcr.io/spack/notary:latest", "entrypoint": [""] }
+      tags: ["spack", "aws"]
+      script:
+        - aws s3 sync --exclude "*" --include "*spec.json*" ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache /tmp
+        - /sign.sh
+        - aws s3 sync --exclude "*" --include "*spec.json.sig*" /tmp ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache
+
+  cdash:
+    build-group: GPU Testing
+    url: https://cdash.spack.io
+    project: Spack Testing
+    site: Cloud Gitlab Infrastructure

var/spack/repos/builtin.mock/packages/maintainers-2/package.py

@@ -12,6 +12,6 @@ class Maintainers2(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/maintainers2-1.0.tar.gz"
 
-    maintainers = ["user2", "user3"]
+    maintainers("user2", "user3")
 
     version("1.0", "0123456789abcdef0123456789abcdef")

var/spack/repos/builtin.mock/packages/py-extension1/package.py

@@ -13,7 +13,7 @@ class PyExtension1(PythonPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/extension1-1.0.tar.gz"
 
-    maintainers = ["user1", "user2"]
+    maintainers("user1", "user2")
 
     version("1.0", "00000000000000000000000000000110")
     version("2.0", "00000000000000000000000000000120")

var/spack/repos/builtin/packages/abacus/package.py

@@ -15,7 +15,7 @@ class Abacus(MakefilePackage):
     for large-scale electronic-structure simulations
     from first principles"""
 
-    maintainers = ["bitllion"]
+    maintainers("bitllion")
 
     homepage = "http://abacus.ustc.edu.cn/"
     git = "https://github.com/abacusmodeling/abacus-develop.git"

var/spack/repos/builtin/packages/abseil-cpp/package.py

@@ -12,7 +12,7 @@ class AbseilCpp(CMakePackage):
     homepage = "https://abseil.io/"
     url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
 
-    maintainers = ["jcftang"]
+    maintainers("jcftang")
     tags = ["windows"]
 
     version(

var/spack/repos/builtin/packages/acfl/package.py

@@ -126,7 +126,7 @@ class Acfl(Package):
     homepage = "https://developer.arm.com/tools-and-software/server-and-hpc/arm-allinea-studio"
     url = "https://developer.arm.com/-/media/Files/downloads/hpc/arm-compiler-for-linux/22-1/arm-compiler-for-linux_22.1_Ubuntu-20.04_aarch64.tar"
 
-    maintainers = ["annop-w"]
+    maintainers("annop-w")
 
     # Build Versions: establish OS for URL
     acfl_os = get_os()

var/spack/repos/builtin/packages/acts-dd4hep/package.py

@@ -12,7 +12,7 @@ class ActsDd4hep(CMakePackage):
     homepage = "https://github.com/acts-project/acts-dd4hep"
     url = "https://github.com/acts-project/acts-dd4hep/archive/refs/tags/v1.0.0.tar.gz"
 
-    maintainers = ["HadrienG2", "wdconinc"]
+    maintainers("HadrienG2", "wdconinc")
 
     version("1.0.1", sha256="e40f34ebc30b3c33a6802c9d94136e65072d8dcee0b7db57a645f08a64ea5334")
     version("1.0.0", sha256="991f996944c88efa837880f919239e50d12c5c9361e220bc9422438dd608308c")

var/spack/repos/builtin/packages/acts/package.py

@@ -32,14 +32,17 @@ class Acts(CMakePackage, CudaPackage):
     homepage = "https://acts.web.cern.ch/ACTS/"
     git = "https://github.com/acts-project/acts.git"
     list_url = "https://github.com/acts-project/acts/releases/"
-    maintainers = ["HadrienG2"]
+    maintainers("HadrienG2")
 
     tags = ["hep"]
 
     # Supported Acts versions
     version("main", branch="main")
     version("master", branch="main", deprecated=True)  # For compatibility
+    version("23.0.0", commit="5af1b1b5feb8ca8f4c2c69106a1b9ef612c70d9c", submodules=True)
+    version("22.0.1", commit="a4ac99dd72828c5eb3fac06e146f3391958fca8c", submodules=True)
     version("22.0.0", commit="0fb6f8d2ace65338915451201e9ceb6cee11fb5e", submodules=True)
+    version("21.1.1", commit="8ae825de246e8e574d05d9eaf05ba4a937c69aa9", submodules=True)
     version("21.1.0", commit="3b4b5c741c8541491d496a36b917b00b344d52d1", submodules=True)
     version("21.0.0", commit="d8cb0fac3a44e1d44595a481f977df9bd70195fb", submodules=True)
     version("20.3.0", commit="b1859b322744cb033328fd57d9e74fb5326aa56b", submodules=True)
@@ -336,6 +339,7 @@ def plugin_cmake_variant(plugin_name, spack_variant):
             cmake_variant("FATRAS", "fatras"),
             cmake_variant("FATRAS_GEANT4", "fatras_geant4"),
             example_cmake_variant("GEANT4", "geant4"),
+            plugin_cmake_variant("GEANT4", "geant4"),
             example_cmake_variant("HEPMC3", "hepmc3"),
             plugin_cmake_variant("IDENTIFICATION", "identification"),
             cmake_variant(integration_tests_label, "integration_tests"),

var/spack/repos/builtin/packages/actsvg/package.py

@@ -16,7 +16,7 @@ class Actsvg(CMakePackage):
     list_url = "https://github.com/acts-project/actsvg/releases"
     git = "https://github.com/acts-project/actsvg.git"
 
-    maintainers = ["HadrienG2", "wdconinc"]
+    maintainers("HadrienG2", "wdconinc")
 
     version("0.4.26", sha256="a1dfad15b616cac8191a355c1a87544571c36349400e3de56b9e5be6fa73714c")
 

var/spack/repos/builtin/packages/adiak/package.py

@@ -14,7 +14,7 @@ class Adiak(CMakePackage):
     url = "https://github.com/LLNL/Adiak/releases/download/v0.1/adiak-v0.1.1.tar.gz"
     git = "https://github.com/LLNL/Adiak"
 
-    maintainers = ["daboehme", "mplegendre"]
+    maintainers("daboehme", "mplegendre")
 
     variant("mpi", default=True, description="Build with MPI support")
     variant("shared", default=True, description="Build dynamic libraries")

var/spack/repos/builtin/packages/adios/package.py

@@ -17,7 +17,7 @@ class Adios(AutotoolsPackage):
     url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz"
     git = "https://github.com/ornladios/ADIOS.git"
 
-    maintainers = ["ax3l"]
+    maintainers("ax3l")
 
     version("develop", branch="master")
     version("1.13.1", sha256="b1c6949918f5e69f701cabfe5987c0b286793f1057d4690f04747852544e157b")

var/spack/repos/builtin/packages/adios2/package.py

@@ -16,7 +16,7 @@ class Adios2(CMakePackage, CudaPackage):
     url = "https://github.com/ornladios/ADIOS2/archive/v2.8.0.tar.gz"
     git = "https://github.com/ornladios/ADIOS2.git"
 
-    maintainers = ["ax3l", "chuckatkins", "vicentebolea", "williamfgc"]
+    maintainers("ax3l", "chuckatkins", "vicentebolea", "williamfgc")
 
     tags = ["e4s"]
 
@@ -54,7 +54,6 @@ class Adios2(CMakePackage, CudaPackage):
     # change how we're supporting differnt library types in the package at anytime if
     # spack decides on a standardized way of doing it across packages
     variant("shared", default=True, when="+pic", description="Build shared libraries")
-    variant("pic", default=True, description="Build pic-enabled static libraries")
 
     # Features
     variant("mpi", default=True, description="Enable MPI")
@@ -95,12 +94,24 @@ class Adios2(CMakePackage, CudaPackage):
     conflicts("%oneapi@:2022.1.0", when="+fortran")
 
     depends_on("cmake@3.12.0:", type="build")
-    depends_on("pkgconfig", type="build")
 
-    depends_on("libffi", when="+sst")  # optional in DILL
-    depends_on("libfabric@1.6.0:", when="+sst")  # optional in EVPath and SST
-    # depends_on('bison', when='+sst')     # optional in FFS, broken package
-    # depends_on('flex', when='+sst')      # optional in FFS, depends on BISON
+    for _platform in ["linux", "darwin", "cray"]:
+        depends_on("pkgconfig", type="build", when="platform=%s" % _platform)
+        variant(
+            "pic",
+            default=False,
+            description="Build pic-enabled static libraries",
+            when="platform=%s" % _platform,
+        )
+        # libffi and libfabric and not currently supported on Windows
+        # see Paraview's superbuild handling of libfabric at
+        # https://gitlab.kitware.com/paraview/paraview-superbuild/-/blob/master/projects/adios2.cmake#L3
+        depends_on("libffi", when="+sst platform=%s" % _platform)  # optional in DILL
+        depends_on(
+            "libfabric@1.6.0:", when="+sst platform=%s" % _platform
+        )  # optional in EVPath and SST
+        # depends_on('bison', when='+sst')     # optional in FFS, broken package
+        # depends_on('flex', when='+sst')      # optional in FFS, depends on BISON
 
     depends_on("mpi", when="+mpi")
     depends_on("libzmq", when="+dataman")

var/spack/repos/builtin/packages/adms/package.py

@@ -16,7 +16,7 @@ class Adms(AutotoolsPackage):
     url = "https://github.com/Qucs/ADMS/releases/download/release-2.3.7/adms-2.3.7.tar.gz"
     git = "https://github.com/Qucs/ADMS.git"
 
-    maintainers = ["cessenat"]
+    maintainers("cessenat")
 
     version("master", branch="master")
     version("2.3.7", sha256="3a78e1283ecdc3f356410474b3ff44c4dcc82cb89772087fd3bbde8a1038ce08")

var/spack/repos/builtin/packages/adol-c/package.py

@@ -14,7 +14,7 @@ class AdolC(AutotoolsPackage):
     homepage = "https://github.com/coin-or/ADOL-C"
     url = "https://github.com/coin-or/ADOL-C/archive/releases/2.7.2.tar.gz"
     git = "https://github.com/coin-or/ADOL-C.git"
-    maintainers = ["jppelteret"]
+    maintainers("jppelteret")
 
     version("master", branch="master")
     version("2.7.2", sha256="701e0856baae91b98397960d5e0a87a549988de9d4002d0e9a56fa08f5455f6e")

var/spack/repos/builtin/packages/agile/package.py

@@ -15,7 +15,7 @@ class Agile(AutotoolsPackage):
 
     tags = ["hep"]
 
-    maintainers = ["vvolkl"]
+    maintainers("vvolkl")
 
     version("1.5.1", sha256="e38536300060e4b845ccaaed824c7495944f9117a0d7e4ee74a18bf278e2012f")
 

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

@@ -19,7 +19,7 @@ class Akantu(CMakePackage):
     url = "https://gitlab.com/akantu/akantu/-/archive/v3.0.0/akantu-v3.0.0.tar.gz"
     git = "https://gitlab.com/akantu/akantu.git"
 
-    maintainers = ["nrichart"]
+    maintainers("nrichart")
 
     version("master", branch="master")
     version("3.0.0", sha256="7e8f64e25956eba44def1b2d891f6db8ba824e4a82ff0d51d6b585b60ab465db")

var/spack/repos/builtin/packages/albany/package.py

@@ -17,7 +17,7 @@ class Albany(CMakePackage):
     homepage = "http://gahansen.github.io/Albany"
     git = "https://github.com/gahansen/Albany.git"
 
-    maintainers = ["gahansen"]
+    maintainers("gahansen")
 
     version("develop", branch="master")
 

var/spack/repos/builtin/packages/alpaka/package.py

@@ -14,7 +14,7 @@ class Alpaka(CMakePackage, CudaPackage):
     url = "https://github.com/alpaka-group/alpaka/archive/refs/tags/0.6.0.tar.gz"
     git = "https://github.com/alpaka-group/alpaka.git"
 
-    maintainers = ["vvolkl"]
+    maintainers("vvolkl")
 
     version("develop", branch="develop")
     version("0.8.0", sha256="e01bc377a7657d9a3e0c5f8d3f83dffbd7d0b830283c59efcbc1fb98cf88de43")

var/spack/repos/builtin/packages/alpgen/package.py

@@ -16,7 +16,7 @@ class Alpgen(CMakePackage, MakefilePackage):
     homepage = "http://mlm.home.cern.ch/mlm/alpgen/"
     url = "http://mlm.home.cern.ch/mlm/alpgen/V2.1/v214.tgz"
 
-    maintainers = ["iarspider"]
+    maintainers("iarspider")
     tags = ["hep"]
 
     version("2.1.4", sha256="2f43f7f526793fe5f81a3a3e1adeffe21b653a7f5851efc599ed69ea13985c5e")

var/spack/repos/builtin/packages/alquimia/package.py

@@ -13,7 +13,7 @@ class Alquimia(CMakePackage):
     homepage = "https://github.com/LBL-EESA/alquimia-dev"
     git = "https://github.com/LBL-EESA/alquimia-dev.git"
 
-    maintainers = ["smolins", "balay"]
+    maintainers("smolins", "balay")
 
     version("develop")
     version("1.0.10", commit="b2c11b6cde321f4a495ef9fcf267cb4c7a9858a0")  # tag v.1.0.10

var/spack/repos/builtin/packages/aluminum/package.py

@@ -22,7 +22,7 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage):
     git = "https://github.com/LLNL/Aluminum.git"
     tags = ["ecp", "radiuss"]
 
-    maintainers = ["bvanessen"]
+    maintainers("bvanessen")
 
     version("master", branch="master")
     version("1.0.0-lbann", tag="v1.0.0-lbann")

var/spack/repos/builtin/packages/amber/package.py

@@ -26,7 +26,7 @@ class Amber(Package, CudaPackage):
     url = "file://{0}/Amber18.tar.bz2".format(os.getcwd())
     manual_download = True
 
-    maintainers = ["hseara"]
+    maintainers("hseara")
 
     version("20", sha256="a4c53639441c8cc85adee397933d07856cc4a723c82c6bea585cd76c197ead75")
     version("18", sha256="2060897c0b11576082d523fb63a51ba701bc7519ff7be3d299d5ec56e8e6e277")

var/spack/repos/builtin/packages/amd-aocl/package.py

@@ -22,7 +22,7 @@ class AmdAocl(BundlePackage):
 
     homepage = "https://developer.amd.com/amd-aocl/"
 
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version("4.0")
     version("3.2")

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

@@ -30,7 +30,7 @@ class Amdblis(BlisBase):
     url = "https://github.com/amd/blis/archive/3.0.tar.gz"
     git = "https://github.com/amd/blis.git"
 
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version("4.0", sha256="cddd31176834a932753ac0fc4c76332868feab3e9ac607fa197d8b44c1e74a41")
     version("3.2", sha256="5a400ee4fc324e224e12f73cc37b915a00f92b400443b15ce3350278ad46fff6")

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

@@ -35,7 +35,7 @@ class Amdfftw(FftwBase):
     url = "https://github.com/amd/amd-fftw/archive/3.0.tar.gz"
     git = "https://github.com/amd/amd-fftw.git"
 
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version("4.0", sha256="5f02cb05f224bd86bd88ec6272b294c26dba3b1d22c7fb298745fd7b9d2271c0")
     version("3.2", sha256="31cab17a93e03b5b606e88dd6116a1055b8f49542d7d0890dbfcca057087b8d0")

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

@@ -42,7 +42,7 @@ class Amdlibflame(LibflameBase):
     url = "https://github.com/amd/libflame/archive/3.0.tar.gz"
     git = "https://github.com/amd/libflame.git"
 
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version("4.0", sha256="bcb05763aa1df1e88f0da5e43ff86d956826cbea1d9c5ff591d78a3e091c66a4")
     version("3.2", sha256="6b5337fb668b82d0ed0a4ab4b5af4e2f72e4cedbeeb4a8b6eb9a3ef057fb749a")
@@ -63,6 +63,7 @@ class Amdlibflame(LibflameBase):
     provides("flame@5.2", when="@2:")
 
     depends_on("python+pythoncmd", type="build")
+    depends_on("gmake@4:", when="@3.0.1,3.1:", type="build")
 
     @property
     def lapack_libs(self):

var/spack/repos/builtin/packages/amdlibm/package.py

@@ -27,7 +27,7 @@ class Amdlibm(SConsPackage):
     homepage = "https://developer.amd.com/amd-aocl/amd-math-library-libm/"
     git = "https://github.com/amd/aocl-libm-ose.git"
     url = "https://github.com/amd/aocl-libm-ose/archive/refs/tags/3.0.tar.gz"
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version("4.0", sha256="038c1eab544be77598eccda791b26553d3b9e2ee4ab3f5ad85fdd2a77d015a7d")
     version("3.2", sha256="c75b287c38a3ce997066af1f5c8d2b19fc460d5e56678ea81f3ac33eb79ec890")

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

@@ -28,7 +28,7 @@ class Amdscalapack(ScalapackBase):
     homepage = "https://developer.amd.com/amd-aocl/scalapack/"
     git = "https://github.com/amd/scalapack.git"
 
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version("4.0", sha256="f02913b5984597b22cdb9a36198ed61039a1bf130308e778dc31b2a7eb88b33b")
     version("3.2", sha256="9e00979bb1be39d627bdacb01774bc043029840d542fafc934d16fec3e3b0892")

var/spack/repos/builtin/packages/amgx/package.py

@@ -19,7 +19,7 @@ class Amgx(CMakePackage, CudaPackage):
     homepage = "https://developer.nvidia.com/amgx"
     url = "https://github.com/nvidia/amgx/archive/v2.1.0.tar.gz"
 
-    maintainers = ["js947"]
+    maintainers("js947")
 
     version("2.1.0", sha256="6245112b768a1dc3486b2b3c049342e232eb6281a6021fffa8b20c11631f63cc")
     version("2.0.1", sha256="6f9991f1836fbf4ba2114ce9f49febd0edc069a24f533bd94fd9aa9be72435a7")

var/spack/repos/builtin/packages/aml/package.py

@@ -16,7 +16,7 @@ class Aml(AutotoolsPackage):
 
     homepage = "https://argo-aml.readthedocs.io/"
 
-    maintainers = ["perarnau"]
+    maintainers("perarnau")
 
     test_requires_compiler = True
 

var/spack/repos/builtin/packages/ampl/package.py

@@ -17,7 +17,7 @@ class Ampl(Package):
     homepage = "https://ampl.com/"
     manual_download = True
 
-    maintainers = ["robgics"]
+    maintainers("robgics")
 
     # Use the version as you would expect the user to know it, not necessarily the
     # version as it appears in the file name.  To get the checksum, use sha256sum.

var/spack/repos/builtin/packages/ampt/package.py

@@ -14,7 +14,7 @@ class Ampt(MakefilePackage):
     homepage = "http://myweb.ecu.edu/linz/ampt/"
     url = "http://myweb.ecu.edu/linz/ampt/ampt-v1.26t9b-v2.26t9b.zip"
 
-    maintainers = ["vvolkl"]
+    maintainers("vvolkl")
 
     tags = ["hep"]
 

var/spack/repos/builtin/packages/amqp-cpp/package.py

@@ -15,7 +15,7 @@ class AmqpCpp(CMakePackage):
     git = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP.git"
     url = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/refs/tags/v4.3.19.tar.gz"
 
-    maintainers = ["lpottier"]
+    maintainers("lpottier")
 
     version("4.3.19", sha256="ca29bb349c498948576a4604bed5fd3c27d87240b271a4441ccf04ba3797b31d")
 

var/spack/repos/builtin/packages/amr-wind/package.py

@@ -13,7 +13,7 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage):
     homepage = "https://github.com/Exawind/amr-wind"
     git = "https://github.com/Exawind/amr-wind.git"
 
-    maintainers = ["jrood-nrel", "psakievich"]
+    maintainers("jrood-nrel", "psakievich")
 
     tags = ["ecp", "ecp-apps"]
 

var/spack/repos/builtin/packages/amrex/package.py

@@ -14,16 +14,17 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage):
     mesh refinement (AMR) applications."""
 
     homepage = "https://amrex-codes.github.io/amrex/"
-    url = "https://github.com/AMReX-Codes/amrex/releases/download/23.01/amrex-23.01.tar.gz"
+    url = "https://github.com/AMReX-Codes/amrex/releases/download/23.02/amrex-23.02.tar.gz"
     git = "https://github.com/AMReX-Codes/amrex.git"
 
     test_requires_compiler = True
 
     tags = ["ecp", "e4s"]
 
-    maintainers = ["WeiqunZhang", "asalmgren", "etpalmer63"]
+    maintainers("WeiqunZhang", "asalmgren", "etpalmer63")
 
     version("develop", branch="development")
+    version("23.02", sha256="f443c5eb4b89f4a74bf0e1b8a5943da18ab81cdc76aff12e8282ca43ffd06412")
     version("23.01", sha256="3b1770653a7c6d3e6167bc3cce98cbf838962102c510d1f872ab08f1115933b7")
     version("22.12", sha256="7b11e547e70bdd6f4b36682708a755d173eaecd8738536306d4217df4dd1be3d")
     version("22.11", sha256="8be9d5c6934d73b98c71c9c67ca7113f18794268f257333591d9b2449d7410c4")

var/spack/repos/builtin/packages/amrvis/package.py

@@ -16,7 +16,7 @@ class Amrvis(MakefilePackage):
     homepage = "https://github.com/AMReX-Codes/Amrvis"
     git = "https://github.com/AMReX-Codes/Amrvis.git"
 
-    maintainers = ["etpalmer63"]
+    maintainers("etpalmer63")
 
     version("main", tag="main")
 

var/spack/repos/builtin/packages/anaconda2/package.py

@@ -19,7 +19,7 @@ class Anaconda2(Package):
     homepage = "https://www.anaconda.com"
     url = "https://repo.anaconda.com/archive/Anaconda2-2019.10-Linux-x86_64.sh"
 
-    maintainers = ["ajkotobi"]
+    maintainers("ajkotobi")
 
     version(
         "2019.10",

var/spack/repos/builtin/packages/anaconda3/package.py

@@ -20,7 +20,7 @@ class Anaconda3(Package):
     homepage = "https://www.anaconda.com"
     url = "https://repo.anaconda.com/archive/Anaconda3-2019.10-Linux-x86_64.sh"
 
-    maintainers = ["ajkotobi"]
+    maintainers("ajkotobi")
 
     version(
         "2022.10",

var/spack/repos/builtin/packages/andi/package.py

@@ -12,7 +12,7 @@ class Andi(AutotoolsPackage):
 
     homepage = "https://github.com/EvolBioInf/andi"
     url = "https://github.com/EvolBioInf/andi/archive/v0.10.tar.gz"
-    maintainers = ["snehring"]
+    maintainers("snehring")
 
     version("0.14", sha256="2c9e11524f38e74fe3f981e6acd9527c1a1ca30994a30c5e86808ba5165a25b7")
     version("0.10", sha256="1ff371de0b6db4080e402ded2687947dc2d6913e28626edec21dcf5149489ee8")

var/spack/repos/builtin/packages/antimony/package.py

@@ -12,7 +12,7 @@ class Antimony(CMakePackage):
     homepage = "http://antimony.sourceforge.net/"
     url = "antimony"
 
-    maintainers = ["rblake-llnl"]
+    maintainers("rblake-llnl")
 
     version("2.8", sha256="7e3e38706c074b72e241ac56ef4ce23e87ef8c718c70f29b2207f1847c43770f")
     version("2.7", sha256="7ad181cac632282ae77ced09388dd92db87ea4683eed8c45f2b43861ae2acad4")

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

@@ -31,7 +31,7 @@ class Aocc(Package):
     family = "compiler"
     homepage = "https://developer.amd.com/amd-aocc/"
 
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version(
         ver="4.0.0",

var/spack/repos/builtin/packages/aocl-sparse/package.py

@@ -26,7 +26,7 @@ class AoclSparse(CMakePackage):
     url = "https://github.com/amd/aocl-sparse/archive/3.0.tar.gz"
     git = "https://github.com/amd/aocl-sparse.git"
 
-    maintainers = ["amd-toolchain-support"]
+    maintainers("amd-toolchain-support")
 
     version("4.0", sha256="68524e441fdc7bb923333b98151005bed39154d9f4b5e8310b5c37de1d69c2c3")
     version("3.2", sha256="db7d681a8697d6ef49acf3e97e8bec35b048ce0ad74549c3b738bbdff496618f")

var/spack/repos/builtin/packages/aomp/package.py

@@ -84,7 +84,7 @@ class Aomp(Package):
     homepage = tools_url + "/aomp"
     url = tools_url + "/aomp/archive/rocm-3.10.0.tar.gz"
 
-    maintainers = ["srekolam", "arjun-raj-kuppala", "estewart08"]
+    maintainers("srekolam", "arjun-raj-kuppala", "estewart08")
 
     tags = ["e4s"]
 

var/spack/repos/builtin/packages/apcomp/package.py

@@ -34,7 +34,7 @@ class Apcomp(Package):
         "https://github.com/Alpine-DAV/ap_compositor/releases/download/v0.0.1/apcomp-v0.0.1.tar.gz"
     )
 
-    maintainers = ["cyrush"]
+    maintainers("cyrush")
 
     version("master", branch="master", submodules="True")
     version("0.0.4", sha256="061876dd55e443de91a40d10662496f6bb58b0a3835aec78f5710f5a737d0494")

var/spack/repos/builtin/packages/aperture-photometry/package.py

@@ -13,7 +13,7 @@ class AperturePhotometry(Package):
 
     homepage = "http://www.aperturephotometry.org/"
     url = "https://web.ipac.caltech.edu/staff/laher/apt/APT_v2.8.4.tar.gz"
-    maintainers = ["snehring"]
+    maintainers("snehring")
 
     version("3.0.2", "8ac430079825ba274567fb998dd693bb6f99490f5b896d4746178ba796bfdead")
     version("2.8.4", "28ae136c708a3ebcb83632230e119a03ca1a65499006ab69dc76e21b4921f465")

var/spack/repos/builtin/packages/apex/package.py

@@ -11,7 +11,7 @@
 class Apex(CMakePackage):
     """Autonomic Performance Environment for eXascale (APEX)."""
 
-    maintainers = ["khuck"]
+    maintainers("khuck")
     homepage = "https://uo-oaciss.github.io/apex"
     url = "https://github.com/UO-OACISS/apex/archive/v2.3.1.tar.gz"
     git = "https://github.com/UO-OACISS/apex"

var/spack/repos/builtin/packages/apple-gl/package.py

@@ -12,7 +12,7 @@ class AppleGl(Package):
 
     homepage = "https://developer.apple.com/library/archive/documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide/opengl_intro/opengl_intro.html"
 
-    maintainers = ["aphecetche"]
+    maintainers("aphecetche")
 
     has_code = False
 

var/spack/repos/builtin/packages/apple-glu/package.py

@@ -12,7 +12,7 @@ class AppleGlu(Package):
 
     homepage = ""
 
-    maintainers = ["aphecetche"]
+    maintainers("aphecetche")
 
     has_code = False
 

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

@@ -33,6 +33,8 @@ class Apptainer(SingularityBase):
     version("1.1.3", sha256="c7bf7f4d5955e1868739627928238d02f94ca9fd0caf110b0243d65548427899")
     version("1.0.2", sha256="2d7a9d0a76d5574459d249c3415e21423980d9154ce85e8c34b0600782a7dfd3")
 
+    depends_on("go@1.17.5:", when="@1.1.0:")
+
     singularity_org = "apptainer"
     singularity_name = "apptainer"
     singularity_security_urls = (

var/spack/repos/builtin/packages/arbor/package.py

@@ -13,7 +13,7 @@ class Arbor(CMakePackage, CudaPackage):
     homepage = "https://arbor-sim.org"
     git = "https://github.com/arbor-sim/arbor.git"
     url = "https://github.com/arbor-sim/arbor/releases/download/v0.8.1/arbor-v0.8.1-full.tar.gz"
-    maintainers = ["bcumming", "brenthuisman", "haampie", "schmitts"]
+    maintainers("bcumming", "brenthuisman", "haampie", "schmitts")
 
     version("master", branch="master", submodules=True)
     version(

var/spack/repos/builtin/packages/arborx/package.py

@@ -15,7 +15,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
 
     tags = ["e4s", "ecp"]
 
-    maintainers = ["aprokop"]
+    maintainers("aprokop")
 
     version("master", branch="master")
     version("1.3", sha256="3f1e17f029a460ab99f8396e2772cec908eefc4bf3868c8828907624a2d0ce5d")

var/spack/repos/builtin/packages/arc/package.py

@@ -18,7 +18,7 @@ class Arc(CMakePackage):
     url = "https://github.com/FTHPC/ARC"
     git = "https://github.com/robertu94/ARC"
 
-    maintainers = ["robertu94"]
+    maintainers("robertu94")
 
     version("master", branch="master")
     version("2021-12-01", commit="49d4a5df53a082f15a6959aef434224fd7b9beac")

var/spack/repos/builtin/packages/argobots/package.py

@@ -18,7 +18,7 @@ class Argobots(AutotoolsPackage):
     homepage = "https://www.argobots.org/"
     url = "https://github.com/pmodels/argobots/releases/download/v1.0b1/argobots-1.0b1.tar.gz"
     git = "https://github.com/pmodels/argobots.git"
-    maintainers = ["shintaro-iwasaki"]
+    maintainers("shintaro-iwasaki")
 
     tags = ["e4s"]
 

var/spack/repos/builtin/packages/arm-forge/package.py

@@ -17,12 +17,15 @@ class ArmForge(Package):
     through to complex parallel HPC codes with MPI, OpenMP, threads or CUDA."""
 
     homepage = "https://www.arm.com/products/development-tools/server-and-hpc/forge"
-    maintainers = ["NickRF"]
+    maintainers("NickRF")
 
     # TODO: this mess should be fixed as soon as a way to parametrize/constrain
     #       versions (and checksums) based on the target platform shows up
 
     if platform.machine() == "aarch64":
+        version(
+            "22.1.3", sha256="131884f998b82673e885a7b42cc883210e3a0229b50af374092140cdfd42a408"
+        )
         version(
             "22.1.2", sha256="1774ed647a18d2cb47b2e4dd4f6f268f67817dfe6a6bca8ba2f9e71d2f18c690"
         )
@@ -64,6 +67,9 @@ class ArmForge(Package):
         )
         version("21.0", sha256="2bcc745d0049d6b25c77c97b2d7bad7b4f804180972a2306a8599ce41f6a4573")
     elif platform.machine() == "ppc64le":
+        version(
+            "22.1.3", sha256="6479c3a4ae6ce6648c37594eb0266161f06d9f89010fca9299855848661dda49"
+        )
         version(
             "22.1.2", sha256="1c59d1ccdd83bbd953d891a8e5f4926949daab7f6f1cd73328128794615d23ad"
         )
@@ -105,6 +111,9 @@ class ArmForge(Package):
         )
         version("21.0", sha256="60cfa7dd1cd131ec85e67cb660f2f84cf30bb700d8979cae1f5f88af658fd249")
     elif platform.machine() == "x86_64":
+        version(
+            "22.1.3", sha256="4f8a8b1df6ad712e89c82eedf4bd85b93b57b3c8d5b37d13480ff058fa8f4467"
+        )
         version(
             "22.1.2", sha256="baeac2b49c38547a8f3dd6a5237544eefe8c7695d969784e6f861ce77b610542"
         )

var/spack/repos/builtin/packages/armpl-gcc/package.py

@@ -145,7 +145,7 @@ class ArmplGcc(Package):
     homepage = "https://developer.arm.com/tools-and-software/server-and-hpc/downloads/arm-performance-libraries"
     url = "https://developer.arm.com/-/media/Files/downloads/hpc/arm-performance-libraries/22-1/ubuntu-20/arm-performance-libraries_22.1_Ubuntu-20.04_gcc-11.2.tar"
 
-    maintainers = ["annop-w"]
+    maintainers("annop-w")
 
     for ver, packages in _versions.items():
         key = "{0}".format(get_os())

var/spack/repos/builtin/packages/arrayfire/package.py

@@ -13,7 +13,7 @@ class Arrayfire(CMakePackage, CudaPackage):
 
     homepage = "https://arrayfire.org/docs/index.htm"
     git = "https://github.com/arrayfire/arrayfire.git"
-    maintainers = ["umar456"]
+    maintainers("umar456")
 
     version("master")
     version("3.8.1", commit="823e8e399fe8c120c6ec7ec75f09e6106b3074ca", tag="v3.8.1")

var/spack/repos/builtin/packages/ascent/package.py

@@ -48,7 +48,7 @@ class Ascent(CMakePackage, CudaPackage):
     url = "https://github.com/Alpine-DAV/ascent/releases/download/v0.5.1/ascent-v0.5.1-src-with-blt.tar.gz"
     tags = ["radiuss", "e4s"]
 
-    maintainers = ["cyrush"]
+    maintainers("cyrush")
 
     version("develop", branch="develop", submodules=True)
 

var/spack/repos/builtin/packages/asdf-cxx/package.py

@@ -12,7 +12,7 @@ class AsdfCxx(CMakePackage):
     homepage = "https://github.com/eschnett/asdf-cxx"
     url = "https://github.com/eschnett/asdf-cxx/archive/version/1.0.0.tar.gz"
 
-    maintainers = ["eschnett"]
+    maintainers("eschnett")
 
     version("7.2.1", sha256="40864f4f27d3ce8acb5169b57211ce6ac3805f0a6de9c1dfd5f994f4a5beccda")
     version("7.2.0", sha256="faded85d44288afb83f13634d2139adee07e06f7ea60960c6f2ef8d898c0aa09")

var/spack/repos/builtin/packages/asio/package.py

@@ -14,7 +14,7 @@ class Asio(AutotoolsPackage):
     homepage = "https://think-async.com/Asio/"
     url = "https://github.com/chriskohlhoff/asio/archive/asio-1-18-2.tar.gz"
     git = "https://github.com/chriskohlhoff/asio.git"
-    maintainers = ["msimberg"]
+    maintainers("msimberg")
 
     version("1.21.0", sha256="5d2d2dcb7bfb39bff941cabbfc8c27ee322a495470bf0f3a7c5238648cf5e6a9")
     version("1.20.0", sha256="34a8f07be6f54e3753874d46ecfa9b7ab7051c4e3f67103c52a33dfddaea48e6")

var/spack/repos/builtin/packages/aspect/package.py

@@ -14,7 +14,7 @@ class Aspect(CMakePackage):
     url = "https://github.com/geodynamics/aspect/releases/download/v2.1.0/aspect-2.1.0.tar.gz"
     git = "https://github.com/geodynamics/aspect.git"
 
-    maintainers = ["tjhei"]
+    maintainers("tjhei")
 
     version("develop", branch="main")
     version("2.3.0", sha256="d97885e502e99ca22af3933c3b1c0b30b0b5e4dc0421e7f6e4d6b378e997faf8")

var/spack/repos/builtin/packages/assimp/package.py

@@ -14,9 +14,10 @@ class Assimp(CMakePackage):
     url = "https://github.com/assimp/assimp/archive/v4.0.1.tar.gz"
     git = "https://github.com/assimp/assimp.git"
 
-    maintainers = ["wdconinc"]
+    maintainers("wdconinc")
 
     version("master", branch="master")
+    version("5.2.5", sha256="b5219e63ae31d895d60d98001ee5bb809fb2c7b2de1e7f78ceeb600063641e1a")
     version("5.2.4", sha256="6a4ff75dc727821f75ef529cea1c4fc0a7b5fc2e0a0b2ff2f6b7993fe6cb54ba")
     version("5.2.3", sha256="b20fc41af171f6d8f1f45d4621f18e6934ab7264e71c37cd72fd9832509af2a8")
     version("5.2.2", sha256="ad76c5d86c380af65a9d9f64e8fc57af692ffd80a90f613dfc6bd945d0b80bb4")

var/spack/repos/builtin/packages/atmi/package.py

@@ -15,11 +15,12 @@ class Atmi(CMakePackage):
 
     homepage = "https://github.com/RadeonOpenCompute/atmi"
     git = "https://github.com/RadeonOpenCompute/atmi.git"
-    url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-5.3.3.tar.gz"
+    url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-5.4.0.tar.gz"
     tags = ["rocm"]
 
-    maintainers = ["srekolam", "renjithravindrankannath"]
+    maintainers("srekolam", "renjithravindrankannath")
 
+    version("5.4.0", sha256="b5cce10d7099fecbb40a0d9c2f29a7675315471fe145212b375e37e4c8ba5618")
     version("5.3.3", sha256="cc1144e4939cea2944f6c72a21406b9dc5b56d933696494074c280df7469834a")
     version("5.3.0", sha256="dffc0eb0bc1617843e7f728dbd6c8b12326c5c8baa34369aa267aab40f5deb6a")
     version("5.2.3", sha256="5f66c59e668cf968e86b556a0a52ee0202d1b370d8406e291a874cbfd200ee17")
@@ -130,6 +131,7 @@ class Atmi(CMakePackage):
         "5.2.3",
         "5.3.0",
         "5.3.3",
+        "5.4.0",
     ]:
         depends_on("comgr@" + ver, type="link", when="@" + ver)
         depends_on("hsa-rocr-dev@" + ver, type="link", when="@" + ver)

var/spack/repos/builtin/packages/autodiff/package.py

@@ -14,7 +14,7 @@ class Autodiff(CMakePackage):
     list_url = "https://github.com/autodiff/autodiff/releases"
     git = "https://github.com/autodiff/autodiff.git"
 
-    maintainers = ["wdconinc", "HadrienG2"]
+    maintainers("wdconinc", "HadrienG2")
 
     version("0.6.4", sha256="cfe0bb7c0de10979caff9d9bfdad7e6267faea2b8d875027397486b47a7edd75")
     version("0.5.13", sha256="a73dc571bcaad6b44f74865fed51af375f5a877db44321b5568d94a4358b77a1")

var/spack/repos/builtin/packages/autodock-gpu/package.py

@@ -16,7 +16,7 @@ class AutodockGpu(MakefilePackage):
     homepage = "https://ccsb.scripps.edu/autodock"
     git = "https://github.com/ccsb-scripps/AutoDock-GPU.git"
 
-    maintainers = ["RemiLacroix-IDRIS"]
+    maintainers("RemiLacroix-IDRIS")
 
     version("develop", branch="develop")
 

var/spack/repos/builtin/packages/aws-ofi-nccl/package.py

@@ -15,7 +15,7 @@ class AwsOfiNccl(AutotoolsPackage):
     git = "https://github.com/aws/aws-ofi-nccl.git"
     url = "https://github.com/aws/aws-ofi-nccl.git"
 
-    maintainers = ["bvanessen"]
+    maintainers("bvanessen")
 
     version("master", branch="master", default=True)
 

var/spack/repos/builtin/packages/aws-ofi-rccl/package.py

@@ -16,7 +16,7 @@ class AwsOfiRccl(AutotoolsPackage):
     url = "https://github.com/ROCmSoftwarePlatform/aws-ofi-rccl.git"
     tags = ["rocm"]
 
-    maintainers = ["bvanessen"]
+    maintainers("bvanessen")
 
     version("cxi", branch="cxi", default=True)
     version("master", branch="master")

var/spack/repos/builtin/packages/aws-parallelcluster/package.py

@@ -15,7 +15,7 @@ class AwsParallelcluster(PythonPackage):
     homepage = "https://github.com/aws/aws-parallelcluster"
     pypi = "aws-parallelcluster/aws-parallelcluster-2.11.9.tar.gz"
 
-    maintainers = [
+    maintainers(
         "charlesg3",
         "chenwany",
         "demartinofra",
@@ -24,7 +24,7 @@ class AwsParallelcluster(PythonPackage):
         "gmarciani",
         "hanwen-pcluste",
         "lukeseawalker",
-    ]
+    )
 
     version("2.11.9", sha256="615de4d59d9fd56a31d4feb3aeefe685346538a8dd0c1c35b660029f891d4dfd")
     version("2.11.8", sha256="acf33f48f8e48b0bc7be20f539d61baa1e27248765ba355df753bdfca4abd3cb")