Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create CMake option onnxruntime_USE_VCPKG #21348

Merged
merged 24 commits into from
Sep 10, 2024
Merged

Create CMake option onnxruntime_USE_VCPKG #21348

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d0e440b
build: support vcpkg in cmake-presets
luncliff Jul 13, 2024
c41c244
use `std::string` for `abseil::raw_hash_map` `find`
luncliff Jul 13, 2024
6223414
fix case mismatch
luncliff Jul 13, 2024
ff97583
use later version of vcpkg
luncliff Jul 13, 2024
fabe7d9
cmake: check option in CUDA provider file
luncliff Jul 13, 2024
4b8bc45
build.py: create --use_vcpkg option and workflow for Windows
luncliff Jul 20, 2024
36919b0
gh-actions: jobs for each vcpkg triplet
luncliff Jul 20, 2024
310aaa6
vcpkg: update manifest
luncliff Jul 21, 2024
6227f5f
cmake: try merge of onnxruntime_external_*.cmake
luncliff Jul 21, 2024
091ea11
python: apply lintrunner suggestions
luncliff Jul 23, 2024
ba5bb5c
ci: update vcpkg-configuration
luncliff Jul 23, 2024
e37f9d6
ci: use vcpkg installed flatc, protoc
luncliff Jul 23, 2024
68920d9
cmake: remove unused parts
luncliff Jul 24, 2024
d97ec19
cmake: use vcpkg 2024.07.12
luncliff Jul 24, 2024
bdee0a9
vcpkg: use abseil 20240722.rc1
luncliff Jul 27, 2024
b39343a
Merge branch 'main' into support/vcpkg
luncliff Jul 27, 2024
cc3bd14
cmake: correct library search in vcpkg
luncliff Aug 4, 2024
779ff2b
cmake: alias Boost::headers to Boost::mp11
luncliff Aug 4, 2024
47551f6
Merge branch 'main' into support/vcpkg
luncliff Aug 4, 2024
2889abf
vcpkg: use eigen3 from vcpkg-registry
luncliff Aug 5, 2024
52154c4
vcpkg: override eigen3 version
luncliff Aug 9, 2024
4faeeee
cmake: fix preset cacheVariables
luncliff Aug 5, 2024
dba1862
vcpkg: use 2024.08.23
luncliff Sep 10, 2024
a67dd2d
vcpkg: remove eigen3, onnx in manifest
luncliff Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/external/onnxruntime_external_deps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,8 @@ if(TARGET ONNX::onnx_proto AND NOT TARGET onnx_proto)
add_library(onnx_proto ALIAS ONNX::onnx_proto)
endif()

if(onnxruntime_USE_VCPKG)
find_package(Eigen3 CONFIG REQUIRED)
find_package(Eigen3 CONFIG)
if(Eigen3_FOUND)
get_target_property(eigen_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
else()
include(eigen) # FetchContent
Expand Down
15 changes: 2 additions & 13 deletions cmake/vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,7 @@
"default-registry": {
"kind": "git",
"repository": "https://github.com/Microsoft/vcpkg",
"baseline": "1de2026f28ead93ff1773e6e680387643e914ea1"
"baseline": "3508985146f1b1d248c67ead13f8f54be5b4f5da"
snnn marked this conversation as resolved.
Show resolved Hide resolved
},
"registries": [
{
"repository": "https://github.com/luncliff/vcpkg-registry",
"kind": "git",
"packages": [
"abseil",
"eigen3",
"onnx"
],
"baseline": "8f14a82699eb749ea5c03b40c644810b703357cd"
}
]
"registries": []
}
15 changes: 2 additions & 13 deletions cmake/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://github.com/raw/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "onnxruntime",
"version-date": "2024-07-21",
"version-date": "2024-09-10",
"description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator",
"homepage": "https://onnxruntime.ai/",
"license": "MIT",
Expand All @@ -19,7 +19,6 @@
"cxxopts",
"date",
"dlpack",
"eigen3",
{
"name": "flatbuffers",
"host": true,
Expand All @@ -40,10 +39,6 @@
"platform": "!windows",
"version>=": "1.26.0"
},
{
"name": "onnx",
"version>=": "1.16.0"
},
"optional-lite",
{
"name": "protobuf",
Expand Down Expand Up @@ -79,11 +74,5 @@
"gtest"
]
}
},
"overrides": [
{
"name": "eigen3",
"version": "2024-01-16"
}
]
}
}
Loading