1diff --git a/plugin/common/checkMacrosPlugin.h b/plugin/common/checkMacrosPlugin.h 2index 2cff9f8..a803765 100644 3--- a/plugin/common/checkMacrosPlugin.h 4+++ b/plugin/common/checkMacrosPlugin.h 5@@ -16,7 +16,7 @@ 6 #ifndef CHECK_MACROS_PLUGIN_H 7 #define CHECK_MACROS_PLUGIN_H 8 9-#include "NvInfer.h" 10+#include "third_party/tensorrt/NvInfer.h" 11 #include <sstream> 12 13 #ifndef TRT_CHECK_MACROS_H 14diff --git a/plugin/common/kernels/common.cu b/plugin/common/kernels/common.cu.cc 15similarity index 87% 16rename from plugin/common/kernels/common.cu 17rename to plugin/common/kernels/common.cu.cc 18index 7c8922a..9818a30 100755 19--- a/plugin/common/kernels/common.cu 20+++ b/plugin/common/kernels/common.cu.cc 21@@ -18,7 +18,6 @@ 22 #include "cublas_v2.h" 23 #include <cub/cub.cuh> 24 #include <stdint.h> 25-#include "kernel.h" 26 #include "bboxUtils.h" 27 28 #define CUDA_MEM_ALIGN 256 29@@ -26,28 +25,7 @@ 30 // HASH 31 unsigned int hash(const void* array_, size_t size) 32 { 33- // Apply hashing only when debugging RPN codes. 34- if (DEBUG_ENABLE) 35- { 36- const char* array_const; 37- char* array; 38- cudaMallocHost((void**) &array, size); 39- cudaMemcpy(array, array_, size, cudaMemcpyDeviceToHost); 40- array_const = array; 41- unsigned int hash = 45599; 42- for (size_t i = 0; i < size; i++) 43- { 44- unsigned int value = array_const[i]; 45- hash = hash * 1487 + value; 46- hash = hash * 317; 47- hash = hash % 105359; 48- } 49- return hash; 50- } 51- else 52- { 53- return 0; 54- } 55+ return 0; 56 } 57 58 // ALIGNPTR 59diff --git a/plugin/common/plugin.h b/plugin/common/plugin.h 60index 27a1fb7..f056255 100644 61--- a/plugin/common/plugin.h 62+++ b/plugin/common/plugin.h 63@@ -17,7 +17,7 @@ 64 #define TRT_PLUGIN_H 65 #include "checkMacrosPlugin.h" 66 67-#include "NvInferPlugin.h" 68+#include "third_party/tensorrt/NvInferPlugin.h" 69 #include <cstring> 70 #include <cuda_runtime.h> 71 #include <iostream> 72diff --git a/plugin/efficientNMSPlugin/efficientNMSInference.cu b/plugin/efficientNMSPlugin/efficientNMSInference.cu.cc 73similarity index 99% 74rename from plugin/efficientNMSPlugin/efficientNMSInference.cu 75rename to plugin/efficientNMSPlugin/efficientNMSInference.cu.cc 76index f02a2f8..44fa20b 100644 77--- a/plugin/efficientNMSPlugin/efficientNMSInference.cu 78+++ b/plugin/efficientNMSPlugin/efficientNMSInference.cu.cc 79@@ -18,7 +18,7 @@ 80 #include "cub/cub.cuh" 81 #include "cuda_runtime_api.h" 82 83-#include "efficientNMSInference.cuh" 84+#include "efficientNMSInference.cu.h" 85 #include "efficientNMSInference.h" 86 87 using namespace nvinfer1; 88diff --git a/plugin/efficientNMSPlugin/efficientNMSInference.cuh b/plugin/efficientNMSPlugin/efficientNMSInference.cu.h 89similarity index 100% 90rename from plugin/efficientNMSPlugin/efficientNMSInference.cuh 91rename to plugin/efficientNMSPlugin/efficientNMSInference.cu.h 92diff --git a/plugin/efficientNMSPlugin/efficientNMSPlugin.cpp b/plugin/efficientNMSPlugin/efficientNMSPlugin.cpp 93index 2d05c5c..acda183 100644 94--- a/plugin/efficientNMSPlugin/efficientNMSPlugin.cpp 95+++ b/plugin/efficientNMSPlugin/efficientNMSPlugin.cpp 96@@ -31,11 +31,6 @@ const char* EFFICIENT_NMS_ONNX_PLUGIN_VERSION{"1"}; 97 const char* EFFICIENT_NMS_ONNX_PLUGIN_NAME{"EfficientNMS_ONNX_TRT"}; 98 } // namespace 99 100-PluginFieldCollection EfficientNMSPluginCreator::mFC{}; 101-PluginFieldCollection EfficientNMSONNXPluginCreator::mFC{}; 102-std::vector<PluginField> EfficientNMSPluginCreator::mPluginAttributes; 103-std::vector<PluginField> EfficientNMSONNXPluginCreator::mPluginAttributes; 104- 105 EfficientNMSPlugin::EfficientNMSPlugin(EfficientNMSParameters param) 106 : mParam(param) 107 { 108@@ -386,7 +381,7 @@ EfficientNMSPluginCreator::EfficientNMSPluginCreator() 109 mPluginAttributes.emplace_back(PluginField("max_output_boxes", nullptr, PluginFieldType::kINT32, 1)); 110 mPluginAttributes.emplace_back(PluginField("background_class", nullptr, PluginFieldType::kINT32, 1)); 111 mPluginAttributes.emplace_back(PluginField("score_activation", nullptr, PluginFieldType::kINT32, 1)); 112- mPluginAttributes.emplace_back(PluginField("box_coding", nullptr, PluginFieldType::kINT32, 1)); 113+ mPluginAttributes.emplace_back(PluginField("box_coding", nullptr, PluginFieldType::kINT32, 1)); 114 mFC.nbFields = mPluginAttributes.size(); 115 mFC.fields = mPluginAttributes.data(); 116 } 117diff --git a/plugin/efficientNMSPlugin/efficientNMSPlugin.h b/plugin/efficientNMSPlugin/efficientNMSPlugin.h 118index b342b09..84d5e69 100644 119--- a/plugin/efficientNMSPlugin/efficientNMSPlugin.h 120+++ b/plugin/efficientNMSPlugin/efficientNMSPlugin.h 121@@ -85,9 +85,9 @@ public: 122 const char* name, const void* serialData, size_t serialLength) noexcept override; 123 124 protected: 125- static PluginFieldCollection mFC; 126+ PluginFieldCollection mFC; 127 EfficientNMSParameters mParam; 128- static std::vector<PluginField> mPluginAttributes; 129+ std::vector<PluginField> mPluginAttributes; 130 std::string mPluginName; 131 }; 132 133@@ -107,9 +107,9 @@ public: 134 const char* name, const void* serialData, size_t serialLength) noexcept override; 135 136 protected: 137- static PluginFieldCollection mFC; 138+ PluginFieldCollection mFC; 139 EfficientNMSParameters mParam; 140- static std::vector<PluginField> mPluginAttributes; 141+ std::vector<PluginField> mPluginAttributes; 142 std::string mPluginName; 143 }; 144 145