summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)AuthorFilesLines
2023-04-07Fix incorrect reformatting of spack.yaml (#36698)Massimiliano Culpo3-55/+101
* Extract a method to warn when the manifest is not up-to-date * Extract methods to update the repository and ensure dir exists * Simplify further the write method, add failing unit-test * Fix the function computing YAML equivalence between two instances
2023-04-06spack install: fail if --log-file and not --log-format (#36684)Massimiliano Culpo1-0/+4
fixes #34551 "spack install" now fails if a user passed the --logfile option without specifying a log format.
2023-04-05Update archspec to HEAD of develop (#36657)Massimiliano Culpo3-12/+62
2023-04-04Add workflow:rules:always to spack ci output (#36011)Jonathon Anderson1-0/+3
2023-04-04Make spack config update work on environments (#36542)Harmen Stoppels3-21/+46
Previously `spack -e bla config update <section>` would treat the environment config scope as standard config file instead of a single file config scope. This fixes that.
2023-04-04filter __spack_path_placeholder__ in generated module files after buildcache ↵Harmen Stoppels2-2/+2
install (#36611) * filter __spack_path_placeholder__ in generated module files after buildcache install * fix windows
2023-04-03modules: remove default symlink on uninstall (#36454)Xavier Delaruelle2-0/+16
When app is uninstalled, if it matches a default, then remove the default symlink targeting its modulefile. Until now, when a default were uninstalled, the default symlink were left pointing to a nonexistent modulefile.
2023-04-03Improve Dockerfile recipe generation (#35187)Massimiliano Culpo4-11/+142
- Update default image to Ubuntu 22.04 (previously was still Ubuntu 18.04) - Optionally use depfiles to install the environment within the container - Allow extending Dockerfile Jinja2 template - Allow extending Singularity definition file Jinja2 template - Deprecate previous options to add extra instructions
2023-04-03Rework error handling within the ASP logic program (#36536)Massimiliano Culpo4-123/+122
* Reduce effort on grounding by employing cardinality constraints If we use a cardinality constraint instead of a rule using pair of values, we'll end up grounding 1 rule instead of all the possible pair combinations of the allowed values. * Display all errors from concretization, instead of just one If clingo produces multiple "error" facts, we now print all of them in the error message. Before we were printing just the one with the least priority. Consolidate a few common patterns in concretize.lp to ensure that certain node attributes have one and only one value assigned. All errors are displayed, so use a single criterion instead of three. * Account for weights in concretize.lp To recover the optimization order we had before, account for weights of errors when minimizing. The priority is mapped to powers of 10, so to effectively get back the same results as with priorities.
2023-04-03modules: correctly detect explicit installation (#36533)Xavier Delaruelle16-47/+78
When generating modulefile, correctly detect software installation asked by user as explicit installation. Explicit installation status were previously fetched from database record of spec, which was only set after modulefile generation. Code is updated to pass down the explicit status of software installation to the object that generates modulefiles. Fixes #34730. Fixes #12105. A value for the explicit argument has to be set when creating a new installation, but for operations on existing installation, this value is retrieved from database. Such operations are: module rm, module refresh, module setdefaults or when get_module function is used. Update on the way tests that mimics an installation, thus explicit argument has to be set under such situation.
2023-03-31Allow configurable stage names (#36509)John W. Parent4-6/+20
Add `config:stage_name` which is a Spec format string that can customize the names of stages created by Spack. This was primarily created to allow generating shorter stage names on Windows (along with `config:build_stage`, this can be used to create stages with short absolute paths). By default, this is not set and the prior name stage format is used. This also removes the username component that is always added to Stage paths on Windows (if users want to include this, they can add it to the `build_stage`).
2023-03-31compiler wrapper: fix -Xlinker parsing (#35929)Harmen Stoppels2-35/+123
* compiler wrapper: fix -Xlinker parsing * handle the case of -rpath without value; avoid that we drop the flag * also handle the -Xlinker -rpath -Xlinker without further args case... * fix test * get rid of global $rp var, reduce branching
2023-03-31typehint a few globals (#36544)Harmen Stoppels6-8/+20
2023-03-30Add type-hints to spack.bootstrap (#36491)Massimiliano Culpo5-78/+117
2023-03-30Fix a couple of minor bugs with ASP weights (#36522)Massimiliano Culpo2-23/+14
Reorder versions so that deprecated ones are last. Account for default not used when the variant exists.
2023-03-28retry: bugfix: package requirements with git commits (#35057) (#36347)Todd Gamblin4-34/+234
- [x] Specs that define 'new' versions in the require: section need to generate associated facts to indicate that those versions are valid. - [x] add test to verify success with unknown versions. - [x] remove unneeded check that was leading to extra complexity and test failures (at this point, all `hash=version` does not require listing out that version in `packages.yaml`) - [x] unique index for origin (dont reuse 0) Co-authored-by: Peter Josef Scheibel <scheibel1@llnl.gov>
2023-03-28macos: set new ad-hoc signature with codesign after binary string ↵Harmen Stoppels3-10/+31
replacement (#35585)
2023-03-27Add `llnl.util.filesystem.find_first` (#36083)Harmen Stoppels2-1/+168
Add a `find_first` method that locates one instance of a file that matches a specified pattern by recursively searching a directory tree. Unlike other `find` methods, this only locates one file at most, so can use optimizations that avoid searching the entire tree: Typically the relevant files are at low depth, so it makes sense to locate files through iterative deepening and early exit.
2023-03-27modules: enhance help message (#36410)Xavier Delaruelle2-1/+54
Update tcl and lmod modulefile template to provide more information on help message (name, version and target) like done on whatis for lmod modulefiles.
2023-03-24modules: add support for append_flags/remove_flags (#36402)Xavier Delaruelle2-0/+4
Adapt tcl and lmod modulefile templates to generate append-path or remove-path commands in modulefile when respectively append_flags or remove_flags commands are defined in package for run environment. Fixes #10299.
2023-03-24modules tcl: simplify env modification block in template (#36334)Xavier Delaruelle3-8/+27
Simplify environment modification block in modulefile Tcl template by always setting a path delimiter to the prepend-path, append-path and remove-path commands. Remove --delim option to the setenv command as this command does not allow such option. Update test_prepend_path_separator test to explicitly check the 6 path-like commands that should be present in generated modulefile.
2023-03-23unit tests: don't hard-code arch in compiler config (#36360)Harmen Stoppels1-3/+0
This breaks when testing on non-x86_64 machines outside CI
2023-03-23Fix regression on compiler constraint (#36342)Massimiliano Culpo3-3/+68
fixes #36339 We were missing a rule that enforced a match between the `node_compiler` and the compiler used to satisfy a requirement. Fix compiler with custom, made up version too
2023-03-23Revert "Bugfix: package requirements with git commits (#35057)" (#36341)Harmen Stoppels4-215/+11
This reverts commit 3d597e29bee1429d2b8d204016df40b575900d66.
2023-03-23Bugfix: package requirements with git commits (#35057)Peter Scheibel4-11/+215
* Specs that define 'new' versions in the require: section need to generate associated facts to indicate that those versions are valid. * add test to verify success with unknown versions.
2023-03-23modules tcl: switch default all:autoload from none to direct (#36269)Xavier Delaruelle1-4/+7
Since environment-modules has support for autoloading since 4.2, and Spack-builds of it enable it by default, use the same autoload default for tcl as lmod.
2023-03-22docs: mention cuda multi-arch capability (#36321)Leopold Talirz1-1/+4
2023-03-20Package requirements: allow single specs in requirement lists (#36258)Peter Scheibel3-9/+35
If you have a "require:" section in your packages config, and you use it to specify a list of requirements, the list elements can now include strings (before this, each element in the list had to be a `one_of` or `any_of` specification, which is awkward if you wanted to apply just one spec with no alternatives).
2023-03-20spack install: simplify behavior when inside environments (#35206)Harmen Stoppels3-217/+183
Example one: ``` spack install --add x y z ``` is equivalent to ``` spack add x y z spack concretize spack install --only-concrete ``` where `--only-concrete` installs without modifying spack.yaml/spack.lock Example two: ``` spack install ``` concretizes current spack.yaml if outdated and installs all specs. Example three: ``` spack install x y z ``` concretizes current spack.yaml if outdated and installs *only* concrete specs in the environment that match abstract specs `x`, `y`, or `z`.
2023-03-20Remove unused `ignore` parameter of `extends()` directive (#35588)Adam J. Stewart1-23/+0
The `ignore` parameter was only used for `spack activate/deactivate`, and it isn't used by Spack Environments which have their own handling of file conflicts. We should remove it. Everything that handles `ignore=` was removed in #29317 and included in 0.19, when we removed `spack activate` and `spack deactivate` in favor of environments. So all of these usages removed here were already being ignored by Spack.
2023-03-20ci.py: remove redundant wrapper around get (#36188)Harmen Stoppels1-30/+24
2023-03-20modules tcl: fix autoload mechanism in template (#36237)Xavier Delaruelle1-13/+2
Adapt tcl modulefile template to call "module load" on autoload dependency without testing if this dependency is already loaded or not. The is-loaded test is not necessary, as module commands know how to cope with an already loaded module. With environment-modules 4.2+ (released in 2018) it is also important to have this "module load" command even if dependency is already loaded in order to record that the modulefile declares such dependency. This is important if you want to keep a consistent environment when a dependent module is unloaded. The "Autoloading" verbose message is also removed as recent module commands will report such information to the user (depending on the verbosity configured for the module command). Such change has been test successfully with Modules 3.2 (EL7), 4.5 (EL8) and 5.2 (latest) and also with Lmod 7 and 8 (as it is mentionned in Spack docs that Lmod can be used along with tcl modules). Dependencies are correctly loaded or unloaded, whether they are loaded/unloaded or not. This change fixes Tcl quoting issue introduced in #32853. Fixes #19155.
2023-03-19Fix case spelling for Lmod and Tcl (#36215)Xavier Delaruelle17-37/+37
2023-03-18cmake build system: make "generator" a variant (#35552)Massimiliano Culpo3-33/+64
2023-03-18Fix wrong computation of concrete specs due to a bug in intersects (#36194)Massimiliano Culpo2-1/+22
fixes #36190
2023-03-17Improve wording of audit message (#36180)Massimiliano Culpo1-2/+5
2023-03-17Windows: properly handle symlink failures (#36003)John W. Parent2-4/+10
In the Windows filesystem logic for creating a symlink, we intend to fall back to a copy when the symlink cannot be created (for some configuration settings on Windows it is not possible for the user to create a symlink). It turns out we were overly-broad in which exceptions lead to this fallback, and the subsequent copy would also fail: at least one case where this occurred is when we attempted to create a symlink that already existed. The updated logic expressly avoids falling back to a copy when the file/symlink already exists.
2023-03-17Mitigation for GitVersion bug when no `=reference` is given (#36159)Massimiliano Culpo2-1/+39
* ASP-based solver: use satisfies instead of intersects They are semantically equivalent for concrete versions, but the GitVersion.intersects implementation is buggy * Mitigation for git version bug fixes #36134 This commit works around the issue in #36134, by using GitVersion.satisfies instead of GitVersion.intersects There are still underlying issues when trying to infer the "reference version" when no explicit one is given, but: 1. They are not reproducible with our synthetic repo 2. They occur only when the `git.<xxx>` form of Git version is used Here we just work around the user facing issue and ensure the tests are correct with our synthetic repository.
2023-03-17ASP-based solver: tweak heuristic, modify compiler encoding (#35989)Massimiliano Culpo2-158/+187
This PR does 2 unrelated things: 1. It changes the encoding of the compilers 2. It tweaks the heuristic for the solves in a0d88179074f81d13a3fad629a43d86334e7f982 Both were initially motivated by trying to get a performance gain but, while 2 showed significant speed-ups[^1], 1 instead didn't. I kept it anyhow, since I think the code related to compilers is more consolidated with the new encoding and we might get some performance improvement out of it if we can base our errors on the `node_compiler(Package, CompilerID)` atoms instead of `attrs`. [^1]: In general the changes in the heuristic brought a ~10% speed-up on the tests I did. I'll post detailed results below. Add a warning about compilers.yaml that is triggered if there are multiple compilers with the same spec, os and target (since they can't be selected by users with the spec syntax only).
2023-03-16reduce spec.json.sig file size (#36157)Harmen Stoppels1-1/+5
Since GPG clear-sign cannot deal with lines longer than 19995 characters and doesn't even error but simply truncates those linese (don't ask me why...), we have to be careful not to hit that line limit when reducing the filesize. So, instead this PR sets the indent level to 0 and drops the whitespace after `: `, which still reduces file size by 50% or so.
2023-03-16Revert "minify spec.json in buildcache (#36138)" (#36156)Harmen Stoppels1-1/+1
This reverts commit 1a8eefe09b034f8dda564e60b5b1905f53958aa2.
2023-03-15minify spec.json in buildcache (#36138)Harmen Stoppels1-1/+1
saves about 50% of data, which is significant for hundreds of thousands of spec.json files in our buildcaches.
2023-03-14Remove leftover command from documentation (#36116)Shahzeb Siddiqui1-8/+3
The command refers to dotkit files, which are not supported since a long time.
2023-03-14Libogg and libtheora: build on windows (#35099)John W. Parent1-1/+13
Adds builders appropriate for building these packages on Windows. It is intended that builds on other platforms are unaffected (e.g. they build with Autotools as before on Linux).
2023-03-14environment.matching_spec: linear time traversal (#35534)Harmen Stoppels1-35/+37
... and use colors in disambiguate message for clarity. This commit avoids the loop: ``` for root in roots: for dep in deps(root): ... ``` instead it ensures each node is visited once and only once. Also adds a small optimization when searching for concrete specs, since we can assume uniqueness of dag hash, so it's fine to early exit.
2023-03-14Use bfs in get_spec_filter_list (#36093)Harmen Stoppels1-7/+9
2023-03-14Fix typo affecting Gitlab CI (#36103)Harmen Stoppels1-3/+3
Introduced in #35944
2023-03-14use stage dir for buildcache create (#36091)Harmen Stoppels1-26/+42
2023-03-14concretizer: add mode to reuse dependencies only (#30990)Michael Kuhn4-12/+28
This adds a new mode for `concretizer:reuse` called `dependencies`, which only reuses dependencies. Currently, `spack install foo` will reuse older versions of `foo`, which might be surprising to users.
2023-03-12cce compiler: bugfix for version regex to avoid conflation with apple-clang ↵Greg Becker2-1/+26
(#35974) Currently apple-clang is detected as cce, and it should not be. --------- Co-authored-by: becker33 <becker33@users.noreply.github.com>