diff options
| author | arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> | 2021-01-22 09:04:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 18:04:01 +0100 |
| commit | cdb9b10e27cfd725f24ee1dd881809841563693f (patch) | |
| tree | e31746d37b36f1d27f9e97d2f4efede3bf751f96 /var | |
| parent | 2d6fea86d6f5fc4899201252eda7ef010c12746c (diff) | |
| download | spack-cdb9b10e27cfd725f24ee1dd881809841563693f.tar.gz spack-cdb9b10e27cfd725f24ee1dd881809841563693f.tar.bz2 spack-cdb9b10e27cfd725f24ee1dd881809841563693f.tar.xz spack-cdb9b10e27cfd725f24ee1dd881809841563693f.zip | |
Bump up rocm version 4.0.0: rocm-gdb and mivisionx (#21137)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/mivisionx/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rocm-gdb/package.py | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index a87c1cc2f3..ee556ce886 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -23,6 +23,7 @@ class Mivisionx(CMakePackage): url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-{0}.tar.gz" return url.format(version) + version('4.0.0', sha256='e09d4890b729740ded056b3974daea84c8eb1fc93714c52bf89f853c2eef1fb5') version('3.10.0', sha256='8a67fae77a05ef60a501e64a572a7bd2ccb9243518b1414112ccd1d1f78d08c8') version('3.9.0', sha256='892812cc6e6977ed8cd4b69c63f4c17be43b83c78eeafd9549236c17f6eaa2af') version('3.8.0', sha256='4e177a9b5dcae671d6ea9f0686cf5f73fcd1e3feb3c50425c8c6d43ac5d77feb') @@ -40,12 +41,13 @@ class Mivisionx(CMakePackage): depends_on('ffmpeg@4.1.1', type='build') depends_on('protobuf@3.5.0', type='build') - depends_on('opencv@3.4.6 +calib3d+core+features2d+highgui+imgproc+video+videoio+videostab', type='build') + depends_on('opencv@3.4.6 +calib3d+core+features2d+highgui+imgcodecs+imgproc+video+videoio+videostab+flann', type='build') depends_on('rocm-opencl@3.5.0', type='build', when='@1.7') depends_on('rocm-cmake@3.5.0', type='build', when='@1.7') depends_on('miopen-opencl@3.5.0', type=('build', 'run', 'link'), when='@1.7') depends_on('miopengemm@1.1.6', type=('build', 'run', 'link'), when='@1.7') - for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0']: + depends_on('openssl', type=('build', 'link'), when='@4.0.0') + for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0']: depends_on('rocm-opencl@' + ver, type='build', when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('miopengemm@' + ver, type=('build', 'run', 'link'), when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py index 5b3149d01b..9caa5c61a1 100644 --- a/var/spack/repos/builtin/packages/rocm-gdb/package.py +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -16,6 +16,7 @@ class RocmGdb(AutotoolsPackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='b90291b0a8409fe66d8a65d2731dcb87b9f5a22bac9ce3ffbab726eb129ba13d') version('3.10.0', sha256='05455cb47dd42404ee8bba047def6a6846a7e877e7a7db8dcffc7100d5ba16f0') version('3.9.0', sha256='0765c96439c0efa145418d210d865b9faed463466d7522274959cc4476a37097') version('3.8.0', sha256='a7c11dc30c952587c616bf7769bad603c3bf80522afc8b73ccda5b78d27bed41') @@ -27,12 +28,12 @@ class RocmGdb(AutotoolsPackage): 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('expat', type=('build', 'link')) + depends_on('python', type=('build', 'link')) depends_on('zlib', type='link') depends_on('babeltrace@1.2.4', type='link') - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0']: depends_on('rocm-dbgapi@' + ver, type='link', when='@' + ver) depends_on('comgr@' + ver, type='link', when='@' + ver) |