Commit Graph

16 Commits

Author SHA1 Message Date
Billy O'Neal
68b7fec22e
Update VMs for July 2022 Patch Tuesday, and to Ubuntu 22.04. (#25785)
* Update Ubuntu to 22.04.

* Add libxtst-dev from https://github.com/microsoft/vcpkg/pull/24934

* Add standard prereqs.

* Update some package references for Ubuntu 22.04.

* [cuda] Update to search in /usr/bin as used on Ubuntu 22.04.

* [cudnn] Add where ubuntu 22.04 puts it.

* Add update-nvidia-cudnn calls.

* Update powershell to 7.2.5

* Re-add NCCL installation from CUDA official sources.

* Update pools.
2022-07-15 21:11:16 -07:00
Stefano Sinigardi
e79aaaaf3c
[CUDA, CUDNN] fix support clause (#23900)
* [CUDA, CUDNN] fix support clause

* [cuda] use version key

* [opencv2] format manifest

* fix references

* Update vcpkg.json

* Update vcpkg.json

* Update version database

* Update version database.

* fix feature descriptions

* fix references

* add missing licenses

* fix references

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-04-05 11:50:48 -07:00
Stefano Sinigardi
401578455f
[OpenCV] upgrade to v4.5.5 (#22801)
* [OpenCV4] update to v4.5.5

* [OpenCV] bump version

* [gstreamer] fix build for opencv

* fix references

* [vcpkg-tool-meson] fix nuget packaging

* fix references

* [gstreamer] fix references

* [ogre] update vcpkg tools

* fix references

* [OpenCV4] fixes from CI runs

* fix references

* [OpenCV4] force python module also in debug builds

* fix references

* [harfbuzz] fix cmake config

* harfbuzz fixes

* fix references

* [OpenCV4] remove unnecessary lines from patches

* fix references

* fix references

* [harfbuzz] bump version

* [harfbuzz] fix for single config builds

* fix references

* freetype fixes

* fix references

* fix ogre references

* fix references, again

* python when building static windows opencv libraries is unsupported

* fix references

* fix

* refs

* use required when necessary

* fix references

* do not use config for hdf5, use internal module

* fix references

* use proper spelling for freetype config cmake

* fix references

* [OpenCV] restore versions after merge

* fix references

* [leptonica] fix building

* fix references

* do not require package in optional features

* £fix references

* fix python feat

* update version

* update version

* [ffmpeg] remove opengl feat on arm64-windows

* format manifest

* fix references

* fix cuda/nvidia features compatibility matrix

* fix manifest

* fix

* fix

* fix references

* fix references, again

* move CONTROL to manifest

* [gstreamer] bump versions

* fix references

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2022-02-23 11:57:13 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986)
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
2021-09-09 01:24:04 -07:00
Stefano Sinigardi
e3fee6ed40
[cudnn] auto-download only if cuda version matches (#16413)
* [cudnn] auto-download only if cuda version matches

* [cudnn] auto download also for cuda 10.2

* [cudnn] update version ref

* Update ports/cuda/vcpkg_find_cuda.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/cuda/vcpkg_find_cuda.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/cudnn/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* apply review fixes

* fix baseline refs

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-04-13 15:15:32 -07:00
Jacob Kahn
40b95d4103
[cuda] Add ENV CUDA_HOME to path hints (#14880) 2020-12-04 16:38:44 -08:00
Jacob Kahn
54c63514a6
[nccl] New Port (#14683)
* [nccl] New Port

* Update ports/nccl/portfile.cmake

* Add usage to vcpkg-cmake-wrapper

* Move usage to usage file

* Update ports/nccl/portfile.cmake

* Don't copy debug libraries because they aren't provided

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-11-25 11:35:15 -08:00
Simone Gasparini
91b255887c
[cuda] improve maintainability for the version check (#14033) 2020-10-20 11:21:51 -07:00
ras0219
b7b552d31c
[cuda] Export vcpkg_find_cuda.cmake (#13440)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-10-07 00:25:01 -07:00
Alexander Neumann
513cac2f62
[cuda] correct env variables for newer cuda versions (#12244)
* [cuda] correct env variables for newer cuda versions

* Update ports/cuda/CONTROL

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-07-09 14:20:45 -07:00
Jack·Boos·Yu
164284d86b
[cuda] Fix find cuda in UNIX (#10838)
* [cuda] Fix find cuda in UNIX

* update baseline

* [cuda] Add homepage

* add newline to end of CONTROL

* Update ports/cuda/portfile.cmake

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2020-05-07 12:35:22 -07:00
Stefano Sinigardi
3532a7cf3c [cudnn] add port and enable it in darknet (#7536)
* [cudnn] add port and enable it in darknet
* [OpenCV4] fix ffmpeg feature on uwp
* [darknet] enable integration with cuda/cudnn also with opencv3
* [darknet] update to latest revision
2019-09-24 12:58:38 -07:00
Jason Juang
d5cb490fc0 update cuda requirement to 9.0, fixes #2791 (#2802)
* update cuda requirement to 9.0, fixes #2791

* [cuda] Restore sample version blob
2018-02-15 17:42:35 -08:00
Alexander Karatarakis
fe81139bc0 Update CHANGELOG and bump version to v0.0.79 2017-04-05 15:06:34 -07:00
Robert Schumacher
cc338dcc8c [cuda] Add CUDA_PATH to environment whitelist. 2017-04-05 14:10:01 -07:00
Alexander Karatarakis
d4fa0b34c0 Add CUDA portfile
The intention of this package is for other packages to declare a dependency on CUDA
2017-02-07 17:04:24 -08:00