From 73a65dc370cd97ef48824086f94cdde3854eab46 Mon Sep 17 00:00:00 2001 From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com> Date: Mon, 2 Aug 2021 11:16:47 -0700 Subject: [PATCH] modfiy hip-rocclr references for 4.1.0 and 4.2.0 releases (#24868) --- .../repos/builtin/packages/hipcub/package.py | 3 -- .../repos/builtin/packages/hipfft/package.py | 1 - .../builtin/packages/hipsparse/package.py | 3 -- .../builtin/packages/miopen-opencl/package.py | 3 -- .../repos/builtin/packages/rccl/package.py | 3 -- .../builtin/packages/rocalution/package.py | 3 -- .../repos/builtin/packages/rocblas/package.py | 3 -- .../repos/builtin/packages/rocfft/package.py | 3 -- .../packages/rocm-opencl-runtime/package.py | 52 ------------------- .../builtin/packages/rocm-tensile/package.py | 3 -- .../repos/builtin/packages/rocprim/package.py | 3 -- .../repos/builtin/packages/rocrand/package.py | 2 +- .../builtin/packages/rocsparse/package.py | 3 -- .../builtin/packages/rocthrust/package.py | 3 -- 14 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index 33c593b844..8178e3d93f 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -35,9 +35,6 @@ class Hipcub(CMakePackage): depends_on('rocprim@' + ver, when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index f5da6e596f..addb29aec9 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -30,7 +30,6 @@ class Hipfft(CMakePackage): for ver in ['4.1.0', '4.2.0']: depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) - depends_on('hip-rocclr@' + ver, when='@' + ver) depends_on('rocfft@' + ver, when='@' + ver) def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index efd4ef4f3f..341569921b 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -37,9 +37,6 @@ class Hipsparse(CMakePackage): for ver in ['3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0']: depends_on('rocprim@' + ver, when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - patch('e79985dccde22d826aceb3badfc643a3227979d2.patch', when='@3.5.0') patch('530047af4a0f437dafc02f76b3a17e3b1536c7ec.patch', when='@3.5.0') diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py index 1e095d5d2a..66f9b87ccd 100644 --- a/var/spack/repos/builtin/packages/miopen-opencl/package.py +++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py @@ -45,9 +45,6 @@ class MiopenOpencl(CMakePackage): '4.2.0']: depends_on('miopengemm@' + ver, when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - def cmake_args(self): args = [ self.define('MIOPEN_BACKEND', 'OpenCL'), diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index 60e9d6e67e..2c973cd8ed 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -40,9 +40,6 @@ class Rccl(CMakePackage): for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0']: depends_on('numactl@2:', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index fa4a1251de..2517847d41 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -44,9 +44,6 @@ class Rocalution(CMakePackage): for ver in ['3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0']: depends_on('rocrand@' + ver, when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - patch('0001-fix-hip-build-error.patch') def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index 3d4e28e3df..b2a6ccb094 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -44,9 +44,6 @@ class Rocblas(CMakePackage): for ver in ['4.0.0', '4.1.0', '4.2.0']: depends_on('rocm-smi-lib@' + ver, type='build', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - # This is the default library format since 3.7.0 depends_on('msgpack-c@3:', when='@3.7:') diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index 2e8ea5851b..eb4ac7c464 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -42,9 +42,6 @@ class Rocfft(CMakePackage): depends_on('hip@' + ver, when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py b/var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py deleted file mode 100644 index feed408897..0000000000 --- a/var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2013-2021 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 RocmOpenclRuntime(CMakePackage): - """ROCm OpenCL 2.0 compatible language runtime. - It Supports offline and in-process/in-memory compilation""" - - homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" - git = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git" - url = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.1.0.tar.gz" - - maintainers = ['srekolam', 'arjun-raj-kuppala'] - - version('master', branch='main') - version('4.1.0', sha256='0729e6c2adf1e3cf649dc6e679f9cb936f4f423f4954ad9852857c0a53ef799c') - version('4.0.0', sha256='d43ea5898c6b9e730b5efabe8367cc136a9260afeac5d0fe85b481d625dd7df1') - version('3.10.0', sha256='3aa9dc5a5f570320b04b35ee129ce9ff21062d2770df934c6c307913f975e93d') - version('3.9.0', sha256='286ff64304905384ce524cd8794c28aee216befd6c9267d4187a12e5a21e2daf') - version('3.8.0', sha256='7f75dd1abf3d771d554b0e7b0a7d915ab5f11a74962c92b013ee044a23c1270a') - version('3.7.0', sha256='283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b') - - depends_on('cmake@3:', type='build') - depends_on('mesa18~llvm@18.3: swr=none', type='link') - depends_on('libelf', type='link', when="@3.7.0:3.8.0") - depends_on('numactl', type='link', when="@3.7.0:") - - for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', 'master']: - depends_on('hsakmt-roct@' + ver, when='@' + ver) - depends_on('hsa-rocr-dev@' + ver, when='@' + ver) - depends_on('comgr@' + ver, when='@' + ver) - depends_on('hip-rocclr@' + ver, when='@' + ver) - - def flag_handler(self, name, flags): - if name == 'cxxflags' and '@3.7.0:' in self.spec: - incl = self.spec['hip-rocclr'].prefix.include - flags.append('-I {0}/compiler/lib/include'.format(incl)) - flags.append('-I {0}/elf'.format(incl)) - - return (flags, None, None) - - def cmake_args(self): - args = [ - '-DUSE_COMGR_LIBRARY=yes' - ] - - return args diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 619cd1a60c..a3dec71ead 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -50,9 +50,6 @@ class RocmTensile(CMakePackage): for ver in ['4.0.0', '4.1.0', '4.2.0']: depends_on('rocm-smi-lib@' + ver, type='build', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - root_cmakelists_dir = 'Tensile/Source' # Status: https://github.com/ROCmSoftwarePlatform/Tensile/commit/a488f7dadba34f84b9658ba92ce9ec5a0615a087 # Not yet landed in 3.7.0, nor 3.8.0. diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 55f8292d13..ba84bdec23 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -37,9 +37,6 @@ class Rocprim(CMakePackage): depends_on('llvm-amdgpu@' + ver, when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) - def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index 68e80830cf..b150f3dcd3 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -40,7 +40,7 @@ class Rocrand(CMakePackage): depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, type='link', when='@' + ver) + depends_on('hip-rocclr@' + ver, when='@' + ver) def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index 711673dee2..fc3246984d 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -36,8 +36,5 @@ class Rocsparse(CMakePackage): depends_on('rocprim@' + ver, when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 70e16ec8b6..41e7d66399 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -39,9 +39,6 @@ class Rocthrust(CMakePackage): depends_on('rocprim@' + ver, when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) - for ver in ['4.1.0', '4.2.0']: - depends_on('hip-rocclr@' + ver, when='@' + ver) - def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc)