dnn: remove inheritance from reduce functors

alalek · alalek · commit bf90641e6150 · 2022-03-04T09:40:57.000Z
diff --git a/modules/dnn/src/layers/reduce_layer.cpp b/modules/dnn/src/layers/reduce_layer.cpp
@@ -74,10 +74,8 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
     class ReduceOpBase
     {
     public:
-        bool hasSIMD = false;
-        ReduceOpBase() {}
-        virtual ~ReduceOpBase() {};
-        virtual float apply(const float*, const float*, const float ikarea = 1.0f) = 0;
+        //bool hasSIMD = false;
+        //float apply(const float*, const float*, const float ikarea = 1.0f);
     };
 
     // type == MIN
@@ -87,7 +85,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpMIN() {}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             return std::accumulate(first, last, FLT_MAX,
                                    [](float a, float b)
@@ -104,7 +102,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpMAX() {}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             return std::accumulate(first, last, -FLT_MAX,
                                    [](float a, float b)
@@ -121,7 +119,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpSUM() {}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             return std::accumulate(first, last, 0.f);
         }
@@ -134,7 +132,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpAVE() {}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             float output = std::accumulate(first, last, 0.f);
             return output * ikarea;
@@ -148,7 +146,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpSUM_SQUARE(){}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             return std::accumulate(first, last, 0.f,
                                    [](float a, float b)
@@ -165,7 +163,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpL1(){}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             return std::accumulate(first, last, 0.f,
                                    [](float a, float b)
@@ -182,7 +180,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpL2(){}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             float output = std::accumulate(first, last, 0.f,
                                            [](float a, float b)
@@ -200,7 +198,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = true;
         ReduceOpPROD(){}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             return std::accumulate(first, last, 1.0f, std::multiplies<float>());
         }
@@ -213,7 +211,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
         bool hasSIMD = false;
         ReduceOpLOG_SUM(){}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             float output = std::accumulate(first, last, 0.0f);
             return std::log(output);
@@ -226,7 +224,7 @@ class ReduceLayerImpl CV_FINAL : public ReduceLayer
     public:
         ReduceOpLOG_SUM_EXP(){}
 
-        float apply(const float* first, const float* last, const float ikarea = 1.0f) override
+        float apply(const float* first, const float* last, const float ikarea = 1.0f)
         {
             float output = std::accumulate(first, last, 0.0f,
                                            [](float a, float b)
