From 0c48f0a15dc63129aa2bdc146152a9bf1c32e66e Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 31 Jul 2020 18:51:12 -0700 Subject: architecture: make it easier to get a Spec for the default arch - [x] Make it easier to get a `Spec` with a proper `ArchSpec` from an `Arch` object via new `Arch.to_spec()` method. - [x] Pull `spack.architecture.default_arch()` out of `spack.architecture.sys_type()` so we can get an `Arch` instead of a string. --- lib/spack/spack/architecture.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'lib/spack') diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py index 963fecd375..a7c8062fad 100644 --- a/lib/spack/spack/architecture.py +++ b/lib/spack/spack/architecture.py @@ -436,6 +436,12 @@ class Arch(object): ('target', self.target.to_dict_or_value())]) return syaml_dict([('arch', d)]) + def to_spec(self): + """Convert this Arch to an anonymous Spec with architecture defined.""" + spec = spack.spec.Spec() + spec.architecture = spack.spec.ArchSpec(str(self)) + return spec + @staticmethod def from_dict(d): spec = spack.spec.ArchSpec.from_dict(d) @@ -518,6 +524,14 @@ def platform(): @memoized +def default_arch(): + """Default ``Arch`` object for this machine. + + See ``sys_type()``. + """ + return Arch(platform(), 'default_os', 'default_target') + + def sys_type(): """Print out the "default" platform-os-target tuple for this machine. @@ -530,8 +544,7 @@ def sys_type(): architectures. """ - arch = Arch(platform(), 'default_os', 'default_target') - return str(arch) + return str(default_arch()) @memoized -- cgit v1.2.3-70-g09d2