diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2021-01-04 23:41:01 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-05 08:41:01 +0100 |
commit | 5ac05db917b9bcc9fa9c23b57d45da04fb1960e4 (patch) | |
tree | 399076817cb43acb3038a56946f53363b628f909 /lib/spack | |
parent | e6d462589f2437997c4d3c05305b89b986f7f57f (diff) | |
download | spack-5ac05db917b9bcc9fa9c23b57d45da04fb1960e4.tar.gz spack-5ac05db917b9bcc9fa9c23b57d45da04fb1960e4.tar.bz2 spack-5ac05db917b9bcc9fa9c23b57d45da04fb1960e4.tar.xz spack-5ac05db917b9bcc9fa9c23b57d45da04fb1960e4.zip |
concretizer: use consistent naming for compiler predicates (#20677)
Every other predicate in the concretizer uses a `_set` suffix to
implement user- or package-supplied settings, but compiler settings use a
`_hard` suffix for this. There's no difference in how they're used, so
make the names the same.
- [x] change `node_compiler_hard` to `node_compiler_set`
- [x] change `node_compiler_version_hard` to `node_compiler_version_set`
Diffstat (limited to 'lib/spack')
-rw-r--r-- | lib/spack/spack/solver/asp.py | 6 | ||||
-rw-r--r-- | lib/spack/spack/solver/concretize.lp | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 2d41e03934..883234c7d3 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -889,8 +889,8 @@ class SpackSolverSetup(object): node_os = fn.node_os_set node_target = fn.node_target_set variant_value = fn.variant_set - node_compiler = fn.node_compiler_hard - node_compiler_version = fn.node_compiler_version_hard + node_compiler = fn.node_compiler_set + node_compiler_version = fn.node_compiler_version_set node_flag = fn.node_flag_set class Body(object): @@ -968,8 +968,6 @@ class SpackSolverSetup(object): for flag in flags: clauses.append(f.node_flag(spec.name, flag_type, flag)) - # TODO: namespace - # dependencies if spec.concrete: clauses.append(fn.concrete(spec.name)) diff --git a/lib/spack/spack/solver/concretize.lp b/lib/spack/spack/solver/concretize.lp index 89abe4ff7d..a5ff15b6ce 100644 --- a/lib/spack/spack/solver/concretize.lp +++ b/lib/spack/spack/solver/concretize.lp @@ -576,7 +576,7 @@ node_compiler_version_satisfies(Package, Compiler, Constraint) % If the compiler version was set from the command line, % respect it verbatim -node_compiler_version(Package, Compiler, Version) :- node_compiler_version_hard(Package, Compiler, Version). +node_compiler_version(Package, Compiler, Version) :- node_compiler_version_set(Package, Compiler, Version). % Cannot select a compiler if it is not supported on the OS % Compilers that are explicitly marked as allowed @@ -590,7 +590,7 @@ node_compiler_version(Package, Compiler, Version) :- node_compiler_version_hard( % Compiler prescribed in the root spec node_compiler_version_match_pref(Package, Compiler, V) - :- node_compiler_hard(Package, Compiler), + :- node_compiler_set(Package, Compiler), node_compiler_version(Package, Compiler, V), not external(Package). @@ -599,21 +599,21 @@ node_compiler_version_match_pref(Dependency, Compiler, V) :- depends_on(Package, Dependency), node_compiler_version_match_pref(Package, Compiler, V), node_compiler_version(Dependency, Compiler, V), - not node_compiler_hard(Dependency, Compiler). + not node_compiler_set(Dependency, Compiler). % Compiler inherited from the root package node_compiler_version_match_pref(Dependency, Compiler, V) :- depends_on(Package, Dependency), node_compiler_version(Package, Compiler, V), root(Package), node_compiler_version(Dependency, Compiler, V), - not node_compiler_hard(Dependency, Compiler). + not node_compiler_set(Dependency, Compiler). compiler_version_match(Package, 1) :- node_compiler_version(Package, Compiler, V), node_compiler_version_match_pref(Package, Compiler, V). -#defined node_compiler_hard/2. -#defined node_compiler_version_hard/3. +#defined node_compiler_set/2. +#defined node_compiler_version_set/3. #defined compiler_supports_os/3. #defined allow_compiler/2. |