merge from gitlab

include/tkDNN/NetworkRT.h

@@ -55,16 +55,14 @@ class NetworkRT {
 
 public:
     nvinfer1::DataType dtRT;
-    //nvinfer1::IBuilder *builderRT;
-    std::unique_ptr<nvinfer1::IBuilder,InferDeleter> builderRT;
-    //nvinfer1::IRuntime *runtimeRT;
-    std::unique_ptr<nvinfer1::IRuntime,InferDeleter> runtimeRT;
+    nvinfer1::IBuilder *builderRT;
+    nvinfer1::IRuntime *runtimeRT;
     nvinfer1::INetworkDefinition *networkRT; 
 #if NV_TENSORRT_MAJOR >= 6  
     nvinfer1::IBuilderConfig *configRT;
 #endif
-    std::shared_ptr<nvinfer1::ICudaEngine> engineRT;
-   //nvinfer1::ICudaEngine *engineRT;
+    
+    nvinfer1::ICudaEngine *engineRT;
     nvinfer1::IExecutionContext *contextRT;
 
     const static int MAX_BUFFERS_RT = 10;

include/tkDNN/utils.h

@@ -14,9 +14,6 @@
 
 #ifdef __linux__
 #include <unistd.h>
-#elif _WIN32
-#define NOMINMAX
-#include <windows.h>
 #endif
 
 #include <ios>
@@ -110,17 +107,6 @@ double t_ns = time_ms.count();
       FatalError(_error.str());                                        \
     }                                                                  \
 }
-struct InferDeleter
-{
-    template <typename T>
-    void operator()(T* obj) const
-    {
-        if (obj)
-        {
-            obj->destroy();
-        }
-    }
-};
 
 typedef enum {
   ERROR_CUDNN = 2,