6 Commits

Author SHA1 Message Date
Park DongHa
d8c61f7fbf
[libtorch] create a new port (#17199)
* [onnx] feature: foxi

* https://github.com/houseroad/foxi
    * install the project's copyright (MIT)
* pytorch requires `foxi_loader`

The CMake target will be renamed to `onnxifi_*` for convenience.

* [onnx] force onnx/onnx_proto static in Windows

Checked the protject's CI logs.  It turned out onnx/onnx_proto are ALWAYS static.
Specify it in CMakeLists.txt because vcpkg configures `BUILD_SHARED_LIBS=ON`
If the triplet requires it.

There are no `ONNXIFI_ENABLE_EXT=ON` case.
Removed the misused build options in portfile.

Add port feature `protobuf-lite` which is in build option.

* [onnx] support windows static triplets

* remove SHARED for `onnxifi_wrapper` and `onnxifi_dummy`

* [onnx] fix wrong LICENSE install

* [onnx] remove feature 'foxi'

* also remove redundant part in patch files

* [libtorch] rework patch files

* [libtorch] config fixup ATen, Torch

* use `link_libraries` to vcpkg installed folder
  * future work may use library names without `find_library`
* update versions JSON to use `version-semver`

* [libtorch] make shared only

* Caffe2 is exported when BUILD_SHARED_LIBS

* [libtorch] remove headers after install

* [libtorch] rewrite patches and feature options

* checked osx / linux build

* [libtorch] use eigen3 always

* Caffe2 eigen_utils.h requires it

* [libtorch] error if BLAS feature collision

* [libtorch] remove !static

* [libtorch] replace vcpkg_find_acquire_program

* let's see python3 from find_program supports

* Dependency python3

* [libtorch] migrate works from luncliff/vcpkg-registry

* Update target version and dependencies
* Removed unsupported features

* [libtorch] misc fix, update version, baseline

* fix merge confict for 'onnx'

* [libtorch] install pip packages

* typing-extensions, pyyaml

* [libtorch] turn off Metal options

* [onnx] revert 'onnx' changes

* [libtorch] refine patches

* [libtorch] link with foxi_loader

* removed wrong onnx related source changes

* [libtorch] update git-tree

* [libtorch] reduce patch size

* [libtorch] find numa and activate USE_NUMA

* Update ports/libtorch/portfile.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* Update ports/libtorch/portfile.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* Update ports/libtorch/portfile.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* [libtorch] fix mistype and update version JSON

* Add double quotes

* version

* Fix support expression

* version

* [libtorch] update cpuinfo usage

* https://github.com/microsoft/vcpkg/pull/23944
* update version

* [tensorpipe] fix linux install

* find_package(Tensorpipe) may fail because of case mismatch

* [tensorpipe] update versions JSON

* [libtorch] fix feature failures

* [libtorch] remove CUDA feature

* [libtorch] giveup 'fbgemm' feature

* [libtorch] use mpi, openmpi in Linux

* [libtorch] fix glog link error

* [tensorpipe] bump port version

* see https://github.com/microsoft/vcpkg/pull/23569

* [libtorch] fix patch list

* [libtorch] use official libuv config

* see https://github.com/microsoft/vcpkg/pull/24745

* Update ports/libtorch/portfile.cmake

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

* Update ports/libtorch/portfile.cmake

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

* update versions JSON

* revert unnecessary 'nnpack' changes

* Update ports/libtorch/portfile.cmake

Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>

* [libtorch] use vcpkg-get-python-packages

* [libtorch] provide path of python3

* Update ports/libtorch/portfile.cmake

Co-authored-by: Billy O'Neal <bion@microsoft.com>

* Fix version database.

* [libtorch] use openmpi in linux/osx

* [libtorch] update to v1.12.1

* [libtorch] find_program(python3, python)

* [libtorch] provide PYTHON_EXECUTABLE directly

* [xnnpack] update to 2022-02-17

* [xnnpack] use C11, C++11

* [libtorch] more patches, DISABLE_PARALLEL_CONFIGURE

* [libtorch] allow static torch_cpu build

* Revert "[libtorch] allow static torch_cpu build"

This reverts commit 5fd4ef0bbe4f56d5c027494c7c571a4f13b37b25.

* [libtorch] find_package(BLAS)

* [libtorch] simplify Python3, NumPy option use

* [libtorch] fix install in Windows

* [libtorch] exclude torch_global_deps in Windows

* [libtorch] platform of nnpack feature

* [libtorch] fix MPI option in Windows

* [libtorch] fixing LNK1161

* [libtorch] fix some mistypes

* [libtorch] define NOMINMAX for c10

* [libtorch] disable vulkan feature in Windows

* ci.baseline.txt: allow libtorch failure

* fails with Visual Studio 2022 17.4.2
* requires 17.4.3+

* Enable testing port on Windows

* [caffe2] redirect to libtorch

* update baseline

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
2023-01-18 11:06:34 -08:00
Jia Yue Hua
078f136afc
[glog] upgrade to v0.6 (#25312)
* glog upgrade

* tmp

* is glog initialized

* fix glog dependency

* fix glog dependency

* fix folly abort call

* delete buildtrees

* fix folly abort call

* delete useless lines

* fix caffe2 isglog initialized

* make patches shorter

* glog fix typo

* glog fix tab

* Remove cpp patch since we don't need it

* Revert 6b8759a860d5307a9ae31247eff3bce48f56aeaf

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-06-23 15:29:07 -07:00
yuehua.jia
6f706ab611
[glog] update to v0.5 (#22135)
* [abseil] Upgrade to 2021.1102

* revert portfile.cmake

* update version

* update portfile.cmake

* update version

* [s2geometry] google s2 for for manipulating geometric shapes

* [libevent] no absolute paths (#21179)

* [Pcre2] Check if files exists before call vcpkg_replace_string. (#22003)

* Check if files exists before call vcpkg_replace_string.

* Update per comments.

Only guard debug.

* Update ports/pcre2/portfile.cmake

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

* Bump port-version.

Co-authored-by: GLUD Lars <lars.glud@leica-geosystems.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [lodepng] Fix cannot open include file "lodepng.h" (#22007)

* [lodepng] Fix cannot open include file "lodepng.h"

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>

* [MyGUI] update to 3.4.1 (#22015)

* [MyGUI] update to 3.4.1

* update version

* [s2n] Update, add openssl dependency (#21484)

* Update to 1.3.0, add openssl dependency

* Add 'tests' feature

* Update versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* Libpq update and VCPKG_OSX_SYSROOT fix (#21583)

* [libpq] Update to 12.9

* [libpq] Use VCPKG_OSX_SYSROOT if set

otherwise configure set the default sysroot in addition, ignoring the
sysroot set by vcpkg_configure_cmake.

* [libpq] remove comment only chunks from patches

* [libpq] update version registry

* [qhttpengine] New port (#22009)

* [qhttpengine] New port

* Update version database

* Fix the format of portfile.cmake

* Fix the format of portfile.cmake

* update version

* Remove duplicate build_shared_libs setting.

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [ xtensor-io ] Fix wrong hash (#22018)

* [xtensor-io] Fix wrong hash

* update version

* [vcpkg] Update VMs for December 2021 Patch Tuesday (#22013)

* Add Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools to VS as requested by https://github.com/microsoft/vcpkg/issues/19554

* Cherry pick python changes from https://github.com/microsoft/vcpkg/pull/21912

* Update linux pool.

* Update windows pool.

* [starlink] Veggiesaurus/starlink ast cminpack fix (#20559)

* add CMINPACK_NO_DLL flag back

* bump port version

* updated versions JSON

* quotation mark adjustment

* git-tree update

* adjusted c flags configuration

* hash update

* whitespace fix

* git-tree hash update

* updated to ast 9.2.5, added external-cminpack flag

* updated version hash

* removed old version entry

* removed $schema element from json

* updated port git-tree hash

* [libunifex] Update to 2021-12-07 (#21995)

* updated libunifex version

* remove comment

* run x-add-versions --all

* Update ports/libunifex/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* rerun x-add-version libunifex

* Update versions/l-/libunifex.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* update libunifex to 12-07

* x-add-version

* libunifex port update

force cpp20 as cpp17 build doesn't work with msvc. added a compile fix for externConstexpr and removed warnings with /EHsc

* Update libunifex.json

version update

* Update fix-compile-error.patch

relax clang warnings

* Update libunifex.json

git x-add-version libunifex

* remove unused

* x-add-versions

* remove old version log

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [tensorflow] update to 2.7, including bazel latest 4.x update (#22022)

* Revert "incorporate changes from microsoft:master"

* Revert "Revert "incorporate changes from microsoft:master""

* update tensorflow to 2.7 and bazel to latest 4.x

* Update version database.

Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [hiredis] Fix static build (#22038)

* [hiredis] Fix static build

* Update version database

* [vcpkg baseline] Fix mpg123 build failed on Linux (#22028)

* [baseline] Fix mpg123 build failed on Linux

* update version

* Fix misspelled "module".

* Actually fix the misspelling this time Bill.

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [qt5-base] no _debug lib suffixes on macOS (#14225) (#21695)

* [qt5-base] no _debug lib suffixes on macOS (#14225)

* [qt5-base] patch qt5-base to remove _debug postfix on osx

* Apply suggestions from code review

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [qt5-base] create link to _debug.pc file from .pc file without _debug

* update version

* [qt5-base] create forward pkgconfig file

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [python3] Support arm (#21528)

* [python3] Support arm on non Windows

* Support arm on all platform, add host dependency

* version

* [pybind11] Add supports

* version

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

* [openmvg] update to 2.0 (#22020)

* [openmvg] update to 2.0

* update version

* update patch

* update version

* [brynet] Update to 1.11.1 (#22021)

* brynet: upgrade to 1.11.1

* Update portfile.cmake

* Update brynet.json

* [graphicsmagick] update to version 1.3.37 (#22024)

* [graphicsmagick] update to version 1.3.37

* [graphicsmagick] manifest format

* [graphicsmagick] version database update

* [graphicsmagick] version-string -> version

* [graphicsmagick] version database update

* [meson] fix windows linker detection (#22032)

* fix meson linker detection .....

* bit of code cleanup in vcpkg_configure_meson

* forgot the version stuff

* put cmake back on path because meson is buggy as hell

* [libgpg-error] Release-only build support (#22036)

* [libgpg-error] Release-only build support

* Update version database

* Fix protfile spaces

* Update version database

* [elfutils] provide static or shared libraries correctly (#22055)

The logic for keeping the static or shared libraries according to
VCPKG_LIBRARY_LINKAGE was backwards, and it was providing shared
libraries when they should have been static, and vice versa.

* [gl3w] Use khrplatform.h from the egl-registry port (#22056)

* [gl3w] use khrplatform.h from the egl-registry port

The file was changed yesterday, invalidating the hash: KhronosGroup/EGL-Registry@57b4876de0.

* [gl3w] migrate to new functions from vcpkg-cmake{,-config}

* [gl3w] bump port version

* [caf] Update to 0.18.5 (#22046)

* [caf] Update to 0.18.5

* Remove setting of BUILD_SHARED_LIBS already handled by vcpkg_cmake_configure.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [gmsh] Add new port (#21896)

* add: gmsh

* add: versioning for gmsh.

* [gmsh] Re-factory code

* Fix install, remove some features due to lack required dependencies.

* version

* Do not support uwp officially

* version

* Update ports/gmsh/portfile.cmake

* Update versions/g-/gmsh.json

* Group the options

* version

* version

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

* [kf5] upgrade to 5.89 (#21890)

* [kf5*] Update to 5.89

* [kf5*] Update versions

* [kf5kio] update tag to rc2

* [kf5kio] update versions

* [kf5*] final 5.89 released

* [kf5*] update versions

* Clean up trailing whitespace and add quotes when naming .clang-format.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [ompl] Add vcpkg_check_linkage (#21659)

* [ompl] Add vcpkg_check_linkage

* version

* version

* [pcl] Add feature apps, visualization, simulation, examples and add usage (#21788)

* [pcl] Add feature apps, visualization and examples

* version

* Add simulation

* Enable more apps, install examples, add usage

* format manifest file

* version

* set feature vtk as a alias for feature visualization

* version

* [activemq-cpp] Added missing libuuid dependency (#22059)

This is a mandatory dependency according to
https://github.com/apache/activemq-cpp/blob/master/README.txt

* [optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algorithm for C++ (#22025)

* [optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algorithm for C++

* Changed reference

* Update version database

* Fix hash

* Update version database

* Review changes and update lib version

* fixver

* Update version database

* Update version database 2

* Fix vcpkg deps

* Update version database

* [tensorflow-common] remove single quotes from vcpkg flags (#21869)

* [vcpkg_acquire_msys] Update bzip2 to 1.0.8-2

* [tensorflow-common] remove single quotes from vcpkg flags

They are escaped like '\'-mtune=native\''  which leads to a compiler error:
cc: error: unrecognized command line option '-mtune=native'
Set via: set(VCPKG_CXX_FLAGS "-mtune=native")

* [sdl2-mixer] Fix link mpg123 error (#22049)

* [sdl2-mixer] Fix link mpg123 error

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>

* [glog]: update to v0.5

* [glog]: update to v0.5

* [glog]: update to v0.5.0

* [glog] update to version 0.5

* [glog]: update to v0.5.0

* [glog]: update to v0.5.0

* [glog] : update to v0.5.0

* [glog] update to v0.5.0

* [glog] fix log_every_n

* [rsocket]:fix ERROR macro

* add license

* update version

* Revert "[rsocket]:fix ERROR macro"

This reverts commit eb5f21325a7a14e0f9a9f8ba5764df4566ce1a98.

* [glog]: v0.5 nogdi macro

* [glog]: remove IN OUT macro

* [glog] v0.5

* --amend

* [caffe2] undefinde IN OUT macro

* [glog]: v0.5

* Format portfile.cmake and add license

* update version

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com>
Co-authored-by: Lars Glud <larshg@gmail.com>
Co-authored-by: GLUD Lars <lars.glud@leica-geosystems.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
Co-authored-by: Vitaly <v31337@gmail.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Angus Comrie <accomrie@gmail.com>
Co-authored-by: Li Zeyang <a.banknote@gmail.com>
Co-authored-by: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com>
Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: IronsDu <irons.du@gmail.com>
Co-authored-by: Josue Andrade Gomes <josuegomes@gmail.com>
Co-authored-by: Clayton Wheeler <cswheeler@gmail.com>
Co-authored-by: Christian Fillion <cfillion@users.noreply.github.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: X.ZhaoMa <ma@arch.ethz.ch>
Co-authored-by: Dawid Wróbel <me@dawidwrobel.com>
2022-04-08 15:19:47 -07:00
Carlos O'Ryan
b29f8ef37e
[protobuf] upgrade to latest release (v3.18.0) (#20208)
* [protobuf] upgrade to latest release (v3.18.0)

This requires patching OpenCV as it uses a function removed in the
latest version of protobuf (FWIW, upstream OpenCV has a similar patch).

* The arcus port also needs a patch

* The caffe2 port also needs a patch

* The brpc port also needs a patch
2021-09-22 13:09:55 -07: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
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00