Skip to content

Commit

Permalink
updating packages to use cmake build_type instead of defining their o…
Browse files Browse the repository at this point in the history
…wn when types are a subset of cmake

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch committed May 11, 2021
1 parent 05d7760 commit 64eb960
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 26 deletions.
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/comgr/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class Comgr(CMakePackage):
version('3.7.0', sha256='73e56ec3c63dade24ad351e9340e2f8e127694028c1fb7cec5035376bf098432')
version('3.5.0', sha256='25c963b46a82d76d55b2302e0e18aac8175362656a465549999ad13d07b689b9')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

# Disable the hip compile tests. Spack should not be using
# /opt/rocm, and this breaks the build when /opt/rocm exists.
patch('hip-tests.patch')
Expand Down
4 changes: 0 additions & 4 deletions var/spack/repos/builtin/packages/fairlogger/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ class Fairlogger(CMakePackage):
version('1.1.0', sha256='e185e5bd07df648224f85e765d18579fae0de54adaab9a194335e3ad6d3d29f7')
version('1.0.6', sha256='2fc266a6e494adda40837be406aef8d9838f385ffd64fbfafb1164833906b4e0')

variant('build_type', default='RelWithDebInfo',
values=('Debug', 'Release', 'RelWithDebInfo'),
multi=False,
description='CMake build type')
variant('cxxstd', default='default',
values=('default', '11', '14', '17'),
multi=False,
Expand Down
3 changes: 0 additions & 3 deletions var/spack/repos/builtin/packages/helics/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ class Helics(CMakePackage):
version('2.4.2', sha256='957856f06ed6d622f05dfe53df7768bba8fe2336d841252f5fac8345070fa5cb')
version('2.4.1', sha256='ac077e9efe466881ea366721cb31fb37ea0e72a881a717323ba4f3cdda338be4')

variant('build_type', default='Release',
description='CMake build type',
values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel'))
variant('apps', default=True, description="Install the HELICS apps")
variant('benchmarks', default=False, description="Install the HELICS benchmarks")
variant('c_shared', default=True, description="Install the C shared library")
Expand Down
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/hipfort/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ class Hipfort(CMakePackage):
version('3.9.0', sha256='a3c4e125a9b56820446a65bd76b8caa196fddb0e0723eb513f0bcde9abd6a0c0')
version('3.8.0', sha256='0132e9949f758dd8b8a462d133b3316101440cd503aa6c53bea9e34e61bbb3cc')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

depends_on('cmake@3:', type='build')

for ver in ['3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0']:
Expand Down
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/hsa-rocr-dev/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ class HsaRocrDev(CMakePackage):
version('3.7.0', sha256='0071d14431f73ce74574e61d0786f2b7cf34b14ea898a1f54b6e1b06b2d468c0')
version('3.5.0', sha256='52c12eec3e3404c0749c70f156229786ee0c3e6d3c979aed9bbaea500fa1f3b8')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

depends_on('cmake@3:', type="build")
depends_on('libelf@0.8:', type='link')
for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0',
Expand Down
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/hsakmt-roct/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ class HsakmtRoct(CMakePackage):
version('3.7.0', sha256='b357fe7f425996c49f41748923ded1a140933de7564a70a828ed6ded6d896458')
version('3.5.0', sha256='d9f458c16cb62c3c611328fd2f2ba3615da81e45f3b526e45ff43ab4a67ee4aa')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

depends_on('cmake@3:', type='build')
depends_on('numactl')

Expand Down
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/llvm-amdgpu/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ class LlvmAmdgpu(CMakePackage):
version('3.7.0', sha256='3e2542ce54b91b5c841f33d542143e0e43eae95e8785731405af29f08ace725b')
version('3.5.0', sha256='4878fa85473b24d88edcc89938441edc85d2e8a785e567b7bd7ce274ecc2fd9c')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

variant('openmp', default=True, description='Enable OpenMP')

depends_on('cmake@3.4.3:', type='build', when='@:3.8.99')
Expand Down
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/miopen-opencl/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class MiopenOpencl(CMakePackage):
version('3.7.0', sha256='f6a6ddd8d39bb76b7f7d91e68ade3b45e0201181145658c43b967065a354b103')
version('3.5.0', sha256='aa362e69c4dce7f5751f0ee04c745735ea5454c8101050e9b92cc60fa3c0fb82')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

depends_on('cmake@3:', type='build')
depends_on('boost@1.67.0:1.73.0', type='link')
depends_on('pkgconfig', type='build')
Expand Down
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/rocm-cmake/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ class RocmCmake(CMakePackage):
version('3.7.0', sha256='51abfb06124c2e0677c4d6f7fe83c22fe855cb21386f0053ace09f8ab297058b')
version('3.5.0', sha256='5fc09e168879823160f5fdf4fd1ace2702d36545bf733e8005ed4ca18c3e910f')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

depends_on('cmake@3:', type='build')

def cmake_args(self):
Expand Down
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/rocm-device-libs/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class RocmDeviceLibs(CMakePackage):
version('3.7.0', sha256='b3a114180bf184b3b829c356067bc6a98021d52c1c6f9db6bc57272ebafc5f1d')
version('3.5.0', sha256='dce3a4ba672c4a2da4c2260ee4dc96ff6dd51877f5e7e1993cb107372a35a378')

variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')

depends_on('cmake@3:', type='build')
depends_on('zlib', type='link', when='@3.9.0:')
depends_on('texinfo', type='link', when='@3.9.0:')
Expand Down
3 changes: 0 additions & 3 deletions var/spack/repos/builtin/packages/symengine/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ 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
Expand Down

0 comments on commit 64eb960

Please sign in to comment.