From e9f1cfdaaf0638d5f7bc26a2af7e757ec2f45e96 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 13 Sep 2021 20:04:42 +0200 Subject: Avoid hidden circular dependencies in spack.architecture (#25873) * Refactor platform etc. to avoid circular dependencies All the base classes in spack.architecture have been moved to the corresponding specialized subpackages, e.g. Platform is now defined within spack.platforms. This resolves a circular dependency where spack.architecture was both: - Defining the base classes for spack.platforms, etc. - Collecting derived classes from spack.platforms, etc. Now it dopes only the latter. * Move a few platform related functions to "spack.platforms" * Removed spack.architecture.sys_type() * Fixup for docs * Rename Python modules according to review --- var/spack/repos/builtin/packages/pmix/package.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index aec064505d..cc6099d41b 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -2,11 +2,8 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - - import os -import spack.architecture from spack import * @@ -111,8 +108,8 @@ class Pmix(AutotoolsPackage): # Versions < 2.1.1 have a bug in the test code that *sometimes* # causes problems on strict alignment architectures such as # aarch64. Work-around is to just not build the test code. - if 'aarch64' in spack.architecture.sys_type() and \ - self.spec.version < Version('2.1.1'): + if (self.spec.satisfies('target=aarch64:') and + self.spec.version < Version('2.1.1')): config_args.append('--without-tests-examples') # Versions >= 3.0 also use hwloc -- cgit v1.2.3-70-g09d2