Merge pull request #20203 from JoeHowse:clMath-patches
authorJoeHowse <josephhowse@nummist.com>
Mon, 7 Jun 2021 20:24:27 +0000 (17:24 -0300)
committerGitHub <noreply@github.com>
Mon, 7 Jun 2021 20:24:27 +0000 (20:24 +0000)
commit34183237ce3159228a06b8145031753a0d4287cb
treef458440e6c5962b81d50418bebeb0b4a69512779
parent286ec92967907a9b8efc9bc6a86de3700bdf797a
Merge pull request #20203 from JoeHowse:clMath-patches

Fix dynamic loading of clBLAS and clFFT (formerly, clAmdBlas and clAmdFft)

* Fix dynamic loading of clBLAS and clFFT

* Update filenames and function names for clBLAS (formerly, clAmdBlas)

* Update filenames and function names for clFFT (formerly, clAmdFft)

* Uncomment teardown of clFFT; tear down clFFT in same way as clBLAS

* Fix generators for clBLAS and clFFT headers

* Update generators to parse recent clBLAS and clFFT library headers

* Update generators to be compatible with Python 3

* Re-generate OpenCV's clBLAS and clFFT headers

* Update function calls to match names in newly generated headers

* Disable (and comment on) teardown code for clBLAS and clFFT

* Renaming *clamd* files

* Renaming *clamdblas* files to *clblas*

* Renaming *clamdfft* files to *clfft*

* Update generator for CL headers

* Update generator to be compatible with Python 3
28 files changed:
modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp [deleted file]
modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp [deleted file]
modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp [new file with mode: 0644]
modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp [new file with mode: 0644]
modules/core/include/opencv2/core/opencl/runtime/opencl_clblas.hpp [moved from modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp with 98% similarity]
modules/core/include/opencv2/core/opencl/runtime/opencl_clfft.hpp [moved from modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp with 98% similarity]
modules/core/src/dxt.cpp
modules/core/src/intel_gpu_gemm.inl.hpp
modules/core/src/matmul.dispatch.cpp
modules/core/src/ocl.cpp
modules/core/src/opencl/runtime/autogenerated/opencl_clamdblas_impl.hpp [deleted file]
modules/core/src/opencl/runtime/autogenerated/opencl_clamdfft_impl.hpp [deleted file]
modules/core/src/opencl/runtime/autogenerated/opencl_clblas_impl.hpp [new file with mode: 0644]
modules/core/src/opencl/runtime/autogenerated/opencl_clfft_impl.hpp [new file with mode: 0644]
modules/core/src/opencl/runtime/generator/common.py
modules/core/src/opencl/runtime/generator/filter/opencl_clamdblas_functions.list [deleted file]
modules/core/src/opencl/runtime/generator/filter/opencl_clamdfft_functions.list [deleted file]
modules/core/src/opencl/runtime/generator/filter/opencl_clblas_functions.list [new file with mode: 0644]
modules/core/src/opencl/runtime/generator/filter/opencl_clfft_functions.list [new file with mode: 0644]
modules/core/src/opencl/runtime/generator/parser_cl.py
modules/core/src/opencl/runtime/generator/parser_clblas.py [moved from modules/core/src/opencl/runtime/generator/parser_clamdblas.py with 84% similarity]
modules/core/src/opencl/runtime/generator/parser_clfft.py [moved from modules/core/src/opencl/runtime/generator/parser_clamdfft.py with 85% similarity]
modules/core/src/opencl/runtime/generator/template/opencl_clblas.hpp.in [moved from modules/core/src/opencl/runtime/generator/template/opencl_clamdblas.hpp.in with 87% similarity]
modules/core/src/opencl/runtime/generator/template/opencl_clblas_impl.hpp.in [moved from modules/core/src/opencl/runtime/generator/template/opencl_clamdfft_impl.hpp.in with 100% similarity]
modules/core/src/opencl/runtime/generator/template/opencl_clfft.hpp.in [moved from modules/core/src/opencl/runtime/generator/template/opencl_clamdfft.hpp.in with 87% similarity]
modules/core/src/opencl/runtime/generator/template/opencl_clfft_impl.hpp.in [moved from modules/core/src/opencl/runtime/generator/template/opencl_clamdblas_impl.hpp.in with 100% similarity]
modules/core/src/opencl/runtime/opencl_clblas.cpp [moved from modules/core/src/opencl/runtime/opencl_clamdblas.cpp with 92% similarity]
modules/core/src/opencl/runtime/opencl_clfft.cpp [moved from modules/core/src/opencl/runtime/opencl_clamdfft.cpp with 92% similarity]