diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-CUDA-11.7.0-contrib.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-CUDA-11.7.0-contrib.eb index 70276c87526..4ca1c26a38c 100644 --- a/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-CUDA-11.7.0-contrib.eb +++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-CUDA-11.7.0-contrib.eb @@ -32,10 +32,13 @@ sources = [ 'extract_cmd': 'cp %s %(builddir)s' }, ] +patches = [('opencv_contrib_python.egg-info', '..')] checksums = [ - '158db5813a891c7eda8644259fc1dbd76b21bd1ffb9854a8b4b8115a4ceec359', # opencv-4.6.0.zip - '588ca44e3c88ccf8e3ff7f46e966e26ff63d72607968ace83b91628d3440f8a3', # opencv_contrib-4.6.0.zip - '08627fa5660d52d59309a572dd7db5b9c8aea234cfa5aee0942a1dd903554246', # ippicv_2020_lnx_intel64_20191018_general.tgz + {'opencv-4.6.0.zip': '158db5813a891c7eda8644259fc1dbd76b21bd1ffb9854a8b4b8115a4ceec359'}, + {'opencv_contrib-4.6.0.zip': '588ca44e3c88ccf8e3ff7f46e966e26ff63d72607968ace83b91628d3440f8a3'}, + {'ippicv_2020_lnx_intel64_20191018_general.tgz': + '08627fa5660d52d59309a572dd7db5b9c8aea234cfa5aee0942a1dd903554246'}, + {'opencv_contrib_python.egg-info': '08eb95c735d4ff82e35e3df56c2e7e75501cc263a8efcb9348d04e6322a4b034'}, ] builddependencies = [ @@ -68,6 +71,7 @@ dependencies = [ # ref: https://github.com/opencv/opencv/blob/6e8daaec0f46aaba9ea22e2afce47307b1dbff9f/cmake/OpenCVUtils.cmake#L861 configopts = " ".join([ "-DOPENCV_EXTRA_MODULES_PATH=%(builddir)s/%(namelower)s_contrib-%(version)s/modules", + "-DOPENCV_GENERATE_PKGCONFIG=ON", "-DFREETYPE_FOUND=ON", "-DFREETYPE_INCLUDE_DIRS=$EBROOTFREETYPE/include/freetype2/", "-DFREETYPE_LIBRARIES=$EBROOTFREETYPE/lib64/libfreetype.so", @@ -82,6 +86,13 @@ configopts = " ".join([ "-DCUDA_NVCC_FLAGS=--std=c++14", ]) +# Install a egg-info file so it is more python friendly +local_egg_info_src = '%(builddir)s/opencv_contrib_python.egg-info' +local_egg_info_dest = '%(installdir)s/lib/python%(pyshortver)s/site-packages/opencv_contrib_python-%(version)s.egg-info' +postinstallcmds = [ + 'sed "s/#OPENCV_VERSION#/%%(version)s/" %s > %s' % (local_egg_info_src, local_egg_info_dest), +] + enhance_sanity_check = True local_contrib_libs = [ diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-contrib.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-contrib.eb index b957c01b7d4..f71431e0f08 100644 --- a/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-contrib.eb +++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-4.6.0-foss-2022a-contrib.eb @@ -31,10 +31,13 @@ sources = [ 'extract_cmd': 'cp %s %(builddir)s' }, ] +patches = [('opencv_contrib_python.egg-info', '..')] checksums = [ - '158db5813a891c7eda8644259fc1dbd76b21bd1ffb9854a8b4b8115a4ceec359', # opencv-4.6.0.zip - '588ca44e3c88ccf8e3ff7f46e966e26ff63d72607968ace83b91628d3440f8a3', # opencv_contrib-4.6.0.zip - '08627fa5660d52d59309a572dd7db5b9c8aea234cfa5aee0942a1dd903554246', # ippicv_2020_lnx_intel64_20191018_general.tgz + {'opencv-4.6.0.zip': '158db5813a891c7eda8644259fc1dbd76b21bd1ffb9854a8b4b8115a4ceec359'}, + {'opencv_contrib-4.6.0.zip': '588ca44e3c88ccf8e3ff7f46e966e26ff63d72607968ace83b91628d3440f8a3'}, + {'ippicv_2020_lnx_intel64_20191018_general.tgz': + '08627fa5660d52d59309a572dd7db5b9c8aea234cfa5aee0942a1dd903554246'}, + {'opencv_contrib_python.egg-info': '08eb95c735d4ff82e35e3df56c2e7e75501cc263a8efcb9348d04e6322a4b034'}, ] builddependencies = [ @@ -65,6 +68,7 @@ dependencies = [ # ref: https://github.com/opencv/opencv/blob/6e8daaec0f46aaba9ea22e2afce47307b1dbff9f/cmake/OpenCVUtils.cmake#L861 configopts = " ".join([ "-DOPENCV_EXTRA_MODULES_PATH=%(builddir)s/%(namelower)s_contrib-%(version)s/modules", + "-DOPENCV_GENERATE_PKGCONFIG=ON", "-DFREETYPE_FOUND=ON", "-DFREETYPE_INCLUDE_DIRS=$EBROOTFREETYPE/include/freetype2/", "-DFREETYPE_LIBRARIES=$EBROOTFREETYPE/lib64/libfreetype.so", @@ -78,6 +82,13 @@ configopts = " ".join([ "-DBUILD_opencv_python2=OFF", ]) +# Install a egg-info file so it is more python friendly +local_egg_info_src = '%(builddir)s/opencv_contrib_python.egg-info' +local_egg_info_dest = '%(installdir)s/lib/python%(pyshortver)s/site-packages/opencv_contrib_python-%(version)s.egg-info' +postinstallcmds = [ + 'sed "s/#OPENCV_VERSION#/%%(version)s/" %s > %s' % (local_egg_info_src, local_egg_info_dest), +] + enhance_sanity_check = True local_contrib_libs = [ @@ -88,7 +99,7 @@ local_contrib_libs = [ ] sanity_check_paths = { - 'files': ['lib64/libopencv_%s.%s' % (s, SHLIB_EXT) for s in local_contrib_libs], + 'files': ['lib64/libopencv_%s.%s' % (x, SHLIB_EXT) for x in local_contrib_libs], 'dirs': [], } diff --git a/easybuild/easyconfigs/o/OpenCV/opencv_contrib_python.egg-info b/easybuild/easyconfigs/o/OpenCV/opencv_contrib_python.egg-info new file mode 100644 index 00000000000..073e127f34d --- /dev/null +++ b/easybuild/easyconfigs/o/OpenCV/opencv_contrib_python.egg-info @@ -0,0 +1,5 @@ +Metadata-Version: 2.1 +Name: opencv-contrib-python +Version: #OPENCV_VERSION# +Summary: Wrapper package for OpenCV python bindings. +Platform: UNKNOWN