From 106cbb5c732e1792e699f564af0f365f51866da9 Mon Sep 17 00:00:00 2001 From: Davide Sapienza Date: Thu, 9 Apr 2020 19:20:27 +0200 Subject: [PATCH] Remove the optional parameters from the Pooling layer. Signed-off-by: Davide Sapienza --- include/tkDNN/Layer.h | 4 ++-- scripts/test_all_tests.sh | 6 +++--- .../csresnext50-panet-spp/csresnext50-panet-spp.cpp | 6 +++--- tests/mnist/test_mnist.cpp | 4 ++-- tests/mnist/test_mnistRT.cpp | 4 ++-- tests/yolo/yolo.cpp | 10 +++++----- tests/yolo3_tiny/yolo3_tiny.cpp | 12 ++++++------ tests/yolo3_tiny512/yolo3_tiny512.cpp | 12 ++++++------ tests/yolo3_tiny512tp/yolo3_tiny512tp.cpp | 12 ++++++------ tests/yolo3_tinyNM512/yolo3_tinyNM512.cpp | 10 +++++----- tests/yolo_224/yolo_224.cpp | 10 +++++----- tests/yolo_berkeley/yolo_berkeley.cpp | 10 +++++----- tests/yolo_relu/yolo_relu.cpp | 10 +++++----- tests/yolo_tiny/yolo_tiny.cpp | 10 +++++----- tests/yolo_voc/yolo_voc.cpp | 10 +++++----- 15 files changed, 65 insertions(+), 65 deletions(-) diff --git a/include/tkDNN/Layer.h b/include/tkDNN/Layer.h index 8d1b83f..45abc1f 100644 --- a/include/tkDNN/Layer.h +++ b/include/tkDNN/Layer.h @@ -427,8 +427,8 @@ public: Pooling(Network *net, int winH, int winW, int strideH, int strideW, - int paddingH = 0, int paddingW = 0, - tkdnnPoolingMode_t pool_mode = POOLING_MAX); + int paddingH, int paddingW, + tkdnnPoolingMode_t pool_mode); virtual ~Pooling(); virtual layerType_t getLayerType() { return LAYER_POOLING; }; diff --git a/scripts/test_all_tests.sh b/scripts/test_all_tests.sh index 7052395..d663d01 100644 --- a/scripts/test_all_tests.sh +++ b/scripts/test_all_tests.sh @@ -32,13 +32,13 @@ function print_output { out_file=results.log rm $out_file -# modes=( 1 ) # only FP32 -modes=( 1 2 ) # FP32 and FP16 +modes=( 1 ) # only FP32 +# modes=( 1 2 ) # FP32 and FP16 # modes=( 1 2 3 ) # FP32, FP16 and INT8 for i in "${modes[@]}" do - # rm *rt + rm *rt if [ $i -eq 1 ] then export TKDNN_MODE=FP32 diff --git a/tests/csresnext50-panet-spp/csresnext50-panet-spp.cpp b/tests/csresnext50-panet-spp/csresnext50-panet-spp.cpp index 7028974..904df49 100644 --- a/tests/csresnext50-panet-spp/csresnext50-panet-spp.cpp +++ b/tests/csresnext50-panet-spp/csresnext50-panet-spp.cpp @@ -125,7 +125,7 @@ int main() tk::dnn::Conv2d c0(&net, 64, 7, 7, 2, 2, 3, 3, c0_bin, true); tk::dnn::Activation a0(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1(&net, 2, 2, 2, 2, 0,0, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2(&net, 128, 1, 1, 1, 1, 0, 0, c2_bin, true); tk::dnn::Activation a2(&net, tk::dnn::ACTIVATION_LEAKY); @@ -342,11 +342,11 @@ int main() tk::dnn::Activation a83(&net, tk::dnn::ACTIVATION_LEAKY); //SPP - tk::dnn::Pooling p84(&net, 5, 5, 1, 1,0,0, tk::dnn::POOLING_MAX_FIXEDSIZE); + tk::dnn::Pooling p84(&net, 5, 5, 1, 1, 0, 0, tk::dnn::POOLING_MAX_FIXEDSIZE); tk::dnn::Layer *r85_layers[1] = {&a83}; tk::dnn::Route r85(&net, r85_layers, 1); - tk::dnn::Pooling p86(&net, 9, 9, 1, 1,0,0, tk::dnn::POOLING_MAX_FIXEDSIZE); + tk::dnn::Pooling p86(&net, 9, 9, 1, 1, 0, 0, tk::dnn::POOLING_MAX_FIXEDSIZE); tk::dnn::Layer *r87_layers[1] = {&a83}; tk::dnn::Route r87(&net, r87_layers, 1); diff --git a/tests/mnist/test_mnist.cpp b/tests/mnist/test_mnist.cpp index 7c0de41..9c2f6e9 100644 --- a/tests/mnist/test_mnist.cpp +++ b/tests/mnist/test_mnist.cpp @@ -16,9 +16,9 @@ int main() { tk::dnn::dataDim_t dim(1, 1, 28, 28, 1); tk::dnn::Network net(dim); tk::dnn::Conv2d l0(&net, 20, 5, 5, 1, 1, 0, 0, c0_bin); - tk::dnn::Pooling l1(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling l1(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d l2(&net, 50, 5, 5, 1, 1, 0, 0, c1_bin); - tk::dnn::Pooling l3(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling l3(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Dense l4(&net, 500, d2_bin); tk::dnn::Activation l5(&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Dense l6(&net, 10, d3_bin); diff --git a/tests/mnist/test_mnistRT.cpp b/tests/mnist/test_mnistRT.cpp index 1fd3006..802b540 100644 --- a/tests/mnist/test_mnistRT.cpp +++ b/tests/mnist/test_mnistRT.cpp @@ -32,9 +32,9 @@ int main() { tk::dnn::dataDim_t dim(1, 1, 28, 28, 1); tk::dnn::Network net(dim); tk::dnn::Conv2d l0(&net, 20, 5, 5, 1, 1, 0, 0, c0_bin); - tk::dnn::Pooling l1(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling l1(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d l2(&net, 50, 5, 5, 1, 1, 0, 0, c1_bin); - tk::dnn::Pooling l3(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling l3(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Dense l4(&net, 500, d2_bin); tk::dnn::Activation l5(&net, CUDNN_ACTIVATION_RELU); tk::dnn::Dense l6(&net, 10, d3_bin); diff --git a/tests/yolo/yolo.cpp b/tests/yolo/yolo.cpp index 553c950..a975da1 100644 --- a/tests/yolo/yolo.cpp +++ b/tests/yolo/yolo.cpp @@ -38,11 +38,11 @@ int main() { tk::dnn::Conv2d c0 (&net, 32, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 64, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 128, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -50,7 +50,7 @@ int main() { tk::dnn::Activation a5 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8 (&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -58,7 +58,7 @@ int main() { tk::dnn::Activation a9 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c10(&net, 256, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p11(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p11(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c12(&net, 512, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, tk::dnn::ACTIVATION_LEAKY); @@ -70,7 +70,7 @@ int main() { tk::dnn::Activation a15(&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c16(&net, 512, 3, 3, 1, 1, 1, 1, c16_bin, true); tk::dnn::Activation a16(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p17(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p17(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c18(&net, 1024, 3, 3, 1, 1, 1, 1, c18_bin, true); tk::dnn::Activation a18(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo3_tiny/yolo3_tiny.cpp b/tests/yolo3_tiny/yolo3_tiny.cpp index 319cdfe..cea116e 100644 --- a/tests/yolo3_tiny/yolo3_tiny.cpp +++ b/tests/yolo3_tiny/yolo3_tiny.cpp @@ -35,27 +35,27 @@ int main() { tk::dnn::Conv2d c0 (&net, 16, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 32, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 64, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8(&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p9(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p9(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c10(&net, 512, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p11(&net, 2, 2, 1, 1,0,0, tk::dnn::POOLING_MAX_FIXEDSIZE); + tk::dnn::Pooling p11(&net, 2, 2, 1, 1, 0, 0, tk::dnn::POOLING_MAX_FIXEDSIZE); tk::dnn::Conv2d c12(&net, 1024, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo3_tiny512/yolo3_tiny512.cpp b/tests/yolo3_tiny512/yolo3_tiny512.cpp index e1e6936..fb6b061 100644 --- a/tests/yolo3_tiny512/yolo3_tiny512.cpp +++ b/tests/yolo3_tiny512/yolo3_tiny512.cpp @@ -34,27 +34,27 @@ int main() { tk::dnn::Conv2d c0 (&net, 16, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 32, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 64, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8(&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p9(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p9(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c10(&net, 512, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p11(&net, 2, 2, 1, 1,0,0, tk::dnn::POOLING_MAX_FIXEDSIZE); + tk::dnn::Pooling p11(&net, 2, 2, 1, 1, 0, 0, tk::dnn::POOLING_MAX_FIXEDSIZE); tk::dnn::Conv2d c12(&net, 1024, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo3_tiny512tp/yolo3_tiny512tp.cpp b/tests/yolo3_tiny512tp/yolo3_tiny512tp.cpp index 56c8be0..9d4c9d4 100644 --- a/tests/yolo3_tiny512tp/yolo3_tiny512tp.cpp +++ b/tests/yolo3_tiny512tp/yolo3_tiny512tp.cpp @@ -32,27 +32,27 @@ int main() { tk::dnn::Conv2d c0 (&net, 16, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 32, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 64, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8(&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p9(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p9(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c10(&net, 512, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p11(&net, 2, 2, 1, 1,0,0, tk::dnn::POOLING_MAX_FIXEDSIZE); + tk::dnn::Pooling p11(&net, 2, 2, 1, 1, 0, 0, tk::dnn::POOLING_MAX_FIXEDSIZE); tk::dnn::Conv2d c12(&net, 1024, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo3_tinyNM512/yolo3_tinyNM512.cpp b/tests/yolo3_tinyNM512/yolo3_tinyNM512.cpp index 4e914ae..a347670 100644 --- a/tests/yolo3_tinyNM512/yolo3_tinyNM512.cpp +++ b/tests/yolo3_tinyNM512/yolo3_tinyNM512.cpp @@ -34,23 +34,23 @@ int main() { tk::dnn::Conv2d c0 (&net, 16, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 32, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 64, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8(&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p9(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p9(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c10(&net, 512, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo_224/yolo_224.cpp b/tests/yolo_224/yolo_224.cpp index 66ad694..44b0047 100644 --- a/tests/yolo_224/yolo_224.cpp +++ b/tests/yolo_224/yolo_224.cpp @@ -36,11 +36,11 @@ int main() { tk::dnn::Conv2d c0 (&net, 32, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 64, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 128, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -48,7 +48,7 @@ int main() { tk::dnn::Activation a5 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8 (&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -56,7 +56,7 @@ int main() { tk::dnn::Activation a9 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c10(&net, 256, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p11(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p11(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c12(&net, 512, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, tk::dnn::ACTIVATION_LEAKY); @@ -68,7 +68,7 @@ int main() { tk::dnn::Activation a15(&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c16(&net, 512, 3, 3, 1, 1, 1, 1, c16_bin, true); tk::dnn::Activation a16(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p17(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p17(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c18(&net, 1024, 3, 3, 1, 1, 1, 1, c18_bin, true); tk::dnn::Activation a18(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo_berkeley/yolo_berkeley.cpp b/tests/yolo_berkeley/yolo_berkeley.cpp index ab0e1b0..1a08563 100644 --- a/tests/yolo_berkeley/yolo_berkeley.cpp +++ b/tests/yolo_berkeley/yolo_berkeley.cpp @@ -36,11 +36,11 @@ int main() { tk::dnn::Conv2d c0 (&net, 32, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 64, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 128, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -48,7 +48,7 @@ int main() { tk::dnn::Activation a5 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8 (&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -56,7 +56,7 @@ int main() { tk::dnn::Activation a9 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c10(&net, 256, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p11(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p11(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c12(&net, 512, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, tk::dnn::ACTIVATION_LEAKY); @@ -68,7 +68,7 @@ int main() { tk::dnn::Activation a15(&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c16(&net, 512, 3, 3, 1, 1, 1, 1, c16_bin, true); tk::dnn::Activation a16(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p17(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p17(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c18(&net, 1024, 3, 3, 1, 1, 1, 1, c18_bin, true); tk::dnn::Activation a18(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo_relu/yolo_relu.cpp b/tests/yolo_relu/yolo_relu.cpp index 4fc617c..24f3e8d 100644 --- a/tests/yolo_relu/yolo_relu.cpp +++ b/tests/yolo_relu/yolo_relu.cpp @@ -36,11 +36,11 @@ int main() { tk::dnn::Conv2d c0 (&net, 32, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, CUDNN_ACTIVATION_RELU); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 64, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, CUDNN_ACTIVATION_RELU); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 128, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, CUDNN_ACTIVATION_RELU); @@ -48,7 +48,7 @@ int main() { tk::dnn::Activation a5 (&net, CUDNN_ACTIVATION_RELU); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, CUDNN_ACTIVATION_RELU); - tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8 (&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8 (&net, CUDNN_ACTIVATION_RELU); @@ -56,7 +56,7 @@ int main() { tk::dnn::Activation a9 (&net, CUDNN_ACTIVATION_RELU); tk::dnn::Conv2d c10(&net, 256, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, CUDNN_ACTIVATION_RELU); - tk::dnn::Pooling p11(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p11(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c12(&net, 512, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, CUDNN_ACTIVATION_RELU); @@ -68,7 +68,7 @@ int main() { tk::dnn::Activation a15(&net, CUDNN_ACTIVATION_RELU); tk::dnn::Conv2d c16(&net, 512, 3, 3, 1, 1, 1, 1, c16_bin, true); tk::dnn::Activation a16(&net, CUDNN_ACTIVATION_RELU); - tk::dnn::Pooling p17(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p17(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c18(&net, 1024, 3, 3, 1, 1, 1, 1, c18_bin, true); tk::dnn::Activation a18(&net, CUDNN_ACTIVATION_RELU); diff --git a/tests/yolo_tiny/yolo_tiny.cpp b/tests/yolo_tiny/yolo_tiny.cpp index c2ab1e6..29bfa6e 100644 --- a/tests/yolo_tiny/yolo_tiny.cpp +++ b/tests/yolo_tiny/yolo_tiny.cpp @@ -25,23 +25,23 @@ int main() { tk::dnn::Conv2d c0 (&net, 16, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 32, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 64, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p5 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8(&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p9(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p9(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c10(&net, 512, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); diff --git a/tests/yolo_voc/yolo_voc.cpp b/tests/yolo_voc/yolo_voc.cpp index 9f30584..c3702af 100644 --- a/tests/yolo_voc/yolo_voc.cpp +++ b/tests/yolo_voc/yolo_voc.cpp @@ -38,11 +38,11 @@ int main() { tk::dnn::Conv2d c0 (&net, 32, 3, 3, 1, 1, 1, 1, c0_bin, true); tk::dnn::Activation a0 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p1 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c2 (&net, 64, 3, 3, 1, 1, 1, 1, c2_bin, true); tk::dnn::Activation a2 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p3 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c4 (&net, 128, 3, 3, 1, 1, 1, 1, c4_bin, true); tk::dnn::Activation a4 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -50,7 +50,7 @@ int main() { tk::dnn::Activation a5 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c6 (&net, 128, 3, 3, 1, 1, 1, 1, c6_bin, true); tk::dnn::Activation a6 (&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p7 (&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c8 (&net, 256, 3, 3, 1, 1, 1, 1, c8_bin, true); tk::dnn::Activation a8 (&net, tk::dnn::ACTIVATION_LEAKY); @@ -58,7 +58,7 @@ int main() { tk::dnn::Activation a9 (&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c10(&net, 256, 3, 3, 1, 1, 1, 1, c10_bin, true); tk::dnn::Activation a10(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p11(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p11(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c12(&net, 512, 3, 3, 1, 1, 1, 1, c12_bin, true); tk::dnn::Activation a12(&net, tk::dnn::ACTIVATION_LEAKY); @@ -70,7 +70,7 @@ int main() { tk::dnn::Activation a15(&net, tk::dnn::ACTIVATION_LEAKY); tk::dnn::Conv2d c16(&net, 512, 3, 3, 1, 1, 1, 1, c16_bin, true); tk::dnn::Activation a16(&net, tk::dnn::ACTIVATION_LEAKY); - tk::dnn::Pooling p17(&net, 2, 2, 2, 2, tk::dnn::POOLING_MAX); + tk::dnn::Pooling p17(&net, 2, 2, 2, 2, 0, 0, tk::dnn::POOLING_MAX); tk::dnn::Conv2d c18(&net, 1024, 3, 3, 1, 1, 1, 1, c18_bin, true); tk::dnn::Activation a18(&net, tk::dnn::ACTIVATION_LEAKY);