diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2020-07-28 02:43:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 17:43:23 -0700 |
| commit | f1e7a3f167f9065a59e0c0ddb943a23506d646bd (patch) | |
| tree | b81e89f238b8c3dfb5080220e22f3e28668758ee /ports/cudnn | |
| parent | 458c20e94b9f558b523f187ce403bd062e131cdb (diff) | |
| download | vcpkg-f1e7a3f167f9065a59e0c0ddb943a23506d646bd.tar.gz vcpkg-f1e7a3f167f9065a59e0c0ddb943a23506d646bd.zip | |
[opencv4] update to v4.3 (#11130)
* [opencv4] draft update to v4.3
* restore uwp patch
* fix qt and ipp features
* fix libepoxy and meson on osx
* fix baseline, trigger a full rebuild due to meson tool changes
* remove jpeg feature on windows due to a bug with MSVC
* minor fixes for some features
* ffmpeg x11 lib not required anymore on apple for downstream projects
* small fixes for ogre and qt5
* remove a broken module
* fix installation path
* fix openexr which was broken and regressed opencv downstream projects
* first round of ci passes
* improve compatibility with android toolchain
* [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR
* fix OpenEXR link for downstream projects
* do not install unrequested features
* fix compatibility with newer OpenEXR
* [OpenCV3] update to v3.4.10
* fix openexr on windows, was creating symlinks that broke vcpkg
* fix openexr wrapper
* [openexr] cmake config files are installed into a lowered-case folder
* remove mangled paths trying to fix android setup
* disable dnn on android, fix mangled cmake config paths again
* fix downstream CUDA dependency
* fix compatibility with vs16.6
* remove from baseline ports now passing tests
* [alembic] fixes for new openexr
* fix baseline
* [field3d] fixes for new openexr
* [field3d] improve fixes, windows still unsupported despite what is said upstream
* apply fixes required from review
* add missing field3d patch
* [field3d] disable mpi integration
* [opencv2] remove cublas integration
* [vtk] do not create libharu::libharu target if already existing
* Update ports/opencv4/portfile.cmake
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update ports/opencv3/portfile.cmake
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* improve compatibility with newer CUDNN
* [OpenCV3, OpenCV4] improve compatibility with CUDA 11
* [OpenCV2] improve compatibility with CUDA 11
* [field3d] regenerate patch ignoring space at eol
* [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999)
* [field3d] regenerate patch ignoring space at eol
* [field3d] regenerate patch, again
* [field3d] fixes for windows
* [libass] fix regression
* ci.baseline.txt update
* [CUDA11] use FindCUDA from CMake 3.18 to ease transition later
* re-bump vtk and ffmpeg, which were lost with merges from master
* [OpenCV4] Halide feature is not broken anymore
* [field3d] regenerate hdf5 patch
* [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems...
* merge ci.baseline.txt from master and fix field3d patch
* remove rebuilding
* restore vtk CONTROL file
* update CONTROL files
* Trigger rebuild
* Update ports/freeimage/CONTROL
* Update ports/freeimage/CONTROL
* [opencv3/4] avoid tesseract dependency on uwp builds
* [opencv] add missing module search
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/cudnn')
| -rw-r--r-- | ports/cudnn/CONTROL | 1 | ||||
| -rw-r--r-- | ports/cudnn/FindCUDNN.cmake | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL index 4ab7c941b..a60efc6cf 100644 --- a/ports/cudnn/CONTROL +++ b/ports/cudnn/CONTROL @@ -1,5 +1,6 @@ Source: cudnn Version: 7.6 +Port-Version: 1 Description: NVIDIA's cuDNN deep neural network acceleration library Build-Depends: cuda Supports: (windows|linux)&x64 diff --git a/ports/cudnn/FindCUDNN.cmake b/ports/cudnn/FindCUDNN.cmake index 1b6916577..5dc2e3392 100644 --- a/ports/cudnn/FindCUDNN.cmake +++ b/ports/cudnn/FindCUDNN.cmake @@ -38,6 +38,11 @@ endif() if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) + if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) + endif() string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)" CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}") string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1" |