arm_compute v18.05

[platform/upstream/armcl.git] / examples / neon_convolution.cpp

diff --git a/examples/neon_convolution.cpp b/examples/neon_convolution.cpp
index fc68aa2..d51d201 100644 (file)
--- a/examples/neon_convolution.cpp
+++ b/examples/neon_convolution.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016, 2018 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -24,10 +24,10 @@
 #include "arm_compute/runtime/NEON/NEFunctions.h"
 
 #include "arm_compute/core/Types.h"
-#include "test_helpers/Utils.h"
+#include "utils/Utils.h"
 
 using namespace arm_compute;
-using namespace test_helpers;
+using namespace utils;
 
 /** Gaussian 3x3 matrix
  */
@@ -49,69 +49,79 @@ const int16_t gaussian5x5[] =
     1, 4, 6, 4, 1
 };
 
-void main_neon_convolution(int argc, const char **argv)
+class NEONConvolutionExample : public Example
 {
-    /** [Accurate padding] **/
-    PPMLoader ppm;
-    Image     src, tmp, dst;
-
-    if(argc < 2)
-    {
-        // Print help
-        std::cout << "Usage: ./build/neon_convolution [input_image.ppm]\n\n";
-        std::cout << "No input_image provided, creating a dummy 640x480 image\n";
-        // Initialize just the dimensions and format of your buffers:
-        src.allocator()->init(TensorInfo(640, 480, Format::U8));
-    }
-    else
+public:
+    void do_setup(int argc, char **argv) override
     {
-        ppm.open(argv[1]);
-        // Initialize just the dimensions and format of your buffers:
-        ppm.init_image(src, Format::U8);
-    }
+        /** [Accurate padding] **/
+        PPMLoader ppm;
 
-    // Initialize just the dimensions and format of the temporary and destination images:
-    tmp.allocator()->init(*src.info());
-    dst.allocator()->init(*src.info());
+        if(argc < 2)
+        {
+            // Print help
+            std::cout << "Usage: ./build/neon_convolution [input_image.ppm]\n\n";
+            std::cout << "No input_image provided, creating a dummy 640x480 image\n";
+            // Initialize just the dimensions and format of your buffers:
+            src.allocator()->init(TensorInfo(640, 480, Format::U8));
+        }
+        else
+        {
+            ppm.open(argv[1]);
+            // Initialize just the dimensions and format of your buffers:
+            ppm.init_image(src, Format::U8);
+        }
 
-    NEConvolution3x3 conv3x3;
-    NEConvolution5x5 conv5x5;
+        // Initialize just the dimensions and format of the temporary and destination images:
+        tmp.allocator()->init(*src.info());
+        dst.allocator()->init(*src.info());
 
-    // Apply a Gaussian 3x3 filter to the source image followed by a Gaussian 5x5:
-    // The function will automatically update the padding information inside input and output to match its requirements
-    conv3x3.configure(&src, &tmp, gaussian3x3, 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED);
-    conv5x5.configure(&tmp, &dst, gaussian5x5, 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED);
+        // Apply a Gaussian 3x3 filter to the source image followed by a Gaussian 5x5:
+        // The function will automatically update the padding information inside input and output to match its requirements
+        conv3x3.configure(&src, &tmp, gaussian3x3, 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED);
+        conv5x5.configure(&tmp, &dst, gaussian5x5, 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED);
 
-    // Now that the padding requirements are known we can allocate the images:
-    src.allocator()->allocate();
-    tmp.allocator()->allocate();
-    dst.allocator()->allocate();
+        // Now that the padding requirements are known we can allocate the images:
+        src.allocator()->allocate();
+        tmp.allocator()->allocate();
+        dst.allocator()->allocate();
 
-    // Fill the input image with the content of the PPM image if a filename was provided:
-    if(ppm.is_open())
+        // Fill the input image with the content of the PPM image if a filename was provided:
+        if(ppm.is_open())
+        {
+            ppm.fill_image(src);
+            output_filename = std::string(argv[1]) + "_out.ppm";
+        }
+        /** [Accurate padding] **/
+    }
+    void do_run() override
     {
-        ppm.fill_image(src);
+        //Execute the functions:
+        conv3x3.run();
+        conv5x5.run();
     }
-
-    //Execute the functions:
-    conv3x3.run();
-    conv5x5.run();
-
-    // Save the result to file:
-    if(ppm.is_open())
+    void do_teardown() override
     {
-        const std::string output_filename = std::string(argv[1]) + "_out.ppm";
-        save_to_ppm(dst, output_filename);
+        // Save the result to file:
+        if(!output_filename.empty())
+        {
+            save_to_ppm(dst, output_filename); // save_to_ppm maps and unmaps the image to store as PPM
+        }
     }
-    /** [Accurate padding] **/
-}
+
+private:
+    Image            src{}, tmp{}, dst{};
+    NEConvolution3x3 conv3x3{};
+    NEConvolution5x5 conv5x5{};
+    std::string      output_filename{};
+};
 
 /** Main program for convolution test
  *
  * @param[in] argc Number of arguments
  * @param[in] argv Arguments ( [optional] Path to PPM image to process )
  */
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
-    return test_helpers::run_example(argc, argv, main_neon_convolution);
+    return utils::run_example<NEONConvolutionExample>(argc, argv);
 }