From a3933b87c603cd01242e25370868b773a46dac18 Mon Sep 17 00:00:00 2001 From: Li Yu Date: Tue, 26 Mar 2019 23:41:35 -0700 Subject: [PATCH] Back out "Revert D14613517: [pytorch][PR] Updating onnxtrt submodule to master branch" (#18514) Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/18514 Original commit changeset: d6267ddfc339 Reviewed By: bddppq Differential Revision: D14634476 fbshipit-source-id: 2633b0b4c512d71001e5c20cd79c0c0d7856f942 --- .gitmodules | 2 +- caffe2/contrib/tensorrt/tensorrt_tranformer.cc | 2 +- caffe2/contrib/tensorrt/trt_utils.cc | 2 +- third_party/onnx-tensorrt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 06b3224..05b52b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,7 +57,7 @@ url = https://github.com/onnx/onnx.git [submodule "third_party/onnx-tensorrt"] path = third_party/onnx-tensorrt - url = https://github.com/bddppq/onnx-tensorrt + url = https://github.com/onnx/onnx-tensorrt [submodule "third_party/sleef"] path = third_party/sleef url = https://github.com/zdevito/sleef diff --git a/caffe2/contrib/tensorrt/tensorrt_tranformer.cc b/caffe2/contrib/tensorrt/tensorrt_tranformer.cc index a3789f6..b1d6d79 100644 --- a/caffe2/contrib/tensorrt/tensorrt_tranformer.cc +++ b/caffe2/contrib/tensorrt/tensorrt_tranformer.cc @@ -486,7 +486,7 @@ void TensorRTTransformer::Transform( auto trt_builder = tensorrt::TrtObject(nvinfer1::createInferBuilder(logger)); auto trt_network = tensorrt::TrtObject(trt_builder->createNetwork()); auto importer = - tensorrt::TrtObject(nvonnxparser::createParser(trt_network.get(), logger)); + tensorrt::TrtObject(nvonnxparser::createParser(*trt_network, logger)); // function to tell whether TensorRT supports a given C2 op or not auto supports = diff --git a/caffe2/contrib/tensorrt/trt_utils.cc b/caffe2/contrib/tensorrt/trt_utils.cc index f1efa4e..2c3e6e9 100644 --- a/caffe2/contrib/tensorrt/trt_utils.cc +++ b/caffe2/contrib/tensorrt/trt_utils.cc @@ -13,7 +13,7 @@ std::shared_ptr BuildTrtEngine( auto trt_builder = TrtObject(nvinfer1::createInferBuilder(*logger)); auto trt_network = TrtObject(trt_builder->createNetwork()); auto trt_parser = - TrtObject(nvonnxparser::createParser(trt_network.get(), *logger)); + TrtObject(nvonnxparser::createParser(*trt_network, *logger)); auto status = trt_parser->parse(onnx_model_str.data(), onnx_model_str.size()); if (!status) { const auto num_errors = trt_parser->getNbErrors(); diff --git a/third_party/onnx-tensorrt b/third_party/onnx-tensorrt index 9884f28..cb3d806 160000 --- a/third_party/onnx-tensorrt +++ b/third_party/onnx-tensorrt @@ -1 +1 @@ -Subproject commit 9884f286a236a3b4e3218e4afa17781752e048bd +Subproject commit cb3d8066f20e6bca306454934d09d6abd826264a -- 2.7.4