saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'snnn/vcpkg2' of https://github.com/microsoft/onnxruntime into snnn/vcpkg2

Browse source
This commit is contained in:
Changming Sun 2025-02-06 16:27:30 -08:00
commit fa6aae9b56
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/external/onnxruntime_external_deps.cmake vendored
View file

@ -119,7 +119,7 @@ onnxruntime_fetchcontent_makeavailable(utf8_range)
include_directories(${utf8_range_SOURCE_DIR})
# Download a protoc binary from Internet if needed
if(NOT ONNX_CUSTOM_PROTOC_EXECUTABLE)
if(NOT ONNX_CUSTOM_PROTOC_EXECUTABLE AND NOT onnxruntime_USE_VCPKG)
# This part of code is only for users' convenience. The code couldn't handle all cases. Users always can manually
# download protoc from Protobuf's Github release page and pass the local path to the ONNX_CUSTOM_PROTOC_EXECUTABLE
# variable.

18
tools/ci_build/github/linux/build_tensorrt_ci.sh
View file

@ -10,17 +10,17 @@ BUILD_ARGS=('--config' 'Release'
'--parallel' '--use_vcpkg' '--use_binskim_compliant_compile_flags'
'--build_wheel'
'--enable_onnx_tests'
'--use_cuda'
"--cuda_version=$SHORT_CUDA_VERSION"
"--cuda_home=/usr/local/cuda-$SHORT_CUDA_VERSION"
"--cudnn_home=/usr/local/cuda-$SHORT_CUDA_VERSION"
"--use_tensorrt" "--tensorrt_home" "/usr"
'--use_cuda'
"--cuda_version=$SHORT_CUDA_VERSION"
"--cuda_home=/usr/local/cuda-$SHORT_CUDA_VERSION"
"--cudnn_home=/usr/local/cuda-$SHORT_CUDA_VERSION"
"--use_tensorrt" "--tensorrt_home" "/usr"
"--enable_pybind"
"--build_java"
"--build_java"
"--cmake_extra_defines"
"CMAKE_CUDA_ARCHITECTURES=75"
"onnxruntime_BUILD_UNIT_TESTS=ON"
"onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS=ON")
"CMAKE_CUDA_ARCHITECTURES=75"
"onnxruntime_BUILD_UNIT_TESTS=ON"
"onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS=ON")
# Parse external args
for arg in "$@"; do