diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/spack/defaults/bootstrap.yaml | 10 | ||||
| -rw-r--r-- | etc/spack/defaults/concretizer.yaml | 25 | ||||
| -rw-r--r-- | etc/spack/defaults/config.yaml | 29 | ||||
| -rw-r--r-- | etc/spack/defaults/cray/modules.yaml | 16 | ||||
| -rw-r--r-- | etc/spack/defaults/darwin/packages.yaml | 1 | ||||
| -rw-r--r-- | etc/spack/defaults/packages.yaml | 26 | ||||
| -rw-r--r-- | etc/spack/defaults/windows/config.yaml | 1 |
7 files changed, 57 insertions, 51 deletions
diff --git a/etc/spack/defaults/bootstrap.yaml b/etc/spack/defaults/bootstrap.yaml index 6f2dbe171c..b2e2c0f373 100644 --- a/etc/spack/defaults/bootstrap.yaml +++ b/etc/spack/defaults/bootstrap.yaml @@ -9,15 +9,15 @@ bootstrap: # may not be able to bootstrap all the software that Spack needs, # depending on its type. sources: - - name: 'github-actions-v0.5' + - name: github-actions-v0.6 + metadata: $spack/share/spack/bootstrap/github-actions-v0.6 + - name: github-actions-v0.5 metadata: $spack/share/spack/bootstrap/github-actions-v0.5 - - name: 'github-actions-v0.4' - metadata: $spack/share/spack/bootstrap/github-actions-v0.4 - - name: 'spack-install' + - name: spack-install metadata: $spack/share/spack/bootstrap/spack-install trusted: # By default we trust bootstrapping from sources and from binaries # produced on Github via the workflow + github-actions-v0.6: true github-actions-v0.5: true - github-actions-v0.4: true spack-install: true diff --git a/etc/spack/defaults/concretizer.yaml b/etc/spack/defaults/concretizer.yaml index edefa552ce..eda51c09be 100644 --- a/etc/spack/defaults/concretizer.yaml +++ b/etc/spack/defaults/concretizer.yaml @@ -15,7 +15,7 @@ concretizer: # as possible, rather than building. If `false`, we'll always give you a fresh # concretization. If `dependencies`, we'll only reuse dependencies but # give you a fresh concretization for your root specs. - reuse: dependencies + reuse: true # Options that tune which targets are considered for concretization. The # concretization process is very sensitive to the number targets, and the time # needed to reach a solution increases noticeably with the number of targets @@ -39,6 +39,27 @@ concretizer: # Option to deal with possible duplicate nodes (i.e. different nodes from the same package) in the DAG. duplicates: # "none": allows a single node for any package in the DAG. - # "minimal": allows the duplication of 'build-tools' nodes only (e.g. py-setuptools, cmake etc.) + # "minimal": allows the duplication of 'build-tools' nodes only + # (e.g. py-setuptools, cmake etc.) # "full" (experimental): allows separation of the entire build-tool stack (e.g. the entire "cmake" subDAG) strategy: minimal + # Option to specify compatibility between operating systems for reuse of compilers and packages + # Specified as a key: [list] where the key is the os that is being targeted, and the list contains the OS's + # it can reuse. Note this is a directional compatibility so mutual compatibility between two OS's + # requires two entries i.e. os_compatible: {sonoma: [monterey], monterey: [sonoma]} + os_compatible: {} + + # Option to specify whether to support splicing. Splicing allows for + # the relinking of concrete package dependencies in order to better + # reuse already built packages with ABI compatible dependencies + splice: + explicit: [] + automatic: false + # Maximum time, in seconds, allowed for the 'solve' phase. If set to 0, there is no time limit. + timeout: 0 + # If set to true, exceeding the timeout will always result in a concretization error. If false, + # the best (suboptimal) model computed before the timeout is used. + # + # Setting this to false yields unreproducible results, so we advise to use that value only + # for debugging purposes (e.g. check which constraints can help Spack concretize faster). + error_on_timeout: true diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml index 018e8deb55..b9c4aee64e 100644 --- a/etc/spack/defaults/config.yaml +++ b/etc/spack/defaults/config.yaml @@ -101,6 +101,12 @@ config: verify_ssl: true + # This is where custom certs for proxy/firewall are stored. + # It can be a path or environment variable. To match ssl env configuration + # the default is the environment variable SSL_CERT_FILE + ssl_certs: $SSL_CERT_FILE + + # Suppress gpg warnings from binary package verification # Only suppresses warnings, gpg failure will still fail the install # Potential rationale to set True: users have already explicitly trusted the @@ -109,12 +115,6 @@ config: suppress_gpg_warnings: false - # If set to true, Spack will attempt to build any compiler on the spec - # that is not already available. If set to False, Spack will only use - # compilers already configured in compilers.yaml - install_missing_compilers: false - - # If set to true, Spack will always check checksums after downloading # archives. If false, Spack skips the checksum step. checksum: true @@ -164,23 +164,6 @@ config: # If set to true, Spack will use ccache to cache C compiles. ccache: false - - # The concretization algorithm to use in Spack. Options are: - # - # 'clingo': Uses a logic solver under the hood to solve DAGs with full - # backtracking and optimization for user preferences. Spack will - # try to bootstrap the logic solver, if not already available. - # - # 'original': Spack's original greedy, fixed-point concretizer. This - # algorithm can make decisions too early and will not backtrack - # sufficiently for many specs. This will soon be deprecated in - # favor of clingo. - # - # See `concretizer.yaml` for more settings you can fine-tune when - # using clingo. - concretizer: clingo - - # How long to wait to lock the Spack installation database. This lock is used # when Spack needs to manage its own package metadata and all operations are # expected to complete within the default time limit. The timeout should diff --git a/etc/spack/defaults/cray/modules.yaml b/etc/spack/defaults/cray/modules.yaml deleted file mode 100644 index a80f87b16a..0000000000 --- a/etc/spack/defaults/cray/modules.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------- -# This is the default configuration for Spack's module file generation. -# -# Settings here are versioned with Spack and are intended to provide -# sensible defaults out of the box. Spack maintainers should edit this -# file to keep it current. -# -# Users can override these settings by editing the following files. -# -# Per-spack-instance settings (overrides defaults): -# $SPACK_ROOT/etc/spack/modules.yaml -# -# Per-user settings (overrides default and site settings): -# ~/.spack/modules.yaml -# ------------------------------------------------------------------------- -modules: {} diff --git a/etc/spack/defaults/darwin/packages.yaml b/etc/spack/defaults/darwin/packages.yaml index 9fd54f2e6e..6aba11f273 100644 --- a/etc/spack/defaults/darwin/packages.yaml +++ b/etc/spack/defaults/darwin/packages.yaml @@ -19,7 +19,6 @@ packages: - apple-clang - clang - gcc - - intel providers: elf: [libelf] fuse: [macfuse] diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 24d19ac4cb..fe4eff20f8 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -15,15 +15,20 @@ # ------------------------------------------------------------------------- packages: all: - compiler: [gcc, intel, pgi, clang, xl, nag, fj, aocc] + compiler: [gcc, clang, oneapi, xl, nag, fj, aocc] providers: awk: [gawk] + armci: [armcimpi] blas: [openblas, amdblis] + c: [gcc] + cxx: [gcc] D: [ldc] daal: [intel-oneapi-daal] elf: [elfutils] fftw-api: [fftw, amdfftw] flame: [libflame, amdlibflame] + fortran: [gcc] + fortran-rt: [gcc-runtime, intel-oneapi-runtime] fuse: [libfuse] gl: [glx, osmesa] glu: [mesa-glu, openglu] @@ -34,9 +39,11 @@ packages: java: [openjdk, jdk, ibm-java] jpeg: [libjpeg-turbo, libjpeg] lapack: [openblas, amdlibflame] - libglx: [mesa+glx, mesa18+glx] + libc: [glibc, musl] + libgfortran: [gcc-runtime] + libglx: [mesa+glx] + libifcore: [intel-oneapi-runtime] libllvm: [llvm] - libosmesa: [mesa+osmesa, mesa18+osmesa] lua-lang: [lua, lua-luajit-openresty, lua-luajit] luajit: [lua-luajit-openresty, lua-luajit] mariadb-client: [mariadb-c-client, mariadb] @@ -57,6 +64,7 @@ packages: tbb: [intel-tbb] unwind: [libunwind] uuid: [util-linux-uuid, libuuid] + wasi-sdk: [wasi-sdk-prebuilt] xxd: [xxd-standalone, vim] yacc: [bison, byacc] ziglang: [zig] @@ -64,3 +72,15 @@ packages: permissions: read: world write: user + cray-mpich: + buildable: false + cray-mvapich2: + buildable: false + egl: + buildable: false + fujitsu-mpi: + buildable: false + hpcx-mpi: + buildable: false + spectrum-mpi: + buildable: false diff --git a/etc/spack/defaults/windows/config.yaml b/etc/spack/defaults/windows/config.yaml index 53116391cc..eaa336dca2 100644 --- a/etc/spack/defaults/windows/config.yaml +++ b/etc/spack/defaults/windows/config.yaml @@ -1,6 +1,5 @@ config: locks: false - concretizer: clingo build_stage:: - '$spack/.staging' stage_name: '{name}-{version}-{hash:7}' |