From 6ec3c4d35ed5b0ba9681cc5ee4ceec2e0503b282 Mon Sep 17 00:00:00 2001 From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com> Date: Thu, 24 Sep 2020 08:49:46 -0700 Subject: renaming of Rocclr ,rocgdb to hip-rocclr and rocm-gdb ,fix build error for rocm-opencl (#18900) * renaming of rocclr , rocgdb to hip-rocclr and rocm-gdb * fix flake8 errors and fix build error for luma --- .../repos/builtin/packages/hip-rocclr/opengl.patch | 49 ++++++++++++ .../repos/builtin/packages/hip-rocclr/package.py | 89 ++++++++++++++++++++++ var/spack/repos/builtin/packages/hip/package.py | 9 ++- .../repos/builtin/packages/hsa-rocr-dev/package.py | 4 +- .../repos/builtin/packages/rocclr/opengl.patch | 49 ------------ var/spack/repos/builtin/packages/rocclr/package.py | 89 ---------------------- var/spack/repos/builtin/packages/rocgdb/package.py | 59 -------------- .../repos/builtin/packages/rocm-gdb/package.py | 61 +++++++++++++++ .../repos/builtin/packages/rocm-opencl/package.py | 11 ++- .../packages/rocmvalidationsuite/package.py | 2 +- 10 files changed, 214 insertions(+), 208 deletions(-) create mode 100644 var/spack/repos/builtin/packages/hip-rocclr/opengl.patch create mode 100644 var/spack/repos/builtin/packages/hip-rocclr/package.py delete mode 100644 var/spack/repos/builtin/packages/rocclr/opengl.patch delete mode 100644 var/spack/repos/builtin/packages/rocclr/package.py delete mode 100644 var/spack/repos/builtin/packages/rocgdb/package.py create mode 100644 var/spack/repos/builtin/packages/rocm-gdb/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hip-rocclr/opengl.patch b/var/spack/repos/builtin/packages/hip-rocclr/opengl.patch new file mode 100644 index 0000000000..fc9bacee50 --- /dev/null +++ b/var/spack/repos/builtin/packages/hip-rocclr/opengl.patch @@ -0,0 +1,49 @@ +From 98df37fc36b6276c26532e86e89be7e389745f4e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= +Date: Sun, 19 Jul 2020 11:58:24 +0200 +Subject: [PATCH] Fix search for OpenCL include dirs + +--- + CMakeLists.txt | 26 +++++++++----------------- + 1 file changed, 9 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 122277ee..02ca4644 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,26 +53,18 @@ find_package(amd_comgr REQUIRED CONFIG + ) + message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.") + +-# FIXME: Use find_package(OpenCL) +-find_library( OpenCL REQUIRED CONFIG +- PATHS +- /opt/rocm ++find_path(OPENCL_INCLUDE_DIR ++ NAMES OpenCL/cl.h CL/cl.h ++ PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 ++ PATHS ${OPENCL_DIR} ++ DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" + ) + +-if( NOT OPENCL_DIR ) +- find_path(OPENCL_INCLUDE_DIR +- NAMES OpenCL/cl.h CL/cl.h +- PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 +- PATHS /opt/rocm +- DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" +- ) +- +- if( NOT OPENCL_INCLUDE_DIR ) +- unset(OPENCL_INCLUDE_DIR CACHE) +- set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) +- endif() +- message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") ++if( NOT OPENCL_INCLUDE_DIR ) ++ unset(OPENCL_INCLUDE_DIR CACHE) ++ set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) + endif() ++message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") + + + diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py new file mode 100644 index 0000000000..0b387d5306 --- /dev/null +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -0,0 +1,89 @@ +# Copyright 2013-2020 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) + + +from spack import * + + +class HipRocclr(CMakePackage): + """Hip-ROCclr is a virtual device interface that compute runtimes interact + with to different backends such as ROCr or PAL This abstraction allows + runtimes to work on Windows as well as on Linux without much effort.""" + + homepage = "https://github.com/ROCm-Developer-Tools/ROCclr" + + maintainers = ['srekolam', 'arjun-raj-kuppala'] + + def url_for_version(self, version): + # Fix up a typo in the 3.5.0 release. + if version == Version('3.5.0'): + return "https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-3.5.0.tar.gz" + + url = "https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz" + return url.format(version) + + version('3.8.0', sha256='10d8aa6f5af7b51813015da603c4e75edc863c3530793f6ed9769ca345c08ed6') + version('3.7.0', sha256='a49f464bb2eab6317e87e3cc249aba3b2517a34fbdfe50175f0437f69a219adc') + version('3.5.0', sha256='87c1ee9f02b8aa487b628c543f058198767c474cec3d21700596a73c028959e1') + + depends_on('cmake@3:', type='build') + depends_on('mesa~llvm@18.3:', type='link') + depends_on('libelf', type='link', when="@3.7.0:") + depends_on('numactl', type='link', when="@3.7.0:") + for ver in ['3.5.0', '3.7.0', '3.8.0']: + depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) + depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) + depends_on('comgr@' + ver, type='build', when='@' + ver) + + # See: https://github.com/ROCm-Developer-Tools/ROCclr/pull/16 + # In 3.7.0 the find opengl things have changed slightly. + patch('opengl.patch', when='@3.5.0') + + resource(name='opencl-on-vdi', + url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.5.0.tar.gz', + sha256='511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0', + expand=True, + destination='', + placement='opencl-on-vdi', + when='@3.5.0') + + resource(name='opencl-on-vdi', + url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.7.0.tar.gz', + sha256='283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b', + expand=True, + destination='', + placement='opencl-on-vdi', + when='@3.7.0') + + resource(name='opencl-on-vdi', + url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.8.0.tar.gz', + sha256='7f75dd1abf3d771d554b0e7b0a7d915ab5f11a74962c92b013ee044a23c1270a', + expand=True, + destination='', + placement='opencl-on-vdi', + when='@3.8.0') + + @run_after('install') + def deploy_missing_files(self): + if '@3.5.0' in self.spec: + # the amdrocclr_staticTargets.cmake file is generated but not + # installed and when we install it by hand, we have to fix the + # path to the static library libamdrocclr_static.a from build + # dir to prefix lib dir. + cmakefile = join_path(self.build_directory, + 'amdrocclr_staticTargets.cmake') + filter_file(self.build_directory, self.prefix.lib, cmakefile) + install(cmakefile, self.prefix.lib) + else: + path = join_path(self.prefix.lib, + 'cmake/rocclr/ROCclrConfig.cmake') + filter_file(self.build_directory, self.prefix, path) + + def cmake_args(self): + args = [ + '-DUSE_COMGR_LIBRARY=yes', + '-DOPENCL_DIR={0}/opencl-on-vdi'.format(self.stage.source_path) + ] + return args diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 33fc0cd737..e2c81830a6 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -26,7 +26,7 @@ class Hip(CMakePackage): depends_on('mesa~llvm@18.3:') for ver in ['3.5.0', '3.7.0', '3.8.0']: - depends_on('rocclr@' + ver, type='build', when='@' + ver) + depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) @@ -35,7 +35,7 @@ class Hip(CMakePackage): depends_on('rocminfo@' + ver, type='build', when='@' + ver) # Notice: most likely this will only be a hard dependency on 3.7.0 - depends_on('numactl', when='@3.7.0') + depends_on('numactl', when='@3.7.0:') # Note: the ROCm ecosystem expects `lib/` and `bin/` folders with symlinks # in the parent directory of the package, which is incompatible with spack. @@ -68,7 +68,7 @@ class Hip(CMakePackage): def flag_handler(self, name, flags): if name == 'cxxflags' and '@3.7.0:' in self.spec: - incl = self.spec['rocclr'].prefix.include + incl = self.spec['hip-rocclr'].prefix.include flags.append('-I {0}/compiler/lib/include'.format(incl)) return (flags, None, None) @@ -92,6 +92,7 @@ class Hip(CMakePackage): '-DHIP_COMPILER=clang', '-DHIP_PLATFORM=rocclr', '-DHSA_PATH={0}'.format(self.spec['hsa-rocr-dev'].prefix), - '-DLIBROCclr_STATIC_DIR={0}/lib'.format(self.spec['rocclr'].prefix) + '-DLIBROCclr_STATIC_DIR={0}/lib'.format + (self.spec['hip-rocclr'].prefix) ] return args diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index 745f84daca..643b299321 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -28,8 +28,8 @@ class HsaRocrDev(CMakePackage): depends_on('libelf@0.8:', type='link') for ver in ['3.5.0', '3.7.0', '3.8.0']: depends_on('hsakmt-roct@' + ver, type=('link', 'run'), when='@' + ver) - if '@3.7.0:' in ver: - depends_on('llvm-amdgpu@' + ver, type=('link', 'run'), when='@' + ver) + for ver in ['3.7.0', '3.8.0']: + depends_on('llvm-amdgpu@' + ver, type=('link', 'run'), when='@' + ver) # Both 3.5.0 and 3.7.0 force INSTALL_RPATH in different ways patch('0001-Do-not-set-an-explicit-rpath-by-default-since-packag.patch', when='@3.5.0') diff --git a/var/spack/repos/builtin/packages/rocclr/opengl.patch b/var/spack/repos/builtin/packages/rocclr/opengl.patch deleted file mode 100644 index fc9bacee50..0000000000 --- a/var/spack/repos/builtin/packages/rocclr/opengl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 98df37fc36b6276c26532e86e89be7e389745f4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= -Date: Sun, 19 Jul 2020 11:58:24 +0200 -Subject: [PATCH] Fix search for OpenCL include dirs - ---- - CMakeLists.txt | 26 +++++++++----------------- - 1 file changed, 9 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 122277ee..02ca4644 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,26 +53,18 @@ find_package(amd_comgr REQUIRED CONFIG - ) - message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.") - --# FIXME: Use find_package(OpenCL) --find_library( OpenCL REQUIRED CONFIG -- PATHS -- /opt/rocm -+find_path(OPENCL_INCLUDE_DIR -+ NAMES OpenCL/cl.h CL/cl.h -+ PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 -+ PATHS ${OPENCL_DIR} -+ DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" - ) - --if( NOT OPENCL_DIR ) -- find_path(OPENCL_INCLUDE_DIR -- NAMES OpenCL/cl.h CL/cl.h -- PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 -- PATHS /opt/rocm -- DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" -- ) -- -- if( NOT OPENCL_INCLUDE_DIR ) -- unset(OPENCL_INCLUDE_DIR CACHE) -- set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) -- endif() -- message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") -+if( NOT OPENCL_INCLUDE_DIR ) -+ unset(OPENCL_INCLUDE_DIR CACHE) -+ set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) - endif() -+message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") - - - diff --git a/var/spack/repos/builtin/packages/rocclr/package.py b/var/spack/repos/builtin/packages/rocclr/package.py deleted file mode 100644 index 3c05380171..0000000000 --- a/var/spack/repos/builtin/packages/rocclr/package.py +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2013-2020 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) - - -from spack import * - - -class Rocclr(CMakePackage): - """ROCclr is a virtual device interface that compute runtimes interact - with to different backends such as ROCr or PAL This abstraction allows - runtimes to work on Windows as well as on Linux without much effort.""" - - homepage = "https://github.com/ROCm-Developer-Tools/ROCclr" - - maintainers = ['srekolam', 'arjun-raj-kuppala'] - - def url_for_version(self, version): - # Fix up a typo in the 3.5.0 release. - if version == Version('3.5.0'): - return "https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-3.5.0.tar.gz" - - url = "https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz" - return url.format(version) - - version('3.8.0', sha256='10d8aa6f5af7b51813015da603c4e75edc863c3530793f6ed9769ca345c08ed6') - version('3.7.0', sha256='a49f464bb2eab6317e87e3cc249aba3b2517a34fbdfe50175f0437f69a219adc') - version('3.5.0', sha256='87c1ee9f02b8aa487b628c543f058198767c474cec3d21700596a73c028959e1') - - depends_on('cmake@3:', type='build') - depends_on('mesa~llvm@18.3:', type='link') - depends_on('libelf', type='link', when="@3.7.0:") - depends_on('numactl', type='link', when="@3.7.0:") - for ver in ['3.5.0', '3.7.0', '3.8.0']: - depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) - depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) - depends_on('comgr@' + ver, type='build', when='@' + ver) - - # See: https://github.com/ROCm-Developer-Tools/ROCclr/pull/16 - # In 3.7.0 the find opengl things have changed slightly. - patch('opengl.patch', when='@3.5.0') - - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.5.0.tar.gz', - sha256='511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@3.5.0') - - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.7.0.tar.gz', - sha256='283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@3.7.0') - - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.8.0.tar.gz', - sha256='7f75dd1abf3d771d554b0e7b0a7d915ab5f11a74962c92b013ee044a23c1270a', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@3.8.0') - - @run_after('install') - def deploy_missing_files(self): - if '@3.5.0' in self.spec: - # the amdrocclr_staticTargets.cmake file is generated but not - # installed and when we install it by hand, we have to fix the - # path to the static library libamdrocclr_static.a from build - # dir to prefix lib dir. - cmakefile = join_path(self.build_directory, - 'amdrocclr_staticTargets.cmake') - filter_file(self.build_directory, self.prefix.lib, cmakefile) - install(cmakefile, self.prefix.lib) - else: - path = join_path(self.prefix.lib, - 'cmake/rocclr/ROCclrConfig.cmake') - filter_file(self.build_directory, self.prefix, path) - - def cmake_args(self): - args = [ - '-DUSE_COMGR_LIBRARY=yes', - '-DOPENCL_DIR={0}/opencl-on-vdi'.format(self.stage.source_path) - ] - return args diff --git a/var/spack/repos/builtin/packages/rocgdb/package.py b/var/spack/repos/builtin/packages/rocgdb/package.py deleted file mode 100644 index e0264b914f..0000000000 --- a/var/spack/repos/builtin/packages/rocgdb/package.py +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2013-2020 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) - - -from spack import * - - -class Rocgdb(AutotoolsPackage): - """This is ROCgdb, the ROCm source-level debugger for Linux, - based on GDB, the GNU source-level debugger.""" - - homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb/" - url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-3.7.0.tar.gz" - - maintainers = ['srekolam', 'arjun-raj-kuppala'] - - version('3.7.0', sha256='7a29ef584fd7b6c66bb03aaf8ec2f5a8c758370672a28a4d0d95066e5f6fbdc1') - version('3.5.0', sha256='cf36d956e84c7a5711b71f281a44b0a9708e13e941d8fca0247d01567e7ee7d1') - depends_on('cmake@3:', type='build') - depends_on('texinfo', type='build') - depends_on('bison', type='build') - depends_on('flex', type='build') - depends_on('libunwind', type='build') - depends_on('expat', type='build') - depends_on('python', type='build') - depends_on('zlib', type='link') - for ver in ['3.5.0', '3.7.0']: - depends_on('rocm-dbgapi@' + ver, type='link', when='@' + ver) - depends_on('comgr@' + ver, type='link', when='@' + ver) - - build_directory = 'spack-build' - - def configure_args(self): - # Generic options to compile GCC - options = [ - # Distributor options - '--program-prefix=roc', - '--enable-64-bit-bfd', - '--with-bugurl=https://github.com/ROCm-Developer-Tools/ROCgdb/issues', - '--with-pkgversion=-ROCm', - '--enable-targets=x86_64-linux-gnu,amdgcn-amd-amdhsa', - '--disable-ld', - '--disable-gas', - '--disable-gdbserver', - '--disable-sim', - '--enable-tui', - '--disable-gdbtk', - '--disable-shared', - '--with-expat', - '--with-system-zlib' - '--without-guile', - '--with-babeltrace', - '--with-lzma', - '--with-python', - '--with-rocm-dbgapi={0}'.format(self.spec['rocm-dbgapi'].prefix) - ] - return options diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py new file mode 100644 index 0000000000..0af3beee0b --- /dev/null +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -0,0 +1,61 @@ +# Copyright 2013-2020 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) + + +from spack import * + + +class RocmGdb(AutotoolsPackage): + """This is ROCmgdb, the ROCm source-level debugger for Linux, + based on GDB, the GNU source-level debugger.""" + + homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb/" + url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-3.7.0.tar.gz" + + maintainers = ['srekolam', 'arjun-raj-kuppala'] + + version('3.8.0', sha256='a7c11dc30c952587c616bf7769bad603c3bf80522afc8b73ccda5b78d27bed41') + version('3.7.0', sha256='7a29ef584fd7b6c66bb03aaf8ec2f5a8c758370672a28a4d0d95066e5f6fbdc1') + version('3.5.0', sha256='cf36d956e84c7a5711b71f281a44b0a9708e13e941d8fca0247d01567e7ee7d1') + + depends_on('cmake@3:', type='build') + depends_on('texinfo', type='build') + depends_on('bison', type='build') + depends_on('flex', type='build') + depends_on('libunwind', type='build') + depends_on('expat', type='build') + depends_on('python', type='build') + depends_on('zlib', type='link') + for ver in ['3.5.0', '3.7.0', '3.8.0']: + depends_on('rocm-dbgapi@' + ver, type='link', when='@' + ver) + depends_on('comgr@' + ver, type='link', when='@' + ver) + + build_directory = 'spack-build' + + def configure_args(self): + # Generic options to compile GCC + options = [ + # Distributor options + '--program-prefix=roc', + '--enable-64-bit-bfd', + '--with-bugurl=https://github.com/ROCm-Developer-Tools/ROCgdb/issues', + '--with-pkgversion=-ROCm', + '--enable-targets=x86_64-linux-gnu,amdgcn-amd-amdhsa', + '--disable-ld', + '--disable-gas', + '--disable-gdbserver', + '--disable-sim', + '--enable-tui', + '--disable-gdbtk', + '--disable-shared', + '--with-expat', + '--with-system-zlib' + '--without-guile', + '--with-babeltrace', + '--with-lzma', + '--with-python', + '--with-rocm-dbgapi={0}'.format(self.spec['rocm-dbgapi'].prefix) + ] + return options diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index f677a38091..aad5c4c5fb 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -25,8 +25,10 @@ class RocmOpencl(CMakePackage): depends_on('cmake@3:', type='build') depends_on('mesa~llvm@18.3:', type='link') + depends_on('numactl', type='link', when='@3.7.0') + for ver in ['3.5.0', '3.7.0']: - depends_on('rocclr@' + ver, type='build', when='@' + ver) + depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) @@ -38,7 +40,7 @@ class RocmOpencl(CMakePackage): # all the includes... if name in ('cflags', 'cxxflags'): - rocclr = self.spec['rocclr'].prefix.include + rocclr = self.spec['hip-rocclr'].prefix.include extra_includes = [ 'include', 'compiler/lib', @@ -57,7 +59,8 @@ class RocmOpencl(CMakePackage): args = [ '-DUSE_COMGR_LIBRARY=yes', - '-DROCclr_DIR={0}'.format(self.spec['rocclr'].prefix), - '-DLIBROCclr_STATIC_DIR={0}/lib'.format(self.spec['rocclr'].prefix) + '-DROCclr_DIR={0}'.format(self.spec['hip-rocclr'].prefix), + '-DLIBROCclr_STATIC_DIR={0}/lib'.format + (self.spec['hip-rocclr'].prefix) ] return args diff --git a/var/spack/repos/builtin/packages/rocmvalidationsuite/package.py b/var/spack/repos/builtin/packages/rocmvalidationsuite/package.py index 1ada55e60c..7f927e251d 100644 --- a/var/spack/repos/builtin/packages/rocmvalidationsuite/package.py +++ b/var/spack/repos/builtin/packages/rocmvalidationsuite/package.py @@ -37,7 +37,7 @@ class Rocmvalidationsuite(CMakePackage): depends_on('hip@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) - depends_on('rocclr@' + ver, type='build', when='@' + ver) + depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('rocminfo@' + ver, type='build', when='@' + ver) -- cgit v1.2.3-60-g2f50