AMD ROCm release 4.2.0: bump up mivisionx version and add gtk option to opencv (#23881)
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
This commit is contained in:
parent
b17046723d
commit
c2901ea14a
@ -13,7 +13,7 @@ class Mivisionx(CMakePackage):
|
||||
|
||||
homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX"
|
||||
git = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git"
|
||||
url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-4.1.0.tar.gz"
|
||||
url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-4.2.0.tar.gz"
|
||||
|
||||
maintainers = ['srekolam', 'arjun-raj-kuppala']
|
||||
|
||||
@ -24,6 +24,7 @@ def url_for_version(self, version):
|
||||
url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-{0}.tar.gz"
|
||||
return url.format(version)
|
||||
|
||||
version('4.2.0', sha256='172857b1b340373ae81ed6aa241559aa781e32250e75c82d7ba3c002930a8a3a')
|
||||
version('4.1.0', sha256='0b431a49807682b9a81adac6a64160a0712ddaa3963e0f05595c93b92be777ea')
|
||||
version('4.0.0', sha256='e09d4890b729740ded056b3974daea84c8eb1fc93714c52bf89f853c2eef1fb5')
|
||||
version('3.10.0', sha256='8a67fae77a05ef60a501e64a572a7bd2ccb9243518b1414112ccd1d1f78d08c8')
|
||||
@ -34,6 +35,13 @@ def url_for_version(self, version):
|
||||
|
||||
variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
|
||||
|
||||
def patch(self):
|
||||
if '@4.2.0' in self.spec:
|
||||
filter_file('${ROCM_PATH}/opencl',
|
||||
self.spec['rocm-opencl'].prefix,
|
||||
'amd_openvx/cmake/FindOpenCL.cmake',
|
||||
string=True)
|
||||
|
||||
def flag_handler(self, name, flags):
|
||||
spec = self.spec
|
||||
protobuf = spec['protobuf'].prefix.include
|
||||
@ -41,19 +49,19 @@ def flag_handler(self, name, flags):
|
||||
flags.append('-I{0}'.format(protobuf))
|
||||
return (flags, None, None)
|
||||
|
||||
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+imgcodecs+imgproc+video+videoio+videostab+flann', type='build')
|
||||
depends_on('cmake@3.5:', type='build')
|
||||
depends_on('ffmpeg@:4', type='build')
|
||||
depends_on('protobuf@:3', type='build')
|
||||
depends_on('opencv@:3.4 +calib3d+core+features2d+highgui+imgcodecs+imgproc+video+videoio+flann+photo+objdetect', 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')
|
||||
depends_on('openssl', type=('build', 'link'), when='@4.0.0:4.1.0')
|
||||
for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0']:
|
||||
depends_on('openssl', type=('build', 'link'), when='@4.0.0:4.2.0')
|
||||
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('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)
|
||||
depends_on('miopen-opencl@' + ver, type='link', when='@' + ver)
|
||||
depends_on('miopen-opencl@' + ver, type=('build', 'link'), when='@' + ver)
|
||||
|
||||
def cmake_args(self):
|
||||
spec = self.spec
|
||||
|
Loading…
Reference in New Issue
Block a user