10.13-GA Release (#1031)

Signed-off-by: Kevin Chen <[email protected]>

Author: kevinch-nv

CMakeLists.txt

@@ -28,7 +28,7 @@ add_definitions("-DSOURCE_LENGTH=${SOURCE_LENGTH}")
 # Version information
 #--------------------------------------------------
 set(ONNX2TRT_MAJOR 10)
-set(ONNX2TRT_MINOR 12)
+set(ONNX2TRT_MINOR 13)
 set(ONNX2TRT_PATCH 0)
 set(ONNX2TRT_VERSION "${ONNX2TRT_MAJOR}.${ONNX2TRT_MINOR}.${ONNX2TRT_PATCH}" CACHE STRING "ONNX2TRT version")
 
@@ -37,26 +37,28 @@ set(ONNX2TRT_VERSION "${ONNX2TRT_MAJOR}.${ONNX2TRT_MINOR}.${ONNX2TRT_PATCH}" CAC
 #--------------------------------------------------
 
 set(IMPORTER_SOURCES
-  NvOnnxParser.cpp
-  ModelImporter.cpp
-  ModelRefitter.cpp
-  onnxOpImporters.cpp
-  ImporterContext.cpp
-  importerUtils.cpp
-  ShapedWeights.cpp
-  ShapeTensor.cpp
-  LoopHelpers.cpp
-  RNNHelpers.cpp
-  OnnxAttrs.cpp
-  onnxErrorRecorder.cpp
-  ConditionalHelpers.cpp
-  bfloat16.cpp
-  onnxOpCheckers.cpp
-  onnxProtoUtils.cpp
-  weightUtils.cpp
-  WeightsContext.cpp
-  TensorOrWeights.cpp
-  errorHelpers.cpp
+    NvOnnxParser.cpp
+    ModelImporter.cpp
+    ModelRefitter.cpp
+    onnxOpImporters.cpp
+    ImporterContext.cpp
+    importerUtils.cpp
+    ShapedWeights.cpp
+    ShapeTensor.cpp
+    Status.cpp
+    LoopHelpers.cpp
+    RNNHelpers.cpp
+    OnnxAttrs.cpp
+    onnxErrorRecorder.cpp
+    ConditionalHelpers.cpp
+    bfloat16.cpp
+    onnxOpCheckers.cpp
+    onnxProtoUtils.cpp
+    TensorOrWeights.cpp
+    WeightsContext.cpp
+    WeightsContextMemoryMap.cpp
+    weightUtils.cpp
+    errorHelpers.cpp
 )
 
 if (BUILD_ONNXIFI)
@@ -70,7 +72,7 @@ set(API_TESTS_SOURCES
 
 # Find protobuf if it's not a target.
 if (NOT TARGET protobuf::libprotobuf)
-  FIND_PACKAGE(Protobuf REQUIRED)
+  FIND_PACKAGE(Protobuf)
 endif()
 
 # Set protobuf libraries between full / lite.

ConditionalHelpers.cpp

@@ -55,7 +55,7 @@ void addConditionalInputLayer(ImporterContext* ctx, nvinfer1::IIfConditional* co
     }
     auto ifOutput = N_CHECK(inputLayer->getOutput(0));
     layer.setInput(inIdx, *ifOutput);
-};
+}
 
 // Take a snapshot of the network before and after parsing the subgraph and return a list
 // of newly added network layers.

ImporterContext.cpp

@@ -138,7 +138,7 @@ class DynamicLibrary
 };
 
 //! Translates an OS-dependent DSO/DLL name into a path on the filesystem
-std::string getOSLibraryPath(std::string const& osLibName)
+inline std::string getOSLibraryPath(std::string const& osLibName)
 {
     DynamicLibrary lib{osLibName};
     return lib.getFullPath();

ImporterContext.hpp

@@ -29,7 +29,6 @@ class ErrorRecorderWrapper
 public:
     ErrorRecorderWrapper(nvinfer1::INetworkDefinition* network, nvinfer1::ILogger* logger)
         : mNetwork(network)
-        , mLogger(logger)
     {
         if (mNetwork)
         {
@@ -69,9 +68,9 @@ class ErrorRecorderWrapper
     {
         return mOnnxErrorRecorder ? mOnnxErrorRecorder : nullptr;
     }
+
 private:
     nvinfer1::INetworkDefinition* mNetwork{nullptr};
-    nvinfer1::ILogger* mLogger{nullptr};
     ONNXParserErrorRecorder* mOnnxErrorRecorder{nullptr};
     nvinfer1::IErrorRecorder* mUserErrorRecorder{nullptr};
 };
@@ -386,7 +385,7 @@ class ImporterContext
     }
 
     // Returns if the underlying network was created with the KSTRONGLY_TYPED flag.
-    bool const isStronglyTyped()
+    bool isStronglyTyped()
     {
         assert(mNetwork != nullptr);
         return mNetwork->getFlag(nvinfer1::NetworkDefinitionCreationFlag::kSTRONGLY_TYPED);