include/tkDNN/NetworkRT.h

@@ -95,7 +95,7 @@ public:
     nvinfer1::IPluginV2Layer* convert_layer(nvinfer1::ITensor *input, Region *l);
     nvinfer1::ILayer* convert_layer(nvinfer1::ITensor *input, Shortcut *l);
     nvinfer1::IPluginV2Layer* convert_layer(nvinfer1::ITensor *input, Yolo *l);
-    nvinfer1::IResizeLayer* convert_layer(nvinfer1::ITensor *input, Upsample *l);
+    nvinfer1::ILayer* convert_layer(nvinfer1::ITensor *input, Upsample *l);
     nvinfer1::ILayer* convert_layer(nvinfer1::ITensor *input, DeformConv2d *l);
     nvinfer1::ILayer* convert_layer(nvinfer1::ITensor *input,Padding *l);
     nvinfer1::ILayer* convert_layer(nvinfer1::ITensor* input,MulAdd *l);

src/NetworkRT.cpp

@@ -834,7 +834,7 @@ IPluginV2Layer* NetworkRT::convert_layer(ITensor *input, Yolo *l) {
     return lRT;
 }
 
-IResizeLayer* NetworkRT::convert_layer(ITensor *input, Upsample *l) {
+ILayer* NetworkRT::convert_layer(ITensor *input, Upsample *l) {
 
 #if NV_TENSORRT_MAJOR < 8
     auto creator = getPluginRegistry()->getPluginCreator("UpSample_tkDNN","1");
@@ -1008,6 +1008,7 @@ bool NetworkRT::deserialize(const char *filename) {
     return true;
 }
 
+#if NV_TENSORRT_MAJOR > 7
 void NetworkRT::destroy() {
     delete contextRT;
     if(builderActive) {
@@ -1015,5 +1016,11 @@ void NetworkRT::destroy() {
         delete builderRT;
     }
 }
+#elif NV_TENSORRT_MAJOR <=7
+void NetworkRT::destroy() {
+
+}
+#endif
+
 
 }}

src/pluginsRT/ConstantPaddingRT.cpp

@@ -66,11 +66,12 @@ int ConstantPaddingRT::enqueue(int batchSize, const void *const *inputs, void *c
      return 0;
 }
 #elif NV_TENSORRT_MAJOR <= 7
-    int32_t enqueue (int32_t batchSize, const void *const *inputs, void **outputs, void *workspace, cudaStream_t stream) {
-        dnnType* srcData = (dnnType*)reinterpret_cast<const dnnType*>(inputs[0]);
-        dnnType* dstData = reinterpret_cast<dnnType*>(outputs[0]);
-        constant_pad2d_forward(srcData,dstData,i_h,i_w,o_h,o_w,c,n,padH,padW,constant,stream);
-        return 0;
+int32_t ConstantPaddingRT::enqueue(int32_t batchSize, const void *const *inputs, void **outputs, void *workspace,
+                                   cudaStream_t stream) {
+    dnnType* srcData = (dnnType*)reinterpret_cast<const dnnType*>(inputs[0]);
+    dnnType* dstData = reinterpret_cast<dnnType*>(outputs[0]);
+    constant_pad2d_forward(srcData,dstData,i_h,i_w,o_h,o_w,c,n,padH,padW,constant,stream);
+    return 0;
 }
 #endif
 
@@ -151,6 +152,8 @@ bool ConstantPaddingRT::supportsFormat(DataType type, PluginFormat format) const
     return (type == DataType::kFLOAT && format == PluginFormat::kLINEAR);
 }
 
+
+
 ConstantPaddingRTPluginCreator::ConstantPaddingRTPluginCreator() {
     mPluginAttributes.clear();
     mFC.nbFields = mPluginAttributes.size();