diff --git a/ports/onnxruntime-gpu/portfile.cmake b/ports/onnxruntime-gpu/portfile.cmake index 666d0f9ca9..ff8a746bb2 100644 --- a/ports/onnxruntime-gpu/portfile.cmake +++ b/ports/onnxruntime-gpu/portfile.cmake @@ -1,102 +1,2 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/microsoft/onnxruntime/releases/download/v${VERSION}/onnxruntime-win-x64-gpu-${VERSION}.zip" - FILENAME "onnxruntime-win-x64-gpu-${VERSION}.zip" - SHA512 9576eafca59fc7f2af9f62d7ee8aa31208ef965d17f3ad71747d5a9a46cdffd6b3958dc945109d82937555df8bb35319ce92925e66ab707f1ca8e7564ecb3ced -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${ARCHIVE}" - NO_REMOVE_ONE_LEVEL -) - -# Download repo for experimental features -vcpkg_from_github( - OUT_SOURCE_PATH REPO_PATH - REPO microsoft/onnxruntime - REF v${VERSION} - SHA512 3bf25e431d175c61953d28b1bf8f6871376684263992451a5b2a66e670768fc66e7027f141c6e3f4d1eddeebeda51f31ea0adf4749e50d99ee89d0a26bec77ce -) - -file(COPY - ${REPO_PATH}/include/onnxruntime/core/session/experimental_onnxruntime_cxx_api.h - ${REPO_PATH}/include/onnxruntime/core/session/experimental_onnxruntime_cxx_inline.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include - ) - -file(MAKE_DIRECTORY - ${CURRENT_PACKAGES_DIR}/include - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/lib - ${CURRENT_PACKAGES_DIR}/debug/bin - ) - -file(COPY - ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/include - DESTINATION ${CURRENT_PACKAGES_DIR} - ) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_cuda.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_cuda.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_cuda.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_cuda.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_shared.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_shared.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_tensorrt.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_tensorrt.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_shared.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_shared.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_tensorrt.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_tensorrt.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_shared.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_shared.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_tensorrt.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_tensorrt.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_cuda.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/lib/onnxruntime_providers_cuda.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -# # Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/onnxruntime-win-x64-gpu-${VERSION}/LICENSE") +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +message(WARNING "${PORT} is deprecated. Please use port onnxruntime instead.") diff --git a/ports/onnxruntime-gpu/vcpkg.json b/ports/onnxruntime-gpu/vcpkg.json index ac545ae04b..6aca47a6ba 100644 --- a/ports/onnxruntime-gpu/vcpkg.json +++ b/ports/onnxruntime-gpu/vcpkg.json @@ -1,8 +1,16 @@ { "name": "onnxruntime-gpu", - "version": "1.19.2", + "version": "1.23.2", "description": "onnxruntime (GPU)", "homepage": "https://github.com/microsoft/onnxruntime", "license": "MIT", - "supports": "windows & !x86 & !uwp & !static & !arm" + "dependencies": [ + { + "name": "onnxruntime", + "features": [ + "cuda", + "tensorrt" + ] + } + ] } diff --git a/ports/onnxruntime/fix-cmake-cuda.patch b/ports/onnxruntime/fix-cmake-cuda.patch new file mode 100644 index 0000000000..30dfe51769 --- /dev/null +++ b/ports/onnxruntime/fix-cmake-cuda.patch @@ -0,0 +1,46 @@ +diff --git a/cmake/external/cuDNN.cmake b/cmake/external/cuDNN.cmake +index b428ccb..9b73acb 100644 +--- a/cmake/external/cuDNN.cmake ++++ b/cmake/external/cuDNN.cmake +@@ -1,3 +1,5 @@ ++find_package(CUDNN REQUIRED) # vcpkg port 'cudnn' ++get_filename_component(cudnn_LIBRARY "${CUDNN_LIBRARY}" ABSOLUTE) + add_library(CUDNN::cudnn_all INTERFACE IMPORTED) + + find_path( +diff --git a/cmake/external/cudnn_frontend.cmake b/cmake/external/cudnn_frontend.cmake +index d89ab0f..c28568f 100644 +--- a/cmake/external/cudnn_frontend.cmake ++++ b/cmake/external/cudnn_frontend.cmake +@@ -1,4 +1,5 @@ +- ++find_package(cudnn_frontend CONFIG REQUIRED) # cudnn-frontend 1.13.0+ ++return() + onnxruntime_fetchcontent_declare( + cudnn_frontend + URL ${DEP_URL_cudnn_frontend} +diff --git a/cmake/onnxruntime_providers_cuda.cmake b/cmake/onnxruntime_providers_cuda.cmake +index 91707c4..243783b 100644 +--- a/cmake/onnxruntime_providers_cuda.cmake ++++ b/cmake/onnxruntime_providers_cuda.cmake +@@ -149,6 +149,9 @@ + onnxruntime_add_shared_library_module(onnxruntime_providers_cuda ${onnxruntime_providers_cuda_all_srcs}) + endif() + ++ if(MSVC) ++ target_compile_options(onnxruntime_providers_cuda PRIVATE $<$:/bigobj>) ++ endif() + if(WIN32) + # FILE_NAME preprocessor definition is used in onnxruntime_providers_cuda.rc + target_compile_definitions(onnxruntime_providers_cuda PRIVATE FILE_NAME=\"onnxruntime_providers_cuda.dll\") +@@ -241,8 +244,8 @@ + ${ABSEIL_LIBS} ${ONNXRUNTIME_PROVIDERS_SHARED} Boost::mp11 safeint_interface) + endif() + +- include(cutlass) +- target_include_directories(${target} PRIVATE ${cutlass_SOURCE_DIR}/include ${cutlass_SOURCE_DIR}/examples ${cutlass_SOURCE_DIR}/tools/util/include) ++ find_package(NvidiaCutlass REQUIRED) ++ target_link_libraries(${target} PRIVATE nvidia::cutlass::cutlass nvidia::cutlass::tools::util) + target_link_libraries(${target} PRIVATE Eigen3::Eigen) + target_include_directories(${target} PRIVATE ${ONNXRUNTIME_ROOT} ${CMAKE_CURRENT_BINARY_DIR} PUBLIC ${CUDAToolkit_INCLUDE_DIRS}) + # ${CMAKE_CURRENT_BINARY_DIR} is so that #include "onnxruntime_config.h" inside tensor_shape.h is found diff --git a/ports/onnxruntime/fix-cmake.patch b/ports/onnxruntime/fix-cmake.patch new file mode 100644 index 0000000000..3939fe6144 --- /dev/null +++ b/ports/onnxruntime/fix-cmake.patch @@ -0,0 +1,37 @@ +diff --git a/cmake/onnxruntime_framework.cmake b/cmake/onnxruntime_framework.cmake +index 15f3105..af6609b 100644 +--- a/cmake/onnxruntime_framework.cmake ++++ b/cmake/onnxruntime_framework.cmake +@@ -122,5 +122,5 @@ else() + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- FRAMEWORK DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() +diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake +index eede60a..07f5f77 100644 +--- a/cmake/external/abseil-cpp.cmake ++++ b/cmake/external/abseil-cpp.cmake +@@ -122,7 +122,7 @@ absl::absl_check + absl::hash_function_defaults + absl::function_ref + absl::city +-absl::low_level_hash ++# absl::low_level_hash # abseil 20250814.1+ + absl::fixed_array + absl::variant + absl::meta +diff --git a/cmake/onnxruntime_webassembly.cmake b/cmake/onnxruntime_webassembly.cmake +index ffe8661..a3e9b4f 100644 +--- a/cmake/onnxruntime_webassembly.cmake ++++ b/cmake/onnxruntime_webassembly.cmake +@@ -94,7 +94,7 @@ if (NOT onnxruntime_ENABLE_WEBASSEMBLY_THREADS) + ) + + # Override re2 compiler options to remove -pthread +- set_property(TARGET re2 PROPERTY COMPILE_OPTIONS ) ++ # set_property(TARGET re2 PROPERTY COMPILE_OPTIONS ) + endif() + + if (NOT onnxruntime_USE_VCPKG) diff --git a/ports/onnxruntime/portfile.cmake b/ports/onnxruntime/portfile.cmake new file mode 100644 index 0000000000..9d8304d3ae --- /dev/null +++ b/ports/onnxruntime/portfile.cmake @@ -0,0 +1,160 @@ +# https://github.com/microsoft/onnxruntime/blob/v1.22.1/tools/python/util/vcpkg_helpers.py +message(WARNING "The port requires 'onnx' port build with CMake option ONNX_DISABLE_STATIC_REGISTRATION=ON") +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + if("framework" IN_LIST FEATURES) + # The Objective-C API requires onnxruntime_BUILD_SHARED_LIB + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/onnxruntime + REF "v${VERSION}" + SHA512 373c51575ada457b8aead5d195a5f3eba62fb747b6370a2a9889fff875c40ea30af8fd49104d58cc86f79247410e829086b0979f37ca8635c6dd34960e9cc424 + PATCHES + fix-cmake.patch # .framework install, external library workarounds(abseil-cpp, eigen3) + fix-cmake-cuda.patch +) + +find_program(PROTOC NAMES protoc PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" REQUIRED NO_DEFAULT_PATH NO_CMAKE_PATH) +message(STATUS "Using protoc: ${PROTOC}") + +find_program(FLATC NAMES flatc PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/flatbuffers" REQUIRED NO_DEFAULT_PATH NO_CMAKE_PATH) +message(STATUS "Using flatc: ${FLATC}") + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON_PATH "${PYTHON3}" PATH) +message(STATUS "Using python3: ${PYTHON3}") + +vcpkg_execute_required_process( + COMMAND "${PYTHON3}" onnxruntime/core/flatbuffers/schema/compile_schema.py --flatc "${FLATC}" + LOGNAME compile_schema_core + WORKING_DIRECTORY "${SOURCE_PATH}" +) +vcpkg_execute_required_process( + COMMAND "${PYTHON3}" onnxruntime/lora/adapter_format/compile_schema.py --flatc "${FLATC}" + LOGNAME compile_schema_lora + WORKING_DIRECTORY "${SOURCE_PATH}" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + python onnxruntime_ENABLE_PYTHON + training onnxruntime_ENABLE_TRAINING + training onnxruntime_ENABLE_TRAINING_APIS + cuda onnxruntime_USE_CUDA + cuda onnxruntime_USE_CUDA_NHWC_OPS + openvino onnxruntime_USE_OPENVINO + tensorrt onnxruntime_USE_TENSORRT + tensorrt onnxruntime_USE_TENSORRT_BUILTIN_PARSER + directml onnxruntime_USE_DML + directml onnxruntime_USE_CUSTOM_DIRECTML + winml onnxruntime_USE_WINML + coreml onnxruntime_USE_COREML + mimalloc onnxruntime_USE_MIMALLOC + valgrind onnxruntime_USE_VALGRIND + xnnpack onnxruntime_USE_XNNPACK + nnapi onnxruntime_USE_NNAPI_BUILTIN + azure onnxruntime_USE_AZURE + test onnxruntime_BUILD_UNIT_TESTS + test onnxruntime_BUILD_BENCHMARKS + test onnxruntime_RUN_ONNX_TESTS + framework onnxruntime_BUILD_APPLE_FRAMEWORK + framework onnxruntime_BUILD_OBJC + nccl onnxruntime_USE_NCCL + INVERTED_FEATURES + cuda onnxruntime_USE_MEMORY_EFFICIENT_ATTENTION +) + +if("cuda" IN_LIST FEATURES) + vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT cuda_toolkit_root) + list(APPEND FEATURE_OPTIONS + "-DCMAKE_CUDA_COMPILER=${NVCC}" + "-DCUDAToolkit_ROOT=${cuda_toolkit_root}" + # "-DCMAKE_CUDA_ARCHITECTURES=native" + # too much warnings about attribute + "-DCMAKE_CUDA_FLAGS=-Xcudafe --diag_suppress=2803 -Wno-deprecated-gpu-targets" + ) +endif() + +if("tensorrt" IN_LIST FEATURES) + if(DEFINED ENV{TENSORRT_HOME}) + set(TENSORRT_HOME "$ENV{TENSORRT_HOME}") + endif() + if(DEFINED TENSORRT_HOME) + message(STATUS "Using TensorRT: ${TENSORRT_HOME}") + list(APPEND FEATURE_OPTIONS "-Donnxruntime_TENSORRT_HOME:PATH=${TENSORRT_HOME}") + else() + message(WARNING "Define TENSORRT_HOME for onnxruntime_TENSORRT_HOME") + endif() +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +# see tools/ci_build/build.py +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cmake" + OPTIONS + ${FEATURE_OPTIONS} + "-DPython_EXECUTABLE:FILEPATH=${PYTHON3}" + "-DProtobuf_PROTOC_EXECUTABLE:FILEPATH=${PROTOC}" + "-DONNX_CUSTOM_PROTOC_EXECUTABLE:FILEPATH=${PROTOC}" + -DBUILD_PKGCONFIG_FILES=ON + -Donnxruntime_BUILD_SHARED_LIB=${BUILD_SHARED} + -Donnxruntime_CROSS_COMPILING=${VCPKG_CROSSCOMPILING} + -Donnxruntime_USE_EXTENSIONS=OFF + -Donnxruntime_USE_NNAPI_BUILTIN=${VCPKG_TARGET_IS_ANDROID} + -Donnxruntime_USE_VCPKG=ON + -Donnxruntime_ENABLE_CPUINFO=ON + -Donnxruntime_ENABLE_MICROSOFT_INTERNAL=OFF + -Donnxruntime_ENABLE_BITCODE=OFF + -Donnxruntime_ENABLE_PYTHON=OFF + -Donnxruntime_ENABLE_EXTERNAL_CUSTOM_OP_SCHEMAS=OFF + -Donnxruntime_ENABLE_MEMORY_PROFILE=OFF + -Donnxruntime_ENABLE_LAZY_TENSOR=OFF + -Donnxruntime_DISABLE_RTTI=OFF + -Donnxruntime_DISABLE_ABSEIL=OFF + # some other customizations ... + --compile-no-warning-as-error + OPTIONS_DEBUG + -Donnxruntime_ENABLE_MEMLEAK_CHECKER=OFF + -Donnxruntime_DEBUG_NODE_INPUTS_OUTPUTS=1 + MAYBE_UNUSED_VARIABLES + Python_EXECUTABLE + onnxruntime_TENSORRT_PLACEHOLDER_BUILDER + onnxruntime_NVCC_THREADS + CMAKE_CUDA_FLAGS + onnxruntime_USE_CUSTOM_DIRECTML +) +if("cuda" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET onnxruntime_providers_cuda LOGFILE_BASE build-cuda) +endif() +if("tensorrt" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET onnxruntime_providers_tensorrt LOGFILE_BASE build-tensorrt) +endif() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/onnxruntime) +vcpkg_fixup_pkgconfig() # pkg_check_modules(libonnxruntime) + +# relocates the onnxruntime_providers_* binaries before vcpkg_copy_pdbs() +function(reolocate_ort_providers) + if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) + # the target is expected to be used without the .lib files + file(GLOB PROVIDE_BINS_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/onnxruntime_providers_*.dll") + file(COPY ${PROVIDE_BINS_DBG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(GLOB PROVIDE_BINS_REL "${CURRENT_PACKAGES_DIR}/lib/onnxruntime_providers_*.dll") + file(COPY ${PROVIDE_BINS_REL} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE ${PROVIDE_BINS_DBG} ${PROVIDE_BINS_REL}) + endif() +endfunction() + +reolocate_ort_providers() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/onnxruntime/vcpkg.json b/ports/onnxruntime/vcpkg.json new file mode 100644 index 0000000000..563db03cec --- /dev/null +++ b/ports/onnxruntime/vcpkg.json @@ -0,0 +1,110 @@ +{ + "name": "onnxruntime", + "version-semver": "1.23.2", + "description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator", + "homepage": "https://github.com/microsoft/onnxruntime", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "abseil", + "version>=": "20250512.1" + }, + { + "name": "boost-config", + "version>=": "1.82.0" + }, + { + "name": "boost-mp11", + "version>=": "1.82.0" + }, + "cpuinfo", + "cxxopts", + "date", + "dlpack", + "eigen3", + { + "name": "flatbuffers", + "host": true, + "version>=": "23.5.26" + }, + { + "name": "flatbuffers", + "version>=": "23.5.26" + }, + "ms-gsl", + "nlohmann-json", + { + "name": "onnx", + "version>=": "1.19.0" + }, + "optional-lite", + { + "name": "protobuf", + "version>=": "3.21.12" + }, + { + "name": "protobuf", + "host": true, + "version>=": "3.21.12" + }, + "re2", + "safeint", + "utf8-range", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "wil", + "platform": "windows" + } + ], + "features": { + "cuda": { + "description": "Build with CUDA support", + "supports": "(x64 & windows & !static) | (x64 & linux)", + "dependencies": [ + "cuda", + "cudnn", + "cudnn-frontend", + "nvidia-cutlass" + ] + }, + "framework": { + "description": "Build a macOS/iOS framework, Objective-C library", + "supports": "osx | ios" + }, + "openvino": { + "description": "Build with OpenVINO support", + "supports": "!(osx | ios | android | emscripten)", + "dependencies": [ + { + "name": "openvino", + "default-features": false, + "features": [ + "cpu", + "gpu", + "onnx" + ] + } + ] + }, + "tensorrt": { + "description": "Build with TensorRT support", + "dependencies": [ + { + "name": "onnxruntime", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b115a43f89..6cb40e875f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -558,6 +558,9 @@ ois:x64-android=fail omniorb:arm-neon-android=fail omniorb:arm64-android=fail omniorb:x64-android=fail +onnxruntime:x64-linux=fail +onnxruntime:x64-windows-release=fail +onnxruntime:x64-windows=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. opencc:x64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 23bc1d5007..7cb68e50a9 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1068,6 +1068,8 @@ onnx-optimizer[pybind11]:x64-linux = cascade onnx-optimizer[pybind11]:x64-windows-static = cascade onnx-optimizer[pybind11]:x64-windows-static-md = cascade onnx-optimizer[pybind11]:x86-windows = cascade +onnxruntime[tensorrt](!((x64 & windows & !static) | (x64 & linux))) = cascade +onnxruntime-gpu = skip openal-soft[pipewire](!linux) = cascade openal-soft[pulseaudio](!linux) = cascade opencascade[vtk,freeimage](uwp) = cascade @@ -1711,6 +1713,7 @@ msdfgen[openmp](osx) = feature-fails # No openmp on osx mygui[tools](osx) = feature-fails # Linker errors undefined symbols. See https://github.com/microsoft/vcpkg/issues/34416 nvtt[cuda](x64 & (linux | windows)) = feature-fails # nvtt getting dated wrt cuda omplapp[opengl](android) = feature-fails # Could NOT find OpenGL (missing: OPENGL_opengl_LIBRARY OPENGL_glx_LIBRARY OPENGL_INCLUDE_DIR) +onnxruntime[tensorrt]((x64 & windows & !static) | (x64 & linux)) = feature-fails # requires TensorRT installation opencv2[ffmpeg](!windows) = feature-fails # ffmpeg5+ is not supported under opencv2. See https://github.com/microsoft/vcpkg/issues/32151 opencv2[python](osx) = feature-fails # requires python2 opencv2[world] = feature-fails # See https://github.com/microsoft/vcpkg/issues/29943 diff --git a/versions/baseline.json b/versions/baseline.json index 8d179e060b..c57b9bd140 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7120,8 +7120,12 @@ "baseline": "0.3.19", "port-version": 2 }, + "onnxruntime": { + "baseline": "1.23.2", + "port-version": 0 + }, "onnxruntime-gpu": { - "baseline": "1.19.2", + "baseline": "1.23.2", "port-version": 0 }, "oof": { @@ -9112,14 +9116,14 @@ "baseline": "1.0.1", "port-version": 1 }, - "slick-object-pool": { - "baseline": "0.1.2", - "port-version": 0 - }, "slick-queue": { "baseline": "1.1.2", "port-version": 0 }, + "slick-object-pool": { + "baseline": "0.1.2", + "port-version": 0 + }, "slikenet": { "baseline": "2021-06-07", "port-version": 3 diff --git a/versions/o-/onnxruntime-gpu.json b/versions/o-/onnxruntime-gpu.json index 25ff2e6d6e..28b7ef91f3 100644 --- a/versions/o-/onnxruntime-gpu.json +++ b/versions/o-/onnxruntime-gpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6c73a3acbfd0fc46509cc140e25bdde24ba595d", + "version": "1.23.2", + "port-version": 0 + }, { "git-tree": "e9ce6c51894e80beece7446b501ef2263578ad29", "version": "1.19.2", diff --git a/versions/o-/onnxruntime.json b/versions/o-/onnxruntime.json new file mode 100644 index 0000000000..50037726b0 --- /dev/null +++ b/versions/o-/onnxruntime.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7391737791bbf21b648ab4e95521f31fdf502d59", + "version-semver": "1.23.2", + "port-version": 0 + } + ] +}