From e321578bbe7489301620fded21770dd66eed6ad0 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 8 Jun 2021 16:10:49 +0200 Subject: ASP-based solver: reordered low priority optimization criteria (#24184) Minimizing compiler mismatches in the DAG and preferring newer versions of packages are now higher priority than trying to use as many default values as possible in multi-valued variants. --- var/spack/repos/builtin.mock/packages/gmt/package.py | 10 ++++++++++ var/spack/repos/builtin.mock/packages/mvdefaults/package.py | 10 ++++++++++ var/spack/repos/builtin.mock/packages/root/package.py | 8 ++++++++ 3 files changed, 28 insertions(+) create mode 100644 var/spack/repos/builtin.mock/packages/gmt/package.py create mode 100644 var/spack/repos/builtin.mock/packages/mvdefaults/package.py create mode 100644 var/spack/repos/builtin.mock/packages/root/package.py (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/gmt/package.py b/var/spack/repos/builtin.mock/packages/gmt/package.py new file mode 100644 index 0000000000..444c3d3d95 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/gmt/package.py @@ -0,0 +1,10 @@ +# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +class Gmt(Package): + + version('2.0', 'abcdef') + version('1.0', 'abcdef') + + depends_on('mvdefaults', when='@1.0') diff --git a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py new file mode 100644 index 0000000000..d6f7e7e0db --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py @@ -0,0 +1,10 @@ +# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +class Mvdefaults(Package): + + version('1.0', 'abcdef') + + variant('foo', values=('a', 'b', 'c'), default=('a', 'b', 'c'), + multi=True, description='') diff --git a/var/spack/repos/builtin.mock/packages/root/package.py b/var/spack/repos/builtin.mock/packages/root/package.py new file mode 100644 index 0000000000..b0de915b29 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/root/package.py @@ -0,0 +1,8 @@ +# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +class Root(Package): + version('1.0', 'abcdef') + + depends_on('gmt') -- cgit v1.2.3-70-g09d2