namespace change

src/Activation.cpp

@@ -3,7 +3,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Activation::Activation(Network *net, int act_mode) : 
     Layer(net) {
@@ -63,4 +63,4 @@ dnnType* Activation::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Conv2d.cpp

@@ -2,7 +2,7 @@
 
 #include "Layer.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Conv2d::Conv2d( Network *net, int out_ch, int kernelH, int kernelW, 
                 int strideH, int strideW, int paddingH, int paddingW,
@@ -125,4 +125,4 @@ dnnType* Conv2d::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Dense.cpp

@@ -2,7 +2,7 @@
 
 #include "Layer.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Dense::Dense(Network *net, int out_ch, const char* fname_weights) : 
     LayerWgs(net, net->getOutputDim().tot(), out_ch, 1, 1, 1, fname_weights) {
@@ -55,4 +55,4 @@ dnnType* Dense::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Flatten.cpp

@@ -3,7 +3,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Flatten::Flatten(Network *net) : Layer(net) {
 
@@ -33,4 +33,4 @@ dnnType* Flatten::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Layer.cpp

@@ -2,7 +2,7 @@
 
 #include "Layer.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Layer::Layer(Network *net) {
 
@@ -23,4 +23,4 @@ Layer::~Layer() {
     checkCUDNN( cudnnDestroyTensorDescriptor(dstTensorDesc) );
 }
 
-}
+}}

src/LayerWgs.cpp

@@ -4,7 +4,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 LayerWgs::LayerWgs(Network *net, int inputs, int outputs, 
                    int kh, int kw, int kl, 
@@ -114,4 +114,4 @@ LayerWgs::~LayerWgs() {
     }
 }
 
-}
+}}

src/MulAdd.cpp

@@ -3,7 +3,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 MulAdd::MulAdd(Network *net, dnnType mul, dnnType add) : Layer(net) {
 
@@ -41,4 +41,4 @@ dnnType* MulAdd::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Network.cpp

@@ -5,7 +5,7 @@
 #include "Network.h"
 #include "Layer.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Network::Network(dataDim_t input_dim) {
     this->input_dim = input_dim;
@@ -99,4 +99,4 @@ void Network::print() {
 }
 
 
-}
+}}

src/NetworkRT.cpp

@@ -25,7 +25,7 @@ class Logger : public ILogger {
     }
 } loggerRT;
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 std::map<Layer*, nvinfer1::ITensor*>tensors; 
 
@@ -399,4 +399,4 @@ bool NetworkRT::deserialize(const char *filename) {
     return true;
 }
 
-}
+}}

src/Pooling.cpp

@@ -3,7 +3,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Pooling::Pooling( Network *net, int winH, int winW, int strideH, int strideW,
                   tkdnnPoolingMode_t pool_mode) : 
@@ -107,4 +107,4 @@ dnnType* Pooling::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Region.cpp

@@ -9,7 +9,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Region::Region(Network *net, int classes, int coords, int num) : 
     Layer(net) {
@@ -339,4 +339,4 @@ void RegionInterpret::showImageResult(dnnType *input_h) {
 #endif
 }
 
-}
+}}

src/Reorg.cpp

@@ -3,7 +3,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Reorg::Reorg(Network *net, int stride) : Layer(net) {
 
@@ -31,4 +31,4 @@ dnnType* Reorg::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Route.cpp

@@ -3,7 +3,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Route::Route(Network *net, Layer **layers, int layers_n) : Layer(net) {
 
@@ -53,4 +53,4 @@ dnnType* Route::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/Softmax.cpp

@@ -3,7 +3,7 @@
 #include "Layer.h"
 #include "kernels.h"
 
-namespace tkDNN {
+namespace tk { namespace dnn {
 
 Softmax::Softmax(Network *net) : Layer(net) {
 
@@ -44,4 +44,4 @@ dnnType* Softmax::infer(dataDim_t &dim, dnnType* srcData) {
     return dstData;
 }
 
-}
+}}

src/pluginsRT/ActivationLeakyRT.cpp

@@ -53,7 +53,7 @@ public:
 
 	virtual void serialize(void* buffer) override {
 		char *buf = reinterpret_cast<char*>(buffer);
-		tkDNN::writeBUF(buf, size);
+		tk::dnn::writeBUF(buf, size);
 	}
 
 	int size;

src/pluginsRT/Int8Calibrator.cpp

@@ -8,7 +8,7 @@
 class BatchStream
 {
 public:
-	BatchStream(tkDNN::dataDim_t dim, int batchSize, int maxBatches)
+	BatchStream(tk::dnn::dataDim_t dim, int batchSize, int maxBatches)
 	{
         mBatchSize = batchSize;
         mMaxBatches = maxBatches;

src/pluginsRT/RegionRT.cpp

@@ -74,12 +74,12 @@ public:
 
 	virtual void serialize(void* buffer) override {
 		char *buf = reinterpret_cast<char*>(buffer);
-		tkDNN::writeBUF(buf, classes);
-		tkDNN::writeBUF(buf, coords);
-		tkDNN::writeBUF(buf, num);
-		tkDNN::writeBUF(buf, c);
-		tkDNN::writeBUF(buf, h);
-		tkDNN::writeBUF(buf, w);
+		tk::dnn::writeBUF(buf, classes);
+		tk::dnn::writeBUF(buf, coords);
+		tk::dnn::writeBUF(buf, num);
+		tk::dnn::writeBUF(buf, c);
+		tk::dnn::writeBUF(buf, h);
+		tk::dnn::writeBUF(buf, w);
 	}
 
 	int c, h, w;

src/pluginsRT/ReorgRT.cpp

@@ -53,10 +53,10 @@ public:
 
 	virtual void serialize(void* buffer) override {
 		char *buf = reinterpret_cast<char*>(buffer);
-		tkDNN::writeBUF(buf, stride);
-		tkDNN::writeBUF(buf, c);
-		tkDNN::writeBUF(buf, h);
-		tkDNN::writeBUF(buf, w);
+		tk::dnn::writeBUF(buf, stride);
+		tk::dnn::writeBUF(buf, c);
+		tk::dnn::writeBUF(buf, h);
+		tk::dnn::writeBUF(buf, w);
 	}
 
 	int c, h, w, stride;