Merge remote-tracking branch 'upstream/prereleases/v1.0.0-alpha.3' in…

…to v1.0.0-alpha.3-fermi
FNALssi · Jan 16, 2025 · 47dab32 · 47dab32
2 parents 641af8b + 0cdece7
commit 47dab32
Show file tree

Hide file tree

Showing 377 changed files with 6,072 additions and 8,719 deletions.
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
@@ -61,7 +61,7 @@ jobs:
       run: "brew install kcov"
     - name: Install Python packages
       run: |
-          pip install --upgrade pip setuptools pytest pytest-xdist pytest-cov
+          pip install --upgrade pip setuptools pytest pytest-xdist pytest-cov clingo
           pip install --upgrade flake8 "isort>=4.3.5" "mypy>=0.900" "click" "black"
     - name: Setup git configuration
       run: |
@@ -185,7 +185,6 @@ jobs:
         spack bootstrap disable github-actions-v0.5
         spack bootstrap disable github-actions-v0.6
         spack bootstrap status
-        spack solve zlib
         spack unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml lib/spack/spack/test/concretization/core.py
     - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:
@@ -223,7 +222,7 @@ jobs:
         . share/spack/setup-env.sh
         $(which spack) bootstrap disable spack-install
         $(which spack) solve zlib
-        common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python' -x)
+        common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python')
         $(which spack) unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}"
     - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:
@@ -254,7 +253,7 @@ jobs:
       env:
         COVERAGE_FILE: coverage/.coverage-windows
       run: |
-        spack unit-test -x --verbose --cov --cov-config=pyproject.toml
+        spack unit-test --verbose --cov --cov-config=pyproject.toml
         ./share/spack/qa/validate_last_exit.ps1
     - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:

diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml
@@ -19,7 +19,7 @@ config:
   install_tree:
     root: $spack/opt/spack
     projections:
-      all: "{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"
+      all: "{architecture.platform}-{architecture.target}/{name}-{version}-{hash}"
     # install_tree can include an optional padded length (int or boolean)
     # default is False (do not pad)
     # if padded_length is True, Spack will pad as close to the system max path

diff --git a/etc/spack/defaults/darwin/packages.yaml b/etc/spack/defaults/darwin/packages.yaml
@@ -15,12 +15,11 @@
 # -------------------------------------------------------------------------
 packages:
   all:
-    compiler:
-    - apple-clang
-    - clang
-    - gcc
     providers:
+      c: [apple-clang, llvm, gcc]
+      cxx: [apple-clang, llvm, gcc]
       elf: [libelf]
+      fortran: [gcc]
       fuse: [macfuse]
       gl: [apple-gl]
       glu: [apple-glu]

diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
@@ -15,19 +15,18 @@
 # -------------------------------------------------------------------------
 packages:
   all:
-    compiler: [gcc, clang, oneapi, xl, nag, fj, aocc]
     providers:
       awk: [gawk]
       armci: [armcimpi]
       blas: [openblas, amdblis]
-      c: [gcc]
-      cxx: [gcc]
+      c: [gcc, llvm, intel-oneapi-compilers, xl, aocc]
+      cxx: [gcc, llvm, intel-oneapi-compilers, xl, aocc]
       D: [ldc]
       daal: [intel-oneapi-daal]
       elf: [elfutils]
       fftw-api: [fftw, amdfftw]
       flame: [libflame, amdlibflame]
-      fortran: [gcc]
+      fortran: [gcc, llvm]
       fortran-rt: [gcc-runtime, intel-oneapi-runtime]
       fuse: [libfuse]
       gl: [glx, osmesa]

diff --git a/etc/spack/defaults/windows/packages.yaml b/etc/spack/defaults/windows/packages.yaml
@@ -15,8 +15,8 @@
 # -------------------------------------------------------------------------
 packages:
   all:
-    compiler:
-    - msvc
     providers:
+      c : [msvc]
+      cxx: [msvc]
       mpi: [msmpi]
       gl: [wgl]
diff --git a/lib/spack/docs/pipelines.rst b/lib/spack/docs/pipelines.rst
@@ -330,7 +330,7 @@ that ``--tests`` is passed to ``spack ci rebuild`` as part of the
           - spack --version
           - 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 config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}-{architecture.target}/{name}-{version}-{hash}'"
            - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data
            - 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

diff --git a/lib/spack/env/aocc/clang b/lib/spack/env/aocc/clang
diff --git a/lib/spack/env/aocc/clang++ b/lib/spack/env/aocc/clang++
diff --git a/lib/spack/env/aocc/flang b/lib/spack/env/aocc/flang
diff --git a/lib/spack/env/arm/armclang b/lib/spack/env/arm/armclang
diff --git a/lib/spack/env/arm/armclang++ b/lib/spack/env/arm/armclang++
diff --git a/lib/spack/env/arm/armflang b/lib/spack/env/arm/armflang
diff --git a/lib/spack/env/c++ b/lib/spack/env/c++
diff --git a/lib/spack/env/c89 b/lib/spack/env/c89
diff --git a/lib/spack/env/c99 b/lib/spack/env/c99
diff --git a/lib/spack/env/case-insensitive/CC b/lib/spack/env/case-insensitive/CC
diff --git a/lib/spack/env/cce/case-insensitive/CC b/lib/spack/env/cce/case-insensitive/CC
diff --git a/lib/spack/env/cce/case-insensitive/crayCC b/lib/spack/env/cce/case-insensitive/crayCC
diff --git a/lib/spack/env/cce/cc b/lib/spack/env/cce/cc
diff --git a/lib/spack/env/cce/craycc b/lib/spack/env/cce/craycc
diff --git a/lib/spack/env/cce/crayftn b/lib/spack/env/cce/crayftn
diff --git a/lib/spack/env/cce/ftn b/lib/spack/env/cce/ftn
diff --git a/lib/spack/env/clang/clang b/lib/spack/env/clang/clang
diff --git a/lib/spack/env/clang/clang++ b/lib/spack/env/clang/clang++
diff --git a/lib/spack/env/clang/flang b/lib/spack/env/clang/flang
diff --git a/lib/spack/env/clang/gfortran b/lib/spack/env/clang/gfortran
diff --git a/lib/spack/env/cpp b/lib/spack/env/cpp
diff --git a/lib/spack/env/f77 b/lib/spack/env/f77
diff --git a/lib/spack/env/f90 b/lib/spack/env/f90
diff --git a/lib/spack/env/f95 b/lib/spack/env/f95
diff --git a/lib/spack/env/fc b/lib/spack/env/fc
diff --git a/lib/spack/env/fj/case-insensitive/FCC b/lib/spack/env/fj/case-insensitive/FCC
diff --git a/lib/spack/env/fj/fcc b/lib/spack/env/fj/fcc
diff --git a/lib/spack/env/fj/frt b/lib/spack/env/fj/frt
diff --git a/lib/spack/env/ftn b/lib/spack/env/ftn
diff --git a/lib/spack/env/gcc/g++ b/lib/spack/env/gcc/g++
diff --git a/lib/spack/env/gcc/gcc b/lib/spack/env/gcc/gcc
diff --git a/lib/spack/env/gcc/gfortran b/lib/spack/env/gcc/gfortran
diff --git a/lib/spack/env/intel/icc b/lib/spack/env/intel/icc
diff --git a/lib/spack/env/intel/icpc b/lib/spack/env/intel/icpc
diff --git a/lib/spack/env/intel/ifort b/lib/spack/env/intel/ifort
diff --git a/lib/spack/env/ld b/lib/spack/env/ld
diff --git a/lib/spack/env/ld.gold b/lib/spack/env/ld.gold
diff --git a/lib/spack/env/ld.lld b/lib/spack/env/ld.lld
diff --git a/lib/spack/env/nag/nagfor b/lib/spack/env/nag/nagfor
diff --git a/lib/spack/env/nvhpc/nvc b/lib/spack/env/nvhpc/nvc
diff --git a/lib/spack/env/nvhpc/nvc++ b/lib/spack/env/nvhpc/nvc++
diff --git a/lib/spack/env/nvhpc/nvfortran b/lib/spack/env/nvhpc/nvfortran
diff --git a/lib/spack/env/oneapi/dpcpp b/lib/spack/env/oneapi/dpcpp
diff --git a/lib/spack/env/oneapi/icpx b/lib/spack/env/oneapi/icpx
diff --git a/lib/spack/env/oneapi/icx b/lib/spack/env/oneapi/icx
diff --git a/lib/spack/env/oneapi/ifx b/lib/spack/env/oneapi/ifx
diff --git a/lib/spack/env/pgi/pgc++ b/lib/spack/env/pgi/pgc++
diff --git a/lib/spack/env/pgi/pgcc b/lib/spack/env/pgi/pgcc
diff --git a/lib/spack/env/pgi/pgfortran b/lib/spack/env/pgi/pgfortran
diff --git a/lib/spack/env/rocmcc/amdclang b/lib/spack/env/rocmcc/amdclang
diff --git a/lib/spack/env/rocmcc/amdclang++ b/lib/spack/env/rocmcc/amdclang++
diff --git a/lib/spack/env/rocmcc/amdflang b/lib/spack/env/rocmcc/amdflang
diff --git a/lib/spack/env/xl/xlc b/lib/spack/env/xl/xlc
diff --git a/lib/spack/env/xl/xlc++ b/lib/spack/env/xl/xlc++
diff --git a/lib/spack/env/xl/xlf b/lib/spack/env/xl/xlf
diff --git a/lib/spack/env/xl/xlf90 b/lib/spack/env/xl/xlf90
diff --git a/lib/spack/env/xl_r/xlc++_r b/lib/spack/env/xl_r/xlc++_r
diff --git a/lib/spack/env/xl_r/xlc_r b/lib/spack/env/xl_r/xlc_r
diff --git a/lib/spack/env/xl_r/xlf90_r b/lib/spack/env/xl_r/xlf90_r
diff --git a/lib/spack/env/xl_r/xlf_r b/lib/spack/env/xl_r/xlf_r
diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py
@@ -72,7 +72,7 @@ def index_by(objects, *funcs):
     if isinstance(f, str):
         f = lambda x: getattr(x, funcs[0])
     elif isinstance(f, tuple):
-        f = lambda x: tuple(getattr(x, p) for p in funcs[0])
+        f = lambda x: tuple(getattr(x, p, None) for p in funcs[0])
 
     result = {}
     for o in objects:
@@ -996,11 +996,8 @@ def _receive_forwarded(self, context: str, exc: Exception, tb: List[str]):
     def grouped_message(self, with_tracebacks: bool = True) -> str:
         """Print out an error message coalescing all the forwarded errors."""
         each_exception_message = [
-            "{0} raised {1}: {2}{3}".format(
-                context,
-                exc.__class__.__name__,
-                exc,
-                "\n{0}".format("".join(tb)) if with_tracebacks else "",
+            "\n\t{0} raised {1}: {2}\n{3}".format(
+                context, exc.__class__.__name__, exc, f"\n{''.join(tb)}" if with_tracebacks else ""
             )
             for context, exc, tb in self.exceptions
         ]

diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
@@ -10,7 +10,7 @@
 import spack.util.git
 
 #: PEP440 canonical <major>.<minor>.<micro>.<devN> string
-__version__ = "0.24.0.dev0"
+__version__ = "1.0.0-alpha.3"
 spack_version = __version__
 
 

diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py
@@ -625,17 +625,32 @@ def tarball_directory_name(spec):
     Return name of the tarball directory according to the convention
     <os>-<architecture>/<compiler>/<package>-<version>/
     """
-    return spec.format_path("{architecture}/{compiler.name}-{compiler.version}/{name}-{version}")
+    if spec.original_spec_format() < 5:
+        compiler = spec.annotations.compiler_node_attribute
+        assert compiler is not None, "a compiler spec is expected"
+        return spec.format_path(
+            f"{spec.architecture}/{compiler.name}-{compiler.version}/{spec.name}-{spec.version}"
+        )
+
+    return spec.format_path(f"{spec.architecture.platform}/{spec.name}-{spec.version}")
 
 
 def tarball_name(spec, ext):
     """
     Return the name of the tarfile according to the convention
     <os>-<architecture>-<package>-<dag_hash><ext>
     """
-    spec_formatted = spec.format_path(
-        "{architecture}-{compiler.name}-{compiler.version}-{name}-{version}-{hash}"
-    )
+    if spec.original_spec_format() < 5:
+        compiler = spec.annotations.compiler_node_attribute
+        assert compiler is not None, "a compiler spec is expected"
+        spec_formatted = (
+            f"{spec.architecture}-{compiler.name}-{compiler.version}-{spec.name}"
+            f"-{spec.version}-{spec.dag_hash()}"
+        )
+    else:
+        spec_formatted = (
+            f"{spec.architecture.platform}-{spec.name}-{spec.version}-{spec.dag_hash()}"
+        )
     return f"{spec_formatted}{ext}"
 
 

diff --git a/lib/spack/spack/bootstrap/_common.py b/lib/spack/spack/bootstrap/_common.py
@@ -226,12 +226,13 @@ def _root_spec(spec_str: str) -> str:
     # Add a compiler and platform requirement to the root spec.
     platform = str(spack.platforms.host())
 
-    if platform == "darwin":
-        spec_str += " %apple-clang"
-    elif platform == "windows":
+    # FIXME (compiler as nodes): recover the compiler for source bootstrapping
+    # if platform == "darwin":
+    #    spec_str += " %apple-clang"
+    if platform == "windows":
         spec_str += " %msvc"
-    elif platform == "linux":
-        spec_str += " %gcc"
+    # elif platform == "linux":
+    #    spec_str += " %gcc"
     elif platform == "freebsd":
         spec_str += " %clang"
     spec_str += f" platform={platform}"