Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c531a61

Browse files
ankitm3kvrasparadrianlizarragaminfhong-quicminfhong-quic
authoredApr 30, 2025
Cherry-picks into rel-1.22.0 (microsoft#24580) (#680)
### Description Cherry pick the following into [rel-1.22.0](https://github.com/microsoft/onnxruntime/tree/rel-1.22.0) - (microsoft#24487) - (microsoft#24466) - (microsoft#24493) - (microsoft#24484) - (microsoft#24494) - (microsoft#24489) - (microsoft#24504) - (microsoft#24510) - (microsoft#24456) - (microsoft#24537) - (microsoft#24501) - (microsoft#24519) - (microsoft#24513) - (microsoft#24539) - (microsoft#24514) - (microsoft#24542) - (microsoft#24585) Not added: Planning to cherry pick Cuda Matmulnbits PRs once the fix for failing cuda pipeline is ready - (microsoft#24491) - (microsoft#24509) - (microsoft#24564) --------- Co-authored-by: vraspar <vrajang@outlook.com> Co-authored-by: Adrian Lizarraga <adlizarraga@microsoft.com> Co-authored-by: minfhong-quic <quic_minfhong@quicinc.com> Co-authored-by: minfhong-quic <minfhong-quic@quicinc.com> Co-authored-by: Justin Chu <justinchuby@users.noreply.github.com> Co-authored-by: Prathik Rao <prathik.rao@gmail.com> Co-authored-by: Edward Chen <18449977+edgchen1@users.noreply.github.com> Co-authored-by: Ankan Banerjee <ankan.ban@gmail.com> Co-authored-by: Maximilian Müller <maximilianm@nvidia.com> Co-authored-by: Gaurav Garg <gaugarg@nvidia.com> Co-authored-by: iraut <iraut@nvidia.com> Co-authored-by: Hrishikesh Manohar <hrishikeshm@nvidia.com> Co-authored-by: Maximilian Müller <44298237+gedoensmax@users.noreply.github.com> Co-authored-by: Scott McKay <skottmckay@gmail.com> Co-authored-by: Jiajia Qin <jiajiaqin@microsoft.com> Co-authored-by: kunal-vaishnavi <115581922+kunal-vaishnavi@users.noreply.github.com> Co-authored-by: xhcao <xinghua.cao@intel.com>
1 parent c405425 commit c531a61

File tree

77 files changed

+7610
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+7610
-133
lines changed
 

‎cmake/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ option(onnxruntime_ENABLE_MICROSOFT_INTERNAL "Use this option to enable/disable
107107
option(onnxruntime_USE_VITISAI "Build with Vitis-AI" OFF)
108108
option(onnxruntime_USE_TENSORRT "Build with TensorRT support" OFF)
109109
option(onnxruntime_USE_TENSORRT_BUILTIN_PARSER "Use TensorRT builtin parser" OFF)
110+
option(onnxruntime_USE_NV "Build with TensorRT support" OFF)
110111
option(onnxruntime_ENABLE_LTO "Enable link time optimization" OFF)
111112
option(onnxruntime_CROSS_COMPILING "Cross compiling onnx runtime" OFF)
112113
option(onnxruntime_GCOV_COVERAGE "Compile with options necessary to run code coverage" OFF)
@@ -250,6 +251,7 @@ option(onnxruntime_USE_LOCK_FREE_QUEUE "Build with lock-free task queue for thre
250251
option(onnxruntime_FORCE_GENERIC_ALGORITHMS "Disable optimized arch-specific algorithms. Use only for testing and debugging generic algorithms." OFF)
251252

252253
option(onnxruntime_USE_TENSORRT_INTERFACE "Build ONNXRuntime shared lib which is compatible with TensorRT EP interface" OFF)
254+
option(onnxruntime_USE_NV_INTERFACE "Build ONNXRuntime shared lib which is compatible with NV EP interface" OFF)
253255
option(onnxruntime_USE_CUDA_INTERFACE "Build ONNXRuntime shared lib which is compatible with Cuda EP interface" OFF)
254256
option(onnxruntime_USE_OPENVINO_INTERFACE "Build ONNXRuntime shared lib which is compatible with OpenVINO EP interface" OFF)
255257
option(onnxruntime_USE_VITISAI_INTERFACE "Build ONNXRuntime shared lib which is compatible with Vitis-AI EP interface" OFF)
@@ -946,6 +948,15 @@ if (onnxruntime_USE_TENSORRT_INTERFACE AND (NOT onnxruntime_USE_TENSORRT))
946948
list(APPEND ORT_INTERFACE_FLAGS -DUSE_TENSORRT=1)
947949
endif()
948950

951+
if (onnxruntime_USE_NV)
952+
list(APPEND ORT_PROVIDER_FLAGS -DUSE_NV=1)
953+
list(APPEND ONNXRUNTIME_PROVIDER_NAMES nv_tensorrt_rtx)
954+
endif()
955+
956+
if (onnxruntime_USE_NV_INTERFACE AND (NOT onnxruntime_USE_NV))
957+
list(APPEND ORT_INTERFACE_FLAGS -DUSE_NV=1)
958+
endif()
959+
949960
if (onnxruntime_USE_RKNPU)
950961
list(APPEND ORT_PROVIDER_FLAGS -DUSE_RKNPU=1)
951962
list(APPEND ONNXRUNTIME_PROVIDER_NAMES rknpu)

‎cmake/onnxruntime_framework.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ endif()
6363
if(onnxruntime_ENABLE_INSTRUMENT)
6464
target_compile_definitions(onnxruntime_framework PRIVATE ONNXRUNTIME_ENABLE_INSTRUMENT)
6565
endif()
66-
if(onnxruntime_USE_TENSORRT OR onnxruntime_USE_NCCL)
66+
if(onnxruntime_USE_TENSORRT OR onnxruntime_USE_NCCL OR onnxruntime_USE_NV)
6767
# TODO: for now, core framework depends on CUDA. It should be moved to TensorRT EP
6868
# TODO: provider_bridge_ort.cc should not include nccl.h
6969
target_include_directories(onnxruntime_framework PRIVATE ${ONNXRUNTIME_ROOT} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})

0 commit comments

Comments
 (0)