diff --git a/.gitmodules b/.gitmodules index 193f1dda73..986e2538a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,5 +61,4 @@ url = https://github.com/google/libprotobuf-mutator.git [submodule "cmake/external/onnx-tensorrt"] path = cmake/external/onnx-tensorrt - url = https://github.com/stevenlix/onnx-tensorrt.git - branch = trt71 + url = https://github.com/onnx/onnx-tensorrt.git diff --git a/cmake/external/onnx-tensorrt b/cmake/external/onnx-tensorrt index 9d962f4510..088554a5fb 160000 --- a/cmake/external/onnx-tensorrt +++ b/cmake/external/onnx-tensorrt @@ -1 +1 @@ -Subproject commit 9d962f4510102e296944b9be046047a953be0ee1 +Subproject commit 088554a5fbee9ba183c05c09c1abe986034e9208 diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index 7ff17f4611..9172f8851a 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -422,6 +422,7 @@ if (onnxruntime_USE_TENSORRT) set_property(TARGET onnxruntime_providers_tensorrt APPEND_STRING PROPERTY LINK_FLAGS "-Xlinker -exported_symbols_list ${ONNXRUNTIME_ROOT}/core/providers/tensorrt/exported_symbols.lst") target_link_libraries(onnxruntime_providers_tensorrt PRIVATE nsync_cpp) elseif(UNIX) + set_property(TARGET onnxruntime_providers_tensorrt APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-deprecated-declarations") set_property(TARGET onnxruntime_providers_tensorrt APPEND_STRING PROPERTY LINK_FLAGS "-Xlinker --version-script=${ONNXRUNTIME_ROOT}/core/providers/tensorrt/version_script.lds -Xlinker --gc-sections") target_link_libraries(onnxruntime_providers_tensorrt PRIVATE nsync_cpp stdc++fs) elseif(WIN32) diff --git a/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc b/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc index 753e3039bc..f9f25308be 100644 --- a/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc +++ b/onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc @@ -272,7 +272,7 @@ bool FindCycleHelper(int i, const std::list* adjacency_map, } std::unique_ptr TensorrtExecutionProvider::GetSubGraph(SubGraph_t graph_nodes_index, int& kernels_index, const onnxruntime::Provider_GraphViewer& graph) const { - const std::vector& node_index = graph.GetNodesInTopologicalOrder(); + const std::vector& node_index = graph.GetNodesInTopologicalOrder(); std::unordered_set node_set; node_set.reserve(graph_nodes_index.first.size()); for (const auto& index : graph_nodes_index.first) { @@ -915,11 +915,11 @@ common::Status TensorrtExecutionProvider::Provider_Compile(const std::vector(input_tensor), shape_size * sizeof(int32_t), cudaMemcpyDeviceToHost); + CUDA_RETURN_IF_ERROR(cudaMemcpy(input, ort.GetTensorData(input_tensor), shape_size * sizeof(int32_t), cudaMemcpyDeviceToHost)); for (int j = 0; j < shape_size; ++j) { tensor_shape_values[input_name][j] = input[j]; } @@ -928,7 +928,7 @@ common::Status TensorrtExecutionProvider::Provider_Compile(const std::vector(input_tensor), shape_size * sizeof(int64_t), cudaMemcpyDeviceToHost); + CUDA_RETURN_IF_ERROR(cudaMemcpy(input, ort.GetTensorData(input_tensor), shape_size * sizeof(int64_t), cudaMemcpyDeviceToHost)); for (int j = 0; j < shape_size; ++j) { tensor_shape_values[input_name][j] = static_cast(input[j]); } @@ -1333,4 +1333,4 @@ common::Status TensorrtExecutionProvider::Provider_Compile(const std::vector