diff options
| author | Mark W. Krentel <krentel@rice.edu> | 2020-12-15 06:55:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 13:55:45 +0100 |
| commit | d6bfc104bfbb5b385a2ed6b025657b3530373afd (patch) | |
| tree | eb4e6d9104d8c4354385bd10fec9490384d75334 /var | |
| parent | d67ca265a36b3c43cb1dfe540ea640a3b00923e1 (diff) | |
| download | spack-d6bfc104bfbb5b385a2ed6b025657b3530373afd.tar.gz spack-d6bfc104bfbb5b385a2ed6b025657b3530373afd.tar.bz2 spack-d6bfc104bfbb5b385a2ed6b025657b3530373afd.tar.xz spack-d6bfc104bfbb5b385a2ed6b025657b3530373afd.zip | |
comgr: disable hip compile test from /opt/rocm (#20330)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/comgr/hip-tests.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/comgr/package.py | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/comgr/hip-tests.patch b/var/spack/repos/builtin/packages/comgr/hip-tests.patch new file mode 100644 index 0000000000..7002f20653 --- /dev/null +++ b/var/spack/repos/builtin/packages/comgr/hip-tests.patch @@ -0,0 +1,11 @@ +diff -Naurb ROCm-CompilerSupport-rocm-3.10.0.orig/lib/comgr/test/CMakeLists.txt ROCm-CompilerSupport-rocm-3.10.0/lib/comgr/test/CMakeLists.txt +--- ROCm-CompilerSupport-rocm-3.10.0.orig/lib/comgr/test/CMakeLists.txt 2020-09-16 14:17:12.000000000 -0500 ++++ ROCm-CompilerSupport-rocm-3.10.0/lib/comgr/test/CMakeLists.txt 2020-12-14 10:11:56.609584283 -0600 +@@ -120,7 +120,6 @@ + add_comgr_test(include_subdirectory_test) + add_comgr_test(options_test) + # Test : Compile HIP only if HIP-Clang is installed. +-find_package(hip CONFIG PATHS /opt/rocm/hip QUIET) + if (DEFINED HIP_COMPILER AND "${HIP_COMPILER}" STREQUAL "clang") + add_comgr_test(compile_hip_test) + add_comgr_test(compile_hip_test_in_process) diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index 3d182f28f4..cb73c56de3 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -24,13 +24,20 @@ class Comgr(CMakePackage): 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') + + depends_on('cmake@3.2.0:', type='build', when='@:3.8.99') + depends_on('cmake@3.13.4:', type='build', when='@3.9.0:') + depends_on('zlib', type='link') depends_on('z3', type='link') depends_on('ncurses', type='link') - depends_on('cmake@3:', type='build') + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) - root_cmakelists_dir = 'lib/comgr' + root_cmakelists_dir = join_path('lib', 'comgr') |