Merge pull request #653 from rajeevsrao/dev/release/7.0

Merge branch 'master' into release/7.0

Author: rajeevsrao

Diff for: plugin/InferPlugin.cpp

@@ -19,6 +19,9 @@
 #include <array>
 #include <iostream>
 #include <memory>
+#include <mutex>
+#include <stack>
+#include <unordered_set>
 using namespace nvinfer1;
 using namespace nvinfer1::plugin;
 
@@ -54,47 +57,93 @@ namespace plugin
 {
 ILogger* gLogger{};
 
-// Instances of this class are statically constructed in initializePlugin.
-// This ensures that each plugin is only registered a single time, as further calls to
-// initializePlugin will be no-ops.
-template <typename CreatorType>
-class InitializePlugin
+// This singleton ensures that each plugin is only registered once for a given
+// namespace and type, and attempts of duplicate registration are ignored.
+class PluginCreatorRegistry
 {
 public:
-    InitializePlugin(void* logger, const char* libNamespace)
-        : mCreator{new CreatorType{}}
+    static PluginCreatorRegistry& getInstance()
+    {
+        static PluginCreatorRegistry instance;
+        return instance;
+    }
+
+    template <typename CreatorType>
+    void addPluginCreator(void* logger, const char* libNamespace)
     {
-        mCreator->setPluginNamespace(libNamespace);
-        bool status = getPluginRegistry()->registerCreator(*mCreator, libNamespace);
+        // Make accesses to the plugin creator registry thread safe
+        std::lock_guard<std::mutex> lock(mRegistryLock);
+
+        std::string errorMsg;
+        std::string verboseMsg;
+
+        std::unique_ptr<CreatorType> pluginCreator{new CreatorType{}};
+        pluginCreator->setPluginNamespace(libNamespace);
+
+        nvinfer1::plugin::gLogger = static_cast<nvinfer1::ILogger*>(logger);
+        std::string pluginType
+            = std::string(pluginCreator->getPluginNamespace()) + "::" + std::string(pluginCreator->getPluginName());
+
+        if (mRegistryList.find(pluginType) == mRegistryList.end())
+        {
+            bool status = getPluginRegistry()->registerCreator(*pluginCreator, libNamespace);
+            if (status)
+            {
+                mRegistry.push(std::move(pluginCreator));
+                mRegistryList.insert(pluginType);
+                verboseMsg = "Plugin creator registration succeeded - " + pluginType;
+            }
+            else
+            {
+                errorMsg = "Could not register plugin creator:  " + pluginType;
+            }
+        }
+        else
+        {
+            verboseMsg = "Plugin creator already registered - " + pluginType;
+        }
+
         if (logger)
         {
-            nvinfer1::plugin::gLogger = static_cast<nvinfer1::ILogger*>(logger);
-            if (!status)
+            if (!errorMsg.empty())
             {
-                std::string errorMsg{"Could not register plugin creator:  " + std::string(mCreator->getPluginName())
-                    + " in namespace: " + std::string{mCreator->getPluginNamespace()}};
                 nvinfer1::plugin::gLogger->log(ILogger::Severity::kERROR, errorMsg.c_str());
             }
-            else
+            if (!verboseMsg.empty())
             {
-                std::string verboseMsg{
-                    "Plugin Creator registration succeeded - " + std::string{mCreator->getPluginName()}};
                 nvinfer1::plugin::gLogger->log(ILogger::Severity::kVERBOSE, verboseMsg.c_str());
             }
         }
     }
 
-    InitializePlugin(const InitializePlugin&) = delete;
-    InitializePlugin(InitializePlugin&&) = delete;
+    ~PluginCreatorRegistry()
+    {
+        std::lock_guard<std::mutex> lock(mRegistryLock);
+
+        // Release pluginCreators in LIFO order of registration.
+        while (!mRegistry.empty())
+        {
+            mRegistry.pop();
+        }
+        mRegistryList.clear();
+    }
 
 private:
-    std::unique_ptr<CreatorType> mCreator;
+    PluginCreatorRegistry() {}
+
+    std::mutex mRegistryLock;
+    std::stack<std::unique_ptr<IPluginCreator>> mRegistry;
+    std::unordered_set<std::string> mRegistryList;
+
+public:
+    PluginCreatorRegistry(PluginCreatorRegistry const&) = delete;
+    void operator=(PluginCreatorRegistry const&) = delete;
 };
 
 template <typename CreatorType>
 void initializePlugin(void* logger, const char* libNamespace)
 {
-    static InitializePlugin<CreatorType> plugin{logger, libNamespace};
+    PluginCreatorRegistry::getInstance().addPluginCreator<CreatorType>(logger, libNamespace);
 }
 
 } // namespace plugin

Diff for: plugin/README.md

@@ -0,0 +1,29 @@
+# TensorRT Plugins
+
+## Plugins shipped in this release
+
+| Plugin | Name | Version |
+|---|---|---|
+| [batchTilePlugin](batchTilePlugin) | BatchTilePlugin_TRT | 1 |
+| [batchedNMSPlugin](batchedNMSPlugin) | BatchedNMS_TRT | 1 |
+| [bertQKVToContextPlugin](bertQKVToContextPlugin) | CustomQKVToContextPluginDynamic | 1 |
+| [cropAndResizePlugin](cropAndResizePlugin) | CropAndResize | 1 |
+| [detectionLayerPlugin](detectionLayerPlugin) | DetectionLayer_TRT | 1 |
+| [embLayerNormPlugin](embLayerNormPlugin) | CustomEmbLayerNormPluginDynamic | 1 |
+| [fcPlugin](fcPlugin) | CustomFCPluginDynamic | 1 |
+| [flattenConcat](flattenConcat) | FlattenConcat_TRT | 1 |
+| [geluPlugin](geluPlugin) | CustomGeluPluginDynamic | 1 |
+| [gridAnchorPlugin](gridAnchorPlugin) | GridAnchor_TRT | 1 |
+| [instanceNormalizationPlugin](instanceNormalizationPlugin) | InstanceNormalization_TRT | 1 |
+| [nmsPlugin](nmsPlugin) | NMS_TRT | 1 |
+| [normalizePlugin](normalizePlugin) | Normalize_TRT | 1 |
+| [nvFasterRCNN](nvFasterRCNN) | RPROI_TRT | 1 |
+| [priorBoxPlugin](priorBoxPlugin) | PriorBox_TRT | 1 |
+| [proposalLayerPlugin](proposalLayerPlugin) | ProposalLayer_TRT | 1 |
+| [proposalPlugin](proposalPlugin) | Proposal | 1 |
+| [pyramidROIAlignPlugin](pyramidROIAlignPlugin) | PyramidROIAlign_TRT | 1 |
+| [regionPlugin](regionPlugin) | Region_TRT | 1 |
+| [reorgPlugin](reorgPlugin) | Reorg_TRT | 1 |
+| [resizeNearestPlugin](resizeNearestPlugin) | ResizeNearest_TRT | 1 |
+| [skipLayerNormPlugin](skipLayerNormPlugin) | CustomSkipLayerNormPluginDynamic | 1 |
+| [specialSlicePlugin](specialSlicePlugin) | SpecialSlice_TRT | 1 |

Diff for: plugin/instanceNormalizationPlugin/instanceNormalizationPlugin.cpp

@@ -279,7 +279,9 @@ void InstanceNormalizationPlugin::destroy()
 
 IPluginV2DynamicExt* InstanceNormalizationPlugin::clone() const
 { 
-    return new InstanceNormalizationPlugin{_epsilon, _h_scale, _h_bias};
+    auto plugin = new InstanceNormalizationPlugin{_epsilon, _h_scale, _h_bias};
+    plugin->setPluginNamespace(mPluginNamespace);
+    return plugin;
 }
 
 // Set plugin namespace

Diff for: plugin/normalizePlugin/README.md

@@ -29,7 +29,7 @@ This plugin consists of the plugin creator class `NormalizePluginCreator` and th
 |`bool`      |`acrossSpatial`           |When `acrossSpatial = true`, the normalization is conducted for each sample from the batch independently, meaning across spatial locations only. This is somewhat similar to instance normalization. When `acrossSpatial = false`, the normalization is conducted across all samples in the batch and spatial locations. This is somewhat similar to batch normalization.
 |`bool`      |`channelShared`           |When `channelShared = true`, a single scale factor is used for all channels. When `channelShared = false`, several scale factors are provided and are used for each channel independently.
 |`float`     |`eps`                     |A small number to prevent being divided by zero during normalization.
-|`Weights *` |`weights`                 |A pointer to weights which contains information about scale factors for normalization. The definition of `Weights` can be found in the [NvInfer.h](https://docs.nvidia.com/deeplearning/sdk/tensorrt-api/c_api/_nv_infer_8h_source.html) header. The number of values in weights is `1` if `channelShared = false`, otherwise the number of values in weights is the number of channels in the input tensor.
+|`Weights *` |`weights`                 |A pointer to weights which contains information about scale factors for normalization. The definition of `Weights` can be found in the [NvInfer.h](https://docs.nvidia.com/deeplearning/sdk/tensorrt-api/c_api/_nv_infer_8h_source.html) header. The number of values in weights is `1` if `channelShared = true`, otherwise the number of values in weights is the number of channels in the input tensor.
 |`int`       |`nbWeights`               |The number of weights sent to the plugin. This value has to be `1`.
 
 
@@ -55,4 +55,4 @@ This is the first release of this `README.md` file.
 
 ## Known issues
 
-There are no known issues in this plugin.
+There are no known issues in this plugin.

Diff for: plugin/normalizePlugin/normalizePlugin.cpp

@@ -71,8 +71,9 @@ Normalize::Normalize(const void* buffer, size_t length)
     channelShared = read<bool>(d);
     eps = read<float>(d);
 
-    int nbWeights = read<int>(d);
-    mWeights = deserializeToDevice(d, nbWeights);
+    mNbWeights = read<int>(d);
+    mWeights = deserializeToDevice(d, mNbWeights);
+    cublasCreate(&mCublas);
     ASSERT(d == a + length);
 }
 

Diff for: samples/opensource/sampleUffMaskRCNN/converted/requirements.txt

@@ -1,3 +1,3 @@
 keras == 2.1.3
-tensorflow-gpu >= 1.9.0, < 2.0
+tensorflow-gpu == 1.15.2
 scikit-image