diff options
Diffstat (limited to 'var')
45 files changed, 60 insertions, 304 deletions
diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index b8d3f60840..cadea3cb3c 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -36,8 +36,6 @@ class Alquimia(CMakePackage): variant('shared', default=True, description='Enables the build of shared libraries') - variant('debug', default=False, - description='Builds a debug version of the libraries') depends_on('mpi') depends_on('hdf5') @@ -52,10 +50,6 @@ class Alquimia(CMakePackage): options = ['-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, '-DUSE_XSDK_DEFAULTS=YES', - '-DCMAKE_BUILD_TYPE:STRING=%s' % ( - 'DEBUG' if '+debug' in spec else 'RELEASE'), - '-DXSDK_ENABLE_DEBUG:STRING=%s' % ( - 'YES' if '+debug' in spec else 'NO'), '-DBUILD_SHARED_LIBS:BOOL=%s' % ( 'ON' if '+shared' in spec else 'OFF'), '-DTPL_ENABLE_MPI:BOOL=ON', diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index eecb9341d9..4101b0e9e0 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -37,6 +37,11 @@ class Benchmark(CMakePackage): version('1.1.0', '66b2a23076cf70739525be0092fc3ae3') version('1.0.0', '1474ff826f8cd68067258db75a0835b8') + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebInfo', + 'MinSizeRel', 'Coverage')) + def patch(self): filter_file( r'add_cxx_compiler_flag..fstrict.aliasing.', diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index 87dc1c9e80..fe1e21a8de 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -36,14 +36,5 @@ class Bml(CMakePackage): version('develop', git='https://github.com/qmmd/bml', branch='master') version('1.1.0', git='https://github.com/qmmd/bml', tag='v1.1.0') - variant('debug', default=False, description='Build debug version') - depends_on("blas") depends_on("lapack") - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 2c1c663639..a13d79c953 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -53,6 +53,9 @@ class CbtfArgonavis(CMakePackage): version('1.8', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') + variant('build_type', default='None', values=('None'), + description='CMake build type') + depends_on("cmake@3.0.2:", type='build') depends_on("boost@1.50.0:1.59.0") depends_on("papi") @@ -65,9 +68,6 @@ class CbtfArgonavis(CMakePackage): build_directory = 'build_cbtf_argonavis' - def build_type(self): - return 'None' - def cmake_args(self): spec = self.spec compile_flags = "-O2 -g" diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index a90ea74f9d..40fc932e8f 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -68,6 +68,8 @@ class CbtfKrell(CMakePackage): description="Build mpi experiment collector for mpich2 MPI.") variant('mpich', default=False, description="Build mpi experiment collector for mpich MPI.") + variant('build_type', default='None', values=('None'), + description='CMake build type') # Dependencies for cbtf-krell depends_on("cmake@3.0.2:", type='build') @@ -129,9 +131,6 @@ class CbtfKrell(CMakePackage): cmakeOptions.extend(MPIOptions) - def build_type(self): - return 'None' - def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 6ffca1f8b1..b56265154c 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -51,6 +51,9 @@ class CbtfLanl(CMakePackage): version('1.8', branch='master', git='http://git.code.sf.net/p/cbtf-lanl/cbtf-lanl') + variant('build_type', default='None', values=('None'), + description='CMake build type') + depends_on("cmake@3.0.2:", type='build') # Dependencies for cbtf-krell depends_on("mrnet@5.0.1:+lwthreads") @@ -62,9 +65,6 @@ class CbtfLanl(CMakePackage): build_directory = 'build_cbtf_lanl' - def build_type(self): - return 'None' - def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 68e2b7d0a2..d972544f5f 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -58,6 +58,8 @@ class Cbtf(CMakePackage): variant('runtime', default=False, description="build only the runtime libraries and collectors.") + variant('build_type', default='None', values=('None'), + description='CMake build type') depends_on("cmake@3.0.2:", type='build') depends_on("boost@1.50.0:1.59.0") @@ -70,9 +72,6 @@ class Cbtf(CMakePackage): build_directory = 'build_cbtf' - def build_type(self): - return 'None' - def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py index c45069d39f..d1eee12d1c 100644 --- a/var/spack/repos/builtin/packages/clamr/package.py +++ b/var/spack/repos/builtin/packages/clamr/package.py @@ -42,10 +42,6 @@ class Clamr(CMakePackage): values=('opengl', 'mpe', 'none'), description='Build with specified graphics support') variant( - 'build', default='relwithdebinfo', - values=('debug', 'release', 'relwithdebinfo'), - description='Build type') - variant( 'precision', default='mixed', values=('single', 'mixed', 'full'), description='single, mixed, or full double precision values') @@ -53,15 +49,6 @@ class Clamr(CMakePackage): depends_on('mpi') depends_on('mpe', when='graphics=mpe') - def build_type(self): - spec = self.spec - if 'build=debug' in spec: - return 'Debug' - elif 'build=release' in spec: - return 'Release' - else: - return 'RelWithDebInfo' - def cmake_args(self): spec = self.spec cmake_args = [] diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index 7120fffac6..2f4f5b1579 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -50,7 +50,6 @@ class Clhep(CMakePackage): version('2.2.0.5', '1584e8ce6ebf395821aed377df315c7c') version('2.2.0.4', '71d2c7c2e39d86a0262e555148de01c1') - variant('debug', default=False, description="Switch to the debug version of CLHEP.") variant('cxx11', default=True, description="Compile using c++11 dialect.") variant('cxx14', default=False, description="Compile using c++14 dialect.") @@ -65,14 +64,6 @@ class Clhep(CMakePackage): root_cmakelists_dir = 'CLHEP' - def build_type(self): - spec = self.spec - - if '+debug' in spec: - return 'Debug' - else: - return 'MinSizeRel' - def cmake_args(self): spec = self.spec cmake_args = [] diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index ba1f896010..aa6a2be0b4 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -71,6 +71,9 @@ class Dealii(CMakePackage): description='Compile with 64 bit indices support') variant('optflags', default=False, description='Compile using additional optimization flags') + variant('build_type', default='DebugRelease', + description='The build type to build', + values=('Debug', 'Release', 'DebugRelease')) # required dependencies, light version depends_on("blas") @@ -136,10 +139,6 @@ class Dealii(CMakePackage): '+slepc', '+trilinos']: conflicts(p, when='~mpi') - def build_type(self): - # CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release - return 'DebugRelease' - def cmake_args(self): spec = self.spec options = [] diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index 137f445c69..40539e19c9 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -50,6 +50,9 @@ class Eccodes(CMakePackage): description="Enable OpenMP threads") variant('memfs', default=False, description="Memory based access to definitions/samples") + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebInfo', 'Production')) depends_on('netcdf', when='+netcdf') depends_on('openjpeg', when='+jpeg') diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index 0aefe416e3..569af17c61 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -40,9 +40,6 @@ class Eigen(CMakePackage): version('3.2.8', '64f4aef8012a424c7e079eaf0be71793ab9bc6e0') version('3.2.7', 'cc1bacbad97558b97da6b77c9644f184') - variant('debug', default=False, - description='Builds the library in debug mode') - variant('metis', default=True, description='Enables metis backend') variant('scotch', default=True, description='Enables scotch backend') variant('fftw', default=True, description='Enables FFTW backend') @@ -50,6 +47,9 @@ class Eigen(CMakePackage): description='Enables SuiteSparse support') variant('mpfr', default=True, description='Enables support for multi-precisions FP via mpfr') + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebInfo')) # TODO : dependency on googlehash, superlu, adolc missing depends_on('metis@5:', when='+metis') @@ -58,9 +58,3 @@ class Eigen(CMakePackage): depends_on('suite-sparse', when='+suitesparse') depends_on('mpfr@2.3.0:', when='+mpfr') depends_on('gmp', when='+mpfr') - - def build_type(self): - if '+debug' in self.spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index d86ee985f7..e118bcbd44 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -36,8 +36,6 @@ class Elemental(CMakePackage): version('0.87.7', '6c1e7442021c59a36049e37ea69b8075') version('0.87.6', '9fd29783d45b0a0e27c0df85f548abe9') - variant('debug', default=False, - description='Builds a debug version of the libraries') variant('shared', default=True, description='Enables the build of shared libraries') variant('hybrid', default=True, @@ -61,6 +59,9 @@ class Elemental(CMakePackage): ' Requires local build of BLAS library.') variant('scalapack', default=False, description='Build with ScaLAPACK library') + variant('build_type', default='Release', + description='The build type to build', + values=('Debug', 'Release')) # Note that this forces us to use OpenBLAS until #1712 is fixed depends_on('blas', when='~openmp_blas ~int64_blas') @@ -85,15 +86,6 @@ class Elemental(CMakePackage): 'libEl', root=self.prefix, shared=shared, recurse=True ) - def build_type(self): - """Returns the correct value for the ``CMAKE_BUILD_TYPE`` variable - :return: value for ``CMAKE_BUILD_TYPE`` - """ - if '+debug' in self.spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/espressopp/package.py b/var/spack/repos/builtin/packages/espressopp/package.py index e71291bec8..f1752b3b5e 100644 --- a/var/spack/repos/builtin/packages/espressopp/package.py +++ b/var/spack/repos/builtin/packages/espressopp/package.py @@ -39,7 +39,6 @@ class Espressopp(CMakePackage): version('1.9.4.1', '0da74a6d4e1bfa6a2a24fca354245a4f') version('1.9.4', 'f2a27993a83547ad014335006eea74ea') - variant('debug', default=False, description='Build debug version') variant('ug', default=False, description='Build user guide') variant('pdf', default=False, description='Build user guide in pdf format') variant('dg', default=False, description='Build developer guide') @@ -60,13 +59,6 @@ class Espressopp(CMakePackage): depends_on("texlive", when="+pdf", type='build') depends_on("doxygen", when="+dg", type='build') - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): return ['-DEXTERNAL_MPI4PY=ON', '-DEXTERNAL_BOOST=ON'] diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index 34afa0d609..5aa3b17d73 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -55,10 +55,12 @@ class Fenics(CMakePackage): description='Enables the shared memory support') variant('shared', default=True, description='Enables the build of shared libraries') - variant('debug', default=False, - description='Builds a debug version of the libraries') variant('doc', default=False, description='Builds the documentation') + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebInfo', + 'MinSizeRel', 'Developer')) # not part of spack list for now # variant('petsc4py', default=True, description='Uses PETSc4py') @@ -144,11 +146,7 @@ class Fenics(CMakePackage): return 'ON' if option in self.spec else 'OFF' def cmake_args(self): - spec = self.spec - return [ - '-DCMAKE_BUILD_TYPE:STRING={0}'.format( - 'Debug' if '+debug' in spec else 'RelWithDebInfo'), '-DDOLFIN_ENABLE_DOCS:BOOL={0}'.format( self.cmake_is_on('+doc')), '-DBUILD_SHARED_LIBS:BOOL={0}'.format( diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py index b22c553d2a..828ff47d2f 100644 --- a/var/spack/repos/builtin/packages/flecsale/package.py +++ b/var/spack/repos/builtin/packages/flecsale/package.py @@ -33,7 +33,6 @@ class Flecsale(CMakePackage): version('develop', git='https://github.com/laristra/flecsale', branch='master', submodules=True) - variant('debug', default=False, description='Build debug version') variant('mpi', default=True, description='Build on top of mpi conduit for mpi inoperability') @@ -43,13 +42,6 @@ class Flecsale(CMakePackage): depends_on("python") depends_on("openssl") - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): options = [ '-DENABLE_UNIT_TESTS=ON' diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 5c0f51b2d1..3b079565cb 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -41,7 +41,6 @@ class Flecsi(CMakePackage): version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=True) - variant('debug', default=False, description='Build debug version') variant('mpi', default=True, description='Build on top of mpi conduit for mpi inoperability') @@ -49,13 +48,6 @@ class Flecsi(CMakePackage): depends_on("legion+shared", when='~mpi') depends_on("legion+shared+mpi", when='+mpi') - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): options = ['-DENABLE_UNIT_TESTS=ON'] diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index cb04d67481..95d3eb9d55 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -41,7 +41,6 @@ class Geant4(CMakePackage): version('10.01.p03', '4fb4175cc0dabcd517443fbdccd97439') variant('qt', default=True, description='Enable Qt support') - variant('debug', default=False, description='Build debug version') depends_on('cmake@3.5:', type='build') @@ -54,13 +53,6 @@ class Geant4(CMakePackage): depends_on("xerces-c") depends_on("qt@4.8:", when="+qt") - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index 3c9eff5619..977bf6c3d6 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -46,8 +46,6 @@ class Gmsh(CMakePackage): variant('shared', default=True, description='Enables the build of shared libraries') - variant('debug', default=False, - description='Builds the library in debug mode') variant('mpi', default=True, description='Builds MPI support for parser and solver') variant('fltk', default=False, @@ -128,9 +126,6 @@ class Gmsh(CMakePackage): # Builds and installs static library options.append('-DENABLE_BUILD_LIB:BOOL=ON') - if '+debug' in spec: - options.append('-DCMAKE_BUILD_TYPE:STRING=Debug') - if '+mpi' in spec: options.append('-DENABLE_MPI:BOOL=ON') diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 97fd569d1f..ae17193139 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -48,12 +48,15 @@ class Gromacs(CMakePackage): variant('mpi', default=True, description='Activate MPI support') variant('shared', default=True, description='Enables the build of shared libraries') - variant('debug', default=False, description='Enables debug mode') variant( 'double', default=False, description='Produces a double precision version of the executables') variant('plumed', default=False, description='Enable PLUMED support') variant('cuda', default=False, description='Enable CUDA support') + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel', + 'Reference', 'RelWithAssert', 'Profile')) depends_on('mpi', when='+mpi') depends_on('plumed+mpi', when='+plumed+mpi') @@ -79,11 +82,6 @@ class Gromacs(CMakePackage): if '~shared' in self.spec: options.append('-DBUILD_SHARED_LIBS:BOOL=OFF') - if '+debug' in self.spec: - options.append('-DCMAKE_BUILD_TYPE:STRING=Debug') - else: - options.append('-DCMAKE_BUILD_TYPE:STRING=Release') - if '+cuda' in self.spec: options.append('-DGMX_GPU:BOOL=ON') options.append('-DCUDA_TOOLKIT_ROOT_DIR:STRING=' + diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index ef7b347426..58644db11e 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -40,10 +40,3 @@ class Hpx(CMakePackage): def cmake_args(self): args = ['-DHPX_BUILD_EXAMPLES=OFF', '-DHPX_MALLOC=system'] return args - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index b79f9244c9..fea1924550 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -36,24 +36,16 @@ class Lbann(CMakePackage): version('develop', git='https://github.com/LLNL/lbann.git', branch="develop") version('0.91', '83b0ec9cd0b7625d41dfb06d2abd4134') - variant('debug', default=False, description='Builds a debug version of the libraries') variant('gpu', default=False, description='Builds with support for GPUs via CUDA and cuDNN') variant('opencv', default=True, description='Builds with support for image processing routines with OpenCV') variant('seq_init', default=False, description='Force serial initialization of weight matrices.') depends_on('elemental +openmp_blas +scalapack +shared +int64') - depends_on('elemental +openmp_blas +scalapack +shared +int64 +debug', when='+debug') depends_on('cuda', when='+gpu') depends_on('mpi') depends_on('opencv@3.2.0', when='+opencv') depends_on('protobuf@3.0.2:') - def build_type(self): - if '+debug' in self.spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): spec = self.spec # Environment variables diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index 79a1ee533d..3bcd37e306 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -46,7 +46,6 @@ class Legion(CMakePackage): version('develop', git='https://github.com/StanfordLegion/legion', branch='master') version('17.02.0', '31ac3004e2fb0996764362d2b6f6844a') - variant('debug', default=False, description='Build debug version') variant('mpi', default=True, description='Build on top of mpi conduit for mpi inoperability') variant('shared', default=True, description='Build shared libraries') @@ -55,13 +54,6 @@ class Legion(CMakePackage): depends_on("gasnet", when='~mpi') depends_on("gasnet+mpi", when='+mpi') - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): options = [ '-DLegion_USE_GASNet=ON', diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index fc8823f1a8..64e50f0cfb 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -43,10 +43,10 @@ class Llvm(CMakePackage): version('3.0', 'a8e5f5f1c1adebae7b4a654c376a6005', url='http://llvm.org/releases/3.0/llvm-3.0.tar.gz') - variant('debug', default=False, - description="Build a debug version of LLVM, this increases " - "binary size by an order of magnitude, make sure you have " - "20-30gb of space available to build this") + # NOTE: The debug version of LLVM is an order of magnitude larger than + # the release version, and may take up 20-30 GB of space. If you want + # to save space, build with `build_type=Release`. + variant('clang', default=True, description="Build the LLVM C/C++/Objective-C compiler frontend") variant('lldb', default=True, description="Build the LLVM debugger") @@ -327,12 +327,6 @@ class Llvm(CMakePackage): def setup_environment(self, spack_env, run_env): spack_env.append_flags('CXXFLAGS', self.compiler.cxx11_flag) - def build_type(self): - if '+debug' in self.spec: - return 'RelWithDebInfo' - else: - return 'Release' - def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py index 4d0c9c1ef7..574ddf2be3 100644 --- a/var/spack/repos/builtin/packages/mad-numdiff/package.py +++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py @@ -34,12 +34,3 @@ class MadNumdiff(CMakePackage): version('develop', git='https://github.com/quinoacomputing/ndiff', branch='master') version('20150724', '7723c0f2499aea8fd960377c5bed28d8') - - variant('debug', default=False, description='Build debug version') - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index fc6d79e9ea..040144ff16 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -38,19 +38,10 @@ class Nalu(CMakePackage): version('master', git='https://github.com/NaluCFD/Nalu.git', branch='master') - variant('debug', default=False, - description='Builds a debug version') - # Currently Nalu only builds static libraries; To be fixed soon depends_on('yaml-cpp+fpic~shared') depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf@master') - def build_type(self): - if '+debug' in self.spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): spec = self.spec options = [] diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py index 0449155bc7..37ae236c0a 100644 --- a/var/spack/repos/builtin/packages/opencoarrays/package.py +++ b/var/spack/repos/builtin/packages/opencoarrays/package.py @@ -42,6 +42,11 @@ class Opencoarrays(CMakePackage): version('1.7.4', '85ba87def461e3ff5a164de2e6482930') version('1.6.2', '5a4da993794f3e04ea7855a6678981ba') + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebInfo', + 'MinSizeRel', 'CodeCoverage')) + depends_on('mpi') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 2acb44ad02..f4c0029d72 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -83,6 +83,8 @@ class Openspeedshop(CMakePackage): variant('rtfe', default=False, description="build for clusters heterogeneous processors \ on fe/be nodes.") + variant('build_type', default='None', values=('None'), + description='CMake build type') # MPI variants variant('openmpi', default=False, @@ -144,9 +146,6 @@ class Openspeedshop(CMakePackage): build_directory = 'build_openspeedshop' - def build_type(self): - return 'None' - def cmake_args(self): spec = self.spec compile_flags = "-O2 -g" diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index 85a008a119..f6848be725 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -39,12 +39,3 @@ class Pegtl(CMakePackage): version('develop', git='https://github.com/taocpp/PEGTL', branch='master') version('2.1.4', 'e5288b6968e6e910287fce93dc5557bf') version('2.0.0', 'c772828e7188459338a920c21f9896db') - - variant('debug', default=False, description='Build debug version') - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py index 92e4266552..0934076ab9 100644 --- a/var/spack/repos/builtin/packages/portage/package.py +++ b/var/spack/repos/builtin/packages/portage/package.py @@ -36,19 +36,11 @@ class Portage(CMakePackage): version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True) - variant('debug', default=False, description='Build debug version') variant('mpi', default=True, description='Support MPI') depends_on("cmake@3.1:", type='build') depends_on('mpi', when='+mpi') - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): options = ['-DENABLE_UNIT_TESTS=ON', '-DENABLE_APP_TESTS=ON'] diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py index eb41bb8b37..de04e6407c 100644 --- a/var/spack/repos/builtin/packages/quinoa/package.py +++ b/var/spack/repos/builtin/packages/quinoa/package.py @@ -38,8 +38,6 @@ class Quinoa(CMakePackage): version('develop', git='https://github.com/quinoacomputing/quinoa', branch='master') - variant('debug', default=False, description='Build debug version') - depends_on('hdf5+mpi') depends_on("charm backend=mpi") depends_on("trilinos+exodus") @@ -56,10 +54,3 @@ class Quinoa(CMakePackage): depends_on("pegtl") root_cmakelists_dir = 'src' - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index dfb93cd943..23b1834fbc 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -40,6 +40,10 @@ class Relion(CMakePackage): variant('cuda', default=False, description="enable compute on gpu") variant('double', default=False, description="double precision (cpu) code") variant('double-gpu', default=False, description="double precision (gpu) code") + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebInfo', + 'Profiling', 'Benchmarking')) depends_on('mpi') depends_on('fftw+float+double') diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index b5f6ce89fe..dfd7ba3e25 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -99,12 +99,6 @@ class Root(CMakePackage): # See https://sft.its.cern.ch/jira/browse/ROOT-7517 conflicts('%intel') - def build_type(self): - if '+debug' in self.spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): args = [ '-Dcocoa=OFF', diff --git a/var/spack/repos/builtin/packages/sas/package.py b/var/spack/repos/builtin/packages/sas/package.py index 5a7f1de1d5..050d6172d6 100644 --- a/var/spack/repos/builtin/packages/sas/package.py +++ b/var/spack/repos/builtin/packages/sas/package.py @@ -36,19 +36,10 @@ class Sas(CMakePackage): version('0.1.4', '20d7311258f2a59c9367ae1576c392b6') version('0.1.3', '1e6572afcc03318d16d7321d40eec0fd') - variant('debug', default=False, description='Build debug version') - depends_on('python@2.7:') depends_on('llvm@3.5:') depends_on('cmake@2.8:', type='build') - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): args = [ '-DLLVM_DEV_DIR=%s' % self.spec['llvm'].prefix diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index 50dd335ac7..a36cfc70b2 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -55,6 +55,9 @@ class Symengine(CMakePackage): description='Enable thread safety option') variant('shared', default=True, description='Enables the build of shared libraries') + variant('build_type', default='Release', + description='The build type to build', + values=('Debug', 'Release')) # NOTE: mpir is a drop-in replacement for gmp # NOTE: [mpc,mpfr,flint,piranha] could also be built against mpir @@ -66,10 +69,6 @@ class Symengine(CMakePackage): depends_on('flint', when='+flint~boostmp') depends_on('piranha', when='+piranha~flint~boostmp') - def build_type(self): - # CMAKE_BUILD_TYPE should be Debug | Release - return 'Release' - def cmake_args(self): spec = self.spec options = [] @@ -77,7 +76,6 @@ class Symengine(CMakePackage): # See https://github.com/symengine/symengine/blob/master/README.md # for build options options.extend([ - '-DCMAKE_BUILD_TYPE=Release', '-DWITH_SYMENGINE_RCP:BOOL=ON', '-DWITH_SYMENGINE_THREAD_SAFE:BOOL=%s' % ( 'ON' if ('+thread_safe' or '+openmp') in spec else 'OFF'), diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 74022f0833..8566adc649 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -93,8 +93,6 @@ class Trilinos(CMakePackage): description='Build python wrappers') variant('shared', default=True, description='Enables the build of shared libraries') - variant('debug', default=False, - description='Builds a debug version of the libraries') variant('boost', default=True, description='Compile with Boost') variant('tpetra', default=True, @@ -241,8 +239,6 @@ class Trilinos(CMakePackage): '-DTrilinos_ENABLE_TESTS:BOOL=OFF', '-DTrilinos_ENABLE_EXAMPLES:BOOL=OFF', '-DTrilinos_ENABLE_CXX11:BOOL=ON', - '-DCMAKE_BUILD_TYPE:STRING=%s' % ( - 'DEBUG' if '+debug' in spec else 'RELEASE'), '-DBUILD_SHARED_LIBS:BOOL=%s' % ( 'ON' if '+shared' in spec else 'OFF'), diff --git a/var/spack/repos/builtin/packages/vc/package.py b/var/spack/repos/builtin/packages/vc/package.py index e41a385947..67ced036b2 100644 --- a/var/spack/repos/builtin/packages/vc/package.py +++ b/var/spack/repos/builtin/packages/vc/package.py @@ -35,11 +35,7 @@ class Vc(CMakePackage): version('1.2.0', 'a5236df286b845d2fee5ef1e4d27549f') version('1.1.0', 'e354c1e3ea1d674b6f2af9c6fd230d81') - variant('debug', default=False) - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' + variant('build_type', default='RelWithDebInfo', + description='The build type to build', + values=('Debug', 'Release', 'RelWithDebug', + 'RelWithDebInfo', 'MinSizeRel')) diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index d514f13c17..9843840e5b 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -36,17 +36,8 @@ class Vecgeom(CMakePackage): version('0.3.rc', git='https://gitlab.cern.ch/VecGeom/VecGeom.git', tag='v0.3.rc') - variant('debug', default=False, description='Build debug version') - depends_on('cmake@3.5:', type='build') - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): options = [ '-DBACKEND=Scalar', diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index 6756d0427b..bd5879e68a 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -39,16 +39,7 @@ class VotcaCsg(CMakePackage): version('develop', git='https://github.com/votca/csg', branch='master') version('1.4', 'd009e761e5e3afd51eed89c420610a67') - variant('debug', default=False, description='Build debug version') - depends_on("cmake@2.8:", type='build') depends_on("votca-tools@1.4:1.4.999", when='@1.4:1.4.999') depends_on("votca-tools@develop", when='@develop') depends_on("gromacs~mpi@5.1:") - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index 81586b18e6..8ace180487 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -39,16 +39,7 @@ class VotcaCtp(CMakePackage): version('develop', git='https://github.com/votca/ctp', branch='master') - variant('debug', default=False, description='Build debug version') - depends_on("cmake@2.8:", type='build') depends_on("votca-tools@develop", when='@develop') depends_on("votca-csg@develop", when='@develop') depends_on("votca-moo@develop", when='@develop') - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/votca-moo/package.py b/var/spack/repos/builtin/packages/votca-moo/package.py index a596ba1c9c..dfbef140eb 100644 --- a/var/spack/repos/builtin/packages/votca-moo/package.py +++ b/var/spack/repos/builtin/packages/votca-moo/package.py @@ -39,14 +39,5 @@ class VotcaMoo(CMakePackage): version('develop', git='https://github.com/votca/moo', branch='master') - variant('debug', default=False, description='Build debug version') - depends_on("cmake@2.8:", type='build') depends_on("votca-tools@develop", when='@develop') - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 39055c45a3..d2acac8736 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -39,18 +39,9 @@ class VotcaTools(CMakePackage): version('develop', git='https://github.com/votca/tools', branch='master') version('1.4', 'cd47868e9f28e2c7b9d01f95aa0185ca') - variant('debug', default=False, description='Build debug version') - depends_on("cmake@2.8:", type='build') depends_on("expat") depends_on("fftw") depends_on("gsl") depends_on("boost") depends_on("sqlite") - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index 951df7b8c6..80cd4802e3 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -39,17 +39,8 @@ class VotcaXtp(CMakePackage): version('develop', git='https://github.com/votca/xtp', branch='master') - variant('debug', default=False, description='Build debug version') - depends_on("cmake@2.8:", type='build') depends_on("votca-tools@develop", when='@develop') depends_on("votca-csg@develop", when='@develop') depends_on("votca-ctp@develop", when='@develop') depends_on("votca-moo@develop", when='@develop') - - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' diff --git a/var/spack/repos/builtin/packages/vpic/package.py b/var/spack/repos/builtin/packages/vpic/package.py index e24aa9e530..43083d813e 100644 --- a/var/spack/repos/builtin/packages/vpic/package.py +++ b/var/spack/repos/builtin/packages/vpic/package.py @@ -40,18 +40,9 @@ class Vpic(CMakePackage): version('develop', git='https://github.com/lanl/vpic', branch='master', submodules=True) - variant('debug', default=False, description='Build debug version') - depends_on("cmake@3.1:", type='build') depends_on('mpi') - def build_type(self): - spec = self.spec - if '+debug' in spec: - return 'Debug' - else: - return 'Release' - def cmake_args(self): options = ['-DENABLE_INTEGRATED_TESTS=ON', '-DENABLE_UNIT_TESTS=ON'] diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py index 0d70baabcd..cf3d425313 100644 --- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py +++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py @@ -45,20 +45,18 @@ class Xsdktrilinos(CMakePackage): description='Compile with PETSc solvers') variant('shared', default=True, description='Enables the build of shared libraries') - variant('debug', default=False, - description='Builds a debug version of the libraries') # MPI related dependencies depends_on('mpi') depends_on('hypre~internal-superlu', when='+hypre') depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre') - depends_on('hypre@develop~internal-superlu', when='@develop+hypre') + depends_on('hypre@develop~internal-superlu', when='@develop+hypre') depends_on('petsc@xsdk-0.2.0+mpi~complex', when='@xsdk-0.2.0+petsc') - depends_on('petsc@develop+mpi~complex', when='@develop+petsc') + depends_on('petsc@develop+mpi~complex', when='@develop+petsc') depends_on('trilinos@12.6.4', when='@12.6.4') depends_on('trilinos@12.8.1', when='@12.8.1') depends_on('trilinos@xsdk-0.2.0', when='@xsdk-0.2.0') - depends_on('trilinos@develop', when='@develop') + depends_on('trilinos@develop', when='@develop') def url_for_version(self, version): url = "https://github.com/trilinos/xSDKTrilinos/archive/trilinos-release-{0}.tar.gz" @@ -75,8 +73,6 @@ class Xsdktrilinos(CMakePackage): '-DxSDKTrilinos_ENABLE_TESTS:BOOL=ON', '-DxSDKTrilinos_ENABLE_EXAMPLES:BOOL=ON', '-DTrilinos_INSTALL_DIR=%s' % spec['trilinos'].prefix, - '-DCMAKE_BUILD_TYPE:STRING=%s' % ( - 'DEBUG' if '+debug' in spec else 'RELEASE'), '-DBUILD_SHARED_LIBS:BOOL=%s' % ( 'ON' if '+shared' in spec else 'OFF'), '-DTPL_ENABLE_MPI:BOOL=ON', |