zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

concretizer: use consistent naming for compiler predicates (#20677)

Browse Source 
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`
This commit is contained in:
Todd Gamblin
2021-01-04 23:41:01 -08:00
committed by GitHub
parent e6d462589f
commit 5ac05db917
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/solver/asp.py
View File

@@ -889,8 +889,8 @@ class Head(object):
node_os = fn.node_os_set node_os = fn.node_os_set
node_target = fn.node_target_set node_target = fn.node_target_set
variant_value = fn.variant_set variant_value = fn.variant_set
node_compiler = fn.node_compiler_hard node_compiler = fn.node_compiler_set
node_compiler_version = fn.node_compiler_version_hard node_compiler_version = fn.node_compiler_version_set
node_flag = fn.node_flag_set node_flag = fn.node_flag_set
class Body(object): class Body(object):
@@ -968,8 +968,6 @@ class Body(object):
for flag in flags: for flag in flags:
clauses.append(f.node_flag(spec.name, flag_type, flag)) clauses.append(f.node_flag(spec.name, flag_type, flag))
# TODO: namespace
# dependencies # dependencies
if spec.concrete: if spec.concrete:
clauses.append(fn.concrete(spec.name)) clauses.append(fn.concrete(spec.name))

12
lib/spack/spack/solver/concretize.lp
View File

@@ -576,7 +576,7 @@ node_compiler_version_satisfies(Package, Compiler, Constraint)
% If the compiler version was set from the command line, % If the compiler version was set from the command line,
% respect it verbatim % 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 % Cannot select a compiler if it is not supported on the OS
% Compilers that are explicitly marked as allowed % 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 % Compiler prescribed in the root spec
node_compiler_version_match_pref(Package, Compiler, V) node_compiler_version_match_pref(Package, Compiler, V)
:- node_compiler_hard(Package, Compiler), :- node_compiler_set(Package, Compiler),
node_compiler_version(Package, Compiler, V), node_compiler_version(Package, Compiler, V),
not external(Package). not external(Package).
@@ -599,21 +599,21 @@ node_compiler_version_match_pref(Dependency, Compiler, V)
:- depends_on(Package, Dependency), :- depends_on(Package, Dependency),
node_compiler_version_match_pref(Package, Compiler, V), node_compiler_version_match_pref(Package, Compiler, V),
node_compiler_version(Dependency, 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 % Compiler inherited from the root package
node_compiler_version_match_pref(Dependency, Compiler, V) node_compiler_version_match_pref(Dependency, Compiler, V)
:- depends_on(Package, Dependency), :- depends_on(Package, Dependency),
node_compiler_version(Package, Compiler, V), root(Package), node_compiler_version(Package, Compiler, V), root(Package),
node_compiler_version(Dependency, Compiler, V), node_compiler_version(Dependency, Compiler, V),
not node_compiler_hard(Dependency, Compiler). not node_compiler_set(Dependency, Compiler).
compiler_version_match(Package, 1) compiler_version_match(Package, 1)
:- node_compiler_version(Package, Compiler, V), :- node_compiler_version(Package, Compiler, V),
node_compiler_version_match_pref(Package, Compiler, V). node_compiler_version_match_pref(Package, Compiler, V).
#defined node_compiler_hard/2. #defined node_compiler_set/2.
#defined node_compiler_version_hard/3. #defined node_compiler_version_set/3.
#defined compiler_supports_os/3. #defined compiler_supports_os/3.
#defined allow_compiler/2. #defined allow_compiler/2.