From 36072c47767d1ed53d8d08e53ce0e9cb4f0a3e16 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Fri, 16 Dec 2016 12:49:02 -0600
Subject: [PATCH] [HACK] Make concretization great again! (#2590)
* Always default to +mpi
* Always default to ~X
---
var/spack/repos/builtin/packages/R/package.py | 2 +-
var/spack/repos/builtin/packages/arpack-ng/package.py | 2 +-
var/spack/repos/builtin/packages/cairo/package.py | 2 +-
var/spack/repos/builtin/packages/caliper/package.py | 2 +-
var/spack/repos/builtin/packages/charm/package.py | 2 +-
var/spack/repos/builtin/packages/fftw/package.py | 2 +-
var/spack/repos/builtin/packages/gmsh/package.py | 2 +-
var/spack/repos/builtin/packages/gtkplus/package.py | 2 +-
var/spack/repos/builtin/packages/h5hut/package.py | 2 +-
var/spack/repos/builtin/packages/julia/package.py | 2 +-
var/spack/repos/builtin/packages/mfem/package.py | 2 +-
var/spack/repos/builtin/packages/paraview/package.py | 2 +-
var/spack/repos/builtin/packages/py-h5py/package.py | 2 +-
var/spack/repos/builtin/packages/scotch/package.py | 2 +-
var/spack/repos/builtin/packages/tk/package.py | 2 +-
var/spack/repos/builtin/packages/turbomole/package.py | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/R/package.py
index 000e337ce0..fa8adb69ea 100644
--- a/var/spack/repos/builtin/packages/R/package.py
+++ b/var/spack/repos/builtin/packages/R/package.py
@@ -50,7 +50,7 @@ class R(Package):
variant('external-lapack', default=False,
description='Links to externally installed BLAS/LAPACK')
- variant('X', default=True,
+ variant('X', default=False,
description='Enable X11 support (call configure --with-x)')
# Virtual dependencies
diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py
index 87ab2bbaac..a1c18d8086 100644
--- a/var/spack/repos/builtin/packages/arpack-ng/package.py
+++ b/var/spack/repos/builtin/packages/arpack-ng/package.py
@@ -61,7 +61,7 @@ class ArpackNg(Package):
variant('shared', default=True,
description='Enables the build of shared libraries')
- variant('mpi', default=False, description='Activates MPI support')
+ variant('mpi', default=True, description='Activates MPI support')
# The function pdlamch10 does not set the return variable.
# This is fixed upstream
diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py
index fce7da3f17..8bf1cc4ef8 100644
--- a/var/spack/repos/builtin/packages/cairo/package.py
+++ b/var/spack/repos/builtin/packages/cairo/package.py
@@ -33,7 +33,7 @@ class Cairo(AutotoolsPackage):
version('1.14.0', 'fc3a5edeba703f906f2241b394f0cced')
- variant('X', default=True, description="Build with X11 support")
+ variant('X', default=False, description="Build with X11 support")
depends_on('libx11', when='+X')
depends_on('libxext', when='+X')
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
index 113bef61b8..c9d4a41bc2 100644
--- a/var/spack/repos/builtin/packages/caliper/package.py
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -36,7 +36,7 @@ class Caliper(Package):
version('master', git='https://github.com/LLNL/Caliper.git')
- variant('mpi', default=False, description='Enable MPI function wrappers.')
+ variant('mpi', default=True, description='Enable MPI function wrappers.')
depends_on('libunwind')
depends_on('papi')
diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py
index 1ec53c2138..7072e37cd3 100644
--- a/var/spack/repos/builtin/packages/charm/package.py
+++ b/var/spack/repos/builtin/packages/charm/package.py
@@ -53,7 +53,7 @@ class Charm(Package):
# Communication mechanisms (choose exactly one)
# TODO: Support Blue Gene/Q PAMI, Cray GNI, Cray shmem, CUDA
- variant("mpi", default=False,
+ variant("mpi", default=True,
description="Use MPI as communication mechanism")
variant("multicore", default=False,
description="Disable inter-node communication")
diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py
index 53b635ba7c..838f6ff744 100644
--- a/var/spack/repos/builtin/packages/fftw/package.py
+++ b/var/spack/repos/builtin/packages/fftw/package.py
@@ -53,7 +53,7 @@ class Fftw(Package):
description='Produces a quad precision version of the library '
'(works only with GCC and libquadmath)')
variant('openmp', default=False, description="Enable OpenMP support.")
- variant('mpi', default=False, description='Activate MPI support')
+ variant('mpi', default=True, description='Activate MPI support')
variant(
'pfft_patches', default=False,
description='Add extra transpose functions for PFFT compatibility')
diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py
index dd142866e5..afed1097f1 100644
--- a/var/spack/repos/builtin/packages/gmsh/package.py
+++ b/var/spack/repos/builtin/packages/gmsh/package.py
@@ -45,7 +45,7 @@ class Gmsh(Package):
description='Enables the build of shared libraries')
variant('debug', default=False,
description='Builds the library in debug mode')
- variant('mpi', default=False,
+ variant('mpi', default=True,
description='Builds MPI support for parser and solver')
variant('fltk', default=False,
description='Enables the build of the FLTK GUI')
diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py
index b0b11db64f..9005d4f516 100644
--- a/var/spack/repos/builtin/packages/gtkplus/package.py
+++ b/var/spack/repos/builtin/packages/gtkplus/package.py
@@ -34,7 +34,7 @@ class Gtkplus(Package):
'2.24.25', '612350704dd3aacb95355a4981930c6f',
url="http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.25.tar.xz")
- variant('X', default=True, description="Enable an X toolkit")
+ variant('X', default=False, description="Enable an X toolkit")
depends_on("atk")
depends_on("gdk-pixbuf")
diff --git a/var/spack/repos/builtin/packages/h5hut/package.py b/var/spack/repos/builtin/packages/h5hut/package.py
index 1501384493..a80a9e1082 100644
--- a/var/spack/repos/builtin/packages/h5hut/package.py
+++ b/var/spack/repos/builtin/packages/h5hut/package.py
@@ -37,7 +37,7 @@ class H5hut(Package):
version("1.99.13", "2a07a449afe50534de006ac6954a421a")
variant("fortran", default=True, description="Enable Fortran support")
- variant("mpi", default=False, description="Enable MPI support")
+ variant("mpi", default=True, description="Enable MPI support")
depends_on("autoconf @2.60:", type="build")
depends_on("automake", type="build")
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 033e27fb64..3725724ee3 100644
--- a/var/spack/repos/builtin/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -48,7 +48,7 @@ class Julia(Package):
# TODO: Split these out into jl-hdf5, jl-mpi packages etc.
variant("cxx", default=False, description="Prepare for Julia Cxx package")
variant("hdf5", default=False, description="Install Julia HDF5 package")
- variant("mpi", default=False, description="Install Julia MPI package")
+ variant("mpi", default=True, description="Install Julia MPI package")
variant("plot", default=False,
description="Install Julia plotting packages")
variant("python", default=False,
diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py
index 9aa4ab8cf0..45f64cef65 100644
--- a/var/spack/repos/builtin/packages/mfem/package.py
+++ b/var/spack/repos/builtin/packages/mfem/package.py
@@ -45,7 +45,7 @@ class Mfem(Package):
variant('hypre', default=False, description='Activate support for hypre')
variant('suite-sparse', default=False,
description='Activate support for SuiteSparse')
- variant('mpi', default=False, description='Activate support for MPI')
+ variant('mpi', default=True, description='Activate support for MPI')
variant('superlu-dist', default=False,
description='Activate support for SuperLU_Dist')
variant('lapack', default=False, description='Activate support for LAPACK')
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py
index 68c781734e..252f58247f 100644
--- a/var/spack/repos/builtin/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@@ -37,7 +37,7 @@ class Paraview(Package):
variant('tcl', default=False, description='Enable TCL support')
- variant('mpi', default=False, description='Enable MPI support')
+ variant('mpi', default=True, description='Enable MPI support')
variant('osmesa', default=False, description='Enable OSMesa support')
variant('qt', default=False, description='Enable Qt support')
diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py
index 0579787ba2..85c3996051 100644
--- a/var/spack/repos/builtin/packages/py-h5py/package.py
+++ b/var/spack/repos/builtin/packages/py-h5py/package.py
@@ -36,7 +36,7 @@ class PyH5py(Package):
version('2.5.0', '6e4301b5ad5da0d51b0a1e5ac19e3b74')
version('2.4.0', '80c9a94ae31f84885cc2ebe1323d6758')
- variant('mpi', default=False, description='Build with MPI support')
+ variant('mpi', default=True, description='Build with MPI support')
extends('python')
diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py
index add2154f43..ca8e3e3fa0 100644
--- a/var/spack/repos/builtin/packages/scotch/package.py
+++ b/var/spack/repos/builtin/packages/scotch/package.py
@@ -40,7 +40,7 @@ class Scotch(Package):
version('6.0.0', 'c50d6187462ba801f9a82133ee666e8e')
version('5.1.10b', 'f587201d6cf5cf63527182fbfba70753')
- variant('mpi', default=False,
+ variant('mpi', default=True,
description='Activate the compilation of parallel libraries')
variant('compression', default=True,
description='Activate the posibility to use compressed files')
diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py
index 12a7049e72..1abcd26a24 100644
--- a/var/spack/repos/builtin/packages/tk/package.py
+++ b/var/spack/repos/builtin/packages/tk/package.py
@@ -37,7 +37,7 @@ class Tk(Package):
version('8.6.5', '11dbbd425c3e0201f20d6a51482ce6c4')
version('8.6.3', '85ca4dbf4dcc19777fd456f6ee5d0221')
- variant('X', default=True, description='Enable X11 support')
+ variant('X', default=False, description='Enable X11 support')
depends_on("tcl")
depends_on("libx11", when='+X')
diff --git a/var/spack/repos/builtin/packages/turbomole/package.py b/var/spack/repos/builtin/packages/turbomole/package.py
index b2d7e90057..cf14259da4 100644
--- a/var/spack/repos/builtin/packages/turbomole/package.py
+++ b/var/spack/repos/builtin/packages/turbomole/package.py
@@ -43,7 +43,7 @@ class Turbomole(Package):
version('7.0.2', '92b97e1e52e8dcf02a4d9ac0147c09d6',
url="file://%s/turbolinux702.tar.gz" % os.getcwd())
- variant('mpi', default=False, description='Set up MPI environment')
+ variant('mpi', default=True, description='Set up MPI environment')
variant('smp', default=False, description='Set up SMP environment')
# Turbomole's install is odd. There are three variants
--
GitLab