10.0 Release Updates (#960)

* 10.0 Release Updates

Signed-off-by: Asfiya Baig <asfiyab@nvidia.com>


---------

Signed-off-by: Asfiya Baig <asfiyab@nvidia.com>

Author: asfiyab-nvidia

CMakeLists.txt

@@ -27,8 +27,8 @@ add_definitions("-DSOURCE_LENGTH=${SOURCE_LENGTH}")
 #--------------------------------------------------
 # Version information
 #--------------------------------------------------
-set(ONNX2TRT_MAJOR 9)
-set(ONNX2TRT_MINOR 3)
+set(ONNX2TRT_MAJOR 10)
+set(ONNX2TRT_MINOR 0)
 set(ONNX2TRT_PATCH 0)
 set(ONNX2TRT_VERSION "${ONNX2TRT_MAJOR}.${ONNX2TRT_MINOR}.${ONNX2TRT_PATCH}" CACHE STRING "ONNX2TRT version")
 
@@ -39,10 +39,10 @@ set(ONNX2TRT_VERSION "${ONNX2TRT_MAJOR}.${ONNX2TRT_MINOR}.${ONNX2TRT_PATCH}" CAC
 set(IMPORTER_SOURCES
   NvOnnxParser.cpp
   ModelImporter.cpp
-  builtin_op_importers.cpp
-  builtin_op_static_checkers.cpp
+  ModelRefitter.cpp
+  onnxOpImporters.cpp
   ImporterContext.cpp
-  onnx2trt_utils.cpp
+  importerUtils.cpp
   ShapedWeights.cpp
   ShapeTensor.cpp
   LoopHelpers.cpp
@@ -51,6 +51,11 @@ set(IMPORTER_SOURCES
   onnxErrorRecorder.cpp
   ConditionalHelpers.cpp
   bfloat16.cpp
+  onnxOpCheckers.cpp
+  onnxProtoUtils.cpp
+  weightUtils.cpp
+  WeightsContext.cpp
+  TensorOrWeights.cpp
 )
 
 if (BUILD_ONNXIFI)

ConditionalHelpers.cpp

@@ -4,7 +4,7 @@
 
 #include "ConditionalHelpers.hpp"
 #include "ModelImporter.hpp"
-#include "onnx2trt_utils.hpp"
+#include "importerUtils.hpp"
 #include "toposort.hpp"
 
 namespace onnx2trt
@@ -34,7 +34,7 @@ SubgraphPortsMap::const_iterator findLayer(const SubgraphPortsMap& inputs, const
 
 // Add an ConditionalInputLayer between `layer` and its inputs.
 // I.e. input[inIdx] -> layer ==> input[inIdx] -> ConditionalInputLayer -> layer.
-Status addConditionalInputLayer(IImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
+Status addConditionalInputLayer(ImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
     nvinfer1::ILayer& layer, int32_t inIdx)
 {
     auto input = layer.getInput(inIdx);
@@ -54,27 +54,28 @@ Status addConditionalInputLayer(IImporterContext* ctx, nvinfer1::IIfConditional*
     nvinfer1::IIfConditionalInputLayer* inputLayer = nullptr;
     if (it == inputsMap.end())
     {
-        inputLayer = conditional->addInput(*input);
+        inputLayer = N_CHECK(conditional->addInput(*input));
         inputsMap[name] = inputLayer;
         const std::string inputLayerName(name);
         ctx->registerLayer(inputLayer, inputLayerName + "_InputLayer", nullptr);
         // Note: Since multiple conditionals may use the same external tensor, check unique names for output tensors of
         // IfConditionalInputLayers to avoid tensor name duplication.
         ctx->registerTensor(
-            TensorOrWeights{inputLayer->getOutput(0)}, inputLayerName + "_InputLayer_output", /*checkUniqueName*/ true);
+            TensorOrWeights{N_CHECK(inputLayer->getOutput(0))}, inputLayerName + "_InputLayer_output", /*checkUniqueName*/ true);
     }
     else
     {
         // An InputLayer may in the inputsMap if it has several consumers.
         inputLayer = it->second;
     }
-    layer.setInput(inIdx, *(inputLayer->getOutput(0)));
+    auto ifOutput = N_CHECK(inputLayer->getOutput(0));
+    layer.setInput(inIdx, *ifOutput);
     return Status::success();
 };
 
 // Take a snapshot of the network before and after parsing the subgraph and return a list
 // of newly added network layers.
-Status importSubgraph(IImporterContext* ctx, ::ONNX_NAMESPACE::GraphProto const& subgraph,
+Status importSubgraph(ImporterContext* ctx, ::ONNX_NAMESPACE::GraphProto const& subgraph,
     std::vector<nvinfer1::ILayer*>& newLayers, std::vector<TensorOrWeights>& subgraphTensors)
 {
     auto net = ctx->network();
@@ -84,7 +85,7 @@ Status importSubgraph(IImporterContext* ctx, ::ONNX_NAMESPACE::GraphProto const&
     NameScope nameScope(*ctx);
 
     std::vector<Status> errors{};
-    CHECK(onnx2trt::parseGraph(ctx, subgraph, errors));
+    CHECK_STATUS(onnx2trt::parseGraph(ctx, subgraph, errors));
 
     for (int32_t i = 0; i < subgraph.output_size(); ++i)
     {
@@ -101,7 +102,7 @@ Status importSubgraph(IImporterContext* ctx, ::ONNX_NAMESPACE::GraphProto const&
 }
 
 // Add an IConditionalInputLayer to `layer`'s inputs, if they don't already exist.
-Status addConditionalInputIfNeeded(IImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
+Status addConditionalInputIfNeeded(ImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
     nvinfer1::ILayer& layer, SubgraphPortsMap subgraphInputsMap)
 {
     // Return all of the layer's inputs that are external to the subgraph that
@@ -128,7 +129,7 @@ Status addConditionalInputIfNeeded(IImporterContext* ctx, nvinfer1::IIfCondition
 }
 
 // Add IConditionalInputLayers to `layer`'s inputs.
-Status addIfInputLayers(IImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
+Status addIfInputLayers(ImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
     const std::vector<nvinfer1::ILayer*>& newLayers)
 {
     // Find all of the tensors entering the subgraph.

ConditionalHelpers.hpp

@@ -33,13 +33,13 @@ Status getSubgraphOutputs(const std::vector<nvinfer1::ILayer*>& newLayers,
 
 // Take a snapshot of the network before and after parsing the subgraph and return a list
 // of newly added network layers.
-Status importSubgraph(IImporterContext* ctx, ::ONNX_NAMESPACE::GraphProto const& subgraph,
+Status importSubgraph(ImporterContext* ctx, ::ONNX_NAMESPACE::GraphProto const& subgraph,
     std::vector<nvinfer1::ILayer*>& newLayers, std::vector<TensorOrWeights>& subgraphTensors);
 
 using InputsMap = std::unordered_map<std::string, nvinfer1::IIfConditionalInputLayer*>;
 
 // Add IIfConditionalInputLayers to the inputs of the subgraph indicated by `subgraph`.
-onnx2trt::Status addIfInputLayers(IImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
+onnx2trt::Status addIfInputLayers(ImporterContext* ctx, nvinfer1::IIfConditional* conditional, InputsMap& inputsMap,
     const std::vector<nvinfer1::ILayer*>& newLayers);
 
 } // namespace onnx2trt

ImporterContext.cpp

@@ -4,6 +4,8 @@
 
 #include "ImporterContext.hpp"
 #include "NvInferVersion.h"
+#include "importerUtils.hpp"
+#include "weightUtils.hpp"
 #include <sstream>
 
 #if !defined(_WIN32)
@@ -52,7 +54,7 @@ void ImporterContext::popBaseNameScope()
 void ImporterContext::registerTensor(TensorOrWeights tensor, std::string const& basename, bool const checkUniqueName)
 {
     // TRT requires unique tensor names.
-    std::string const& uniqueName = generateUniqueName(mTensorNames, basename);
+    std::string const& uniqueName = generateUniqueName(mTensorNames, mSuffixCounter, basename);
 
     if (tensor)
     {
@@ -109,7 +111,7 @@ void ImporterContext::registerLayer(nvinfer1::ILayer* layer, std::string const&
     if (layer)
     {
         std::string const name = basename.empty() ? layer->getName() : basename;
-        std::string const& uniqueName = generateUniqueName(mLayerNames, name);
+        std::string const& uniqueName = generateUniqueName(mLayerNames, mSuffixCounter, basename);
 
         auto* ctx = this; // To enable logging.
         if (node != nullptr)
@@ -132,7 +134,7 @@ void ImporterContext::registerLayer(nvinfer1::ILayer* layer, std::string const&
             mConstantLayers.insert({uniqueName, static_cast<nvinfer1::IConstantLayer*>(layer)});
         }
     }
-    if (node != nullptr)
+    if (node != nullptr && layer != nullptr)
     {
         processMetadata(this, *node, layer);
     }
@@ -154,7 +156,7 @@ std::string getOSLibraryName(char const* logicalName)
 #if defined(_WIN32)
     libName << logicalName << ".dll";
 #else
-    libName << "lib" << logicalName << ".so." << NV_TENSORRT_SONAME_MAJOR;
+    libName << "lib" << logicalName << ".so." << NV_TENSORRT_MAJOR;
 #endif
     return libName.str();
 }