COMPMID-782 Port examples to the new format

Change-Id: Ib178a97c080ff650094d02ee49e2a0aa22376dd0
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115717
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>

1 files changed, 183 insertions, 175 deletions

diff --git a/examples/graph_vgg19.cpp b/examples/graph_vgg19.cpp
index 1f6cba4441..5214438d7f 100644
--- a/examples/graph_vgg19.cpp
+++ b/examples/graph_vgg19.cpp
@@ -29,6 +29,7 @@
 
 #include <cstdlib>
 
+using namespace arm_compute::utils;
 using namespace arm_compute::graph;
 using namespace arm_compute::graph_utils;
 
@@ -37,188 +38,195 @@ using namespace arm_compute::graph_utils;
  * @param[in] argc Number of arguments
  * @param[in] argv Arguments ( [optional] Target (0 = NEON, 1 = OpenCL), [optional] Path to the weights folder, [optional] image, [optional] labels )
  */
-void main_graph_vgg19(int argc, char **argv)
+class GraphVGG19Example : public Example
 {
-    std::string data_path; /* Path to the trainable data */
-    std::string image;     /* Image data */
-    std::string label;     /* Label data */
+public:
+    void do_setup(int argc, char **argv) override
+    {
+        std::string data_path; /* Path to the trainable data */
+        std::string image;     /* Image data */
+        std::string label;     /* Label data */
 
-    constexpr float mean_r = 123.68f;  /* Mean value to subtract from red channel */
-    constexpr float mean_g = 116.779f; /* Mean value to subtract from green channel */
-    constexpr float mean_b = 103.939f; /* Mean value to subtract from blue channel */
+        constexpr float mean_r = 123.68f;  /* Mean value to subtract from red channel */
+        constexpr float mean_g = 116.779f; /* Mean value to subtract from green channel */
+        constexpr float mean_b = 103.939f; /* Mean value to subtract from blue channel */
 
-    // Set target. 0 (NEON), 1 (OpenCL). By default it is NEON
-    TargetHint            target_hint      = set_target_hint(argc > 1 ? std::strtol(argv[1], nullptr, 10) : 0);
-    ConvolutionMethodHint convolution_hint = ConvolutionMethodHint::DIRECT;
+        // Set target. 0 (NEON), 1 (OpenCL). By default it is NEON
+        TargetHint            target_hint      = set_target_hint(argc > 1 ? std::strtol(argv[1], nullptr, 10) : 0);
+        ConvolutionMethodHint convolution_hint = ConvolutionMethodHint::DIRECT;
 
-    // Parse arguments
-    if(argc < 2)
-    {
-        // Print help
-        std::cout << "Usage: " << argv[0] << " [target] [path_to_data] [image] [labels]\n\n";
-        std::cout << "No data folder provided: using random values\n\n";
-    }
-    else if(argc == 2)
-    {
-        std::cout << "Usage: " << argv[0] << " " << argv[1] << " [path_to_data] [image] [labels]\n\n";
-        std::cout << "No data folder provided: using random values\n\n";
-    }
-    else if(argc == 3)
-    {
-        data_path = argv[2];
-        std::cout << "Usage: " << argv[0] << " " << argv[1] << " " << argv[2] << " [image] [labels]\n\n";
-        std::cout << "No image provided: using random values\n\n";
-    }
-    else if(argc == 4)
-    {
-        data_path = argv[2];
-        image     = argv[3];
-        std::cout << "Usage: " << argv[0] << " " << argv[1] << " " << argv[2] << " " << argv[3] << " [labels]\n\n";
-        std::cout << "No text file with labels provided: skipping output accessor\n\n";
+        // Parse arguments
+        if(argc < 2)
+        {
+            // Print help
+            std::cout << "Usage: " << argv[0] << " [target] [path_to_data] [image] [labels]\n\n";
+            std::cout << "No data folder provided: using random values\n\n";
+        }
+        else if(argc == 2)
+        {
+            std::cout << "Usage: " << argv[0] << " " << argv[1] << " [path_to_data] [image] [labels]\n\n";
+            std::cout << "No data folder provided: using random values\n\n";
+        }
+        else if(argc == 3)
+        {
+            data_path = argv[2];
+            std::cout << "Usage: " << argv[0] << " " << argv[1] << " " << argv[2] << " [image] [labels]\n\n";
+            std::cout << "No image provided: using random values\n\n";
+        }
+        else if(argc == 4)
+        {
+            data_path = argv[2];
+            image     = argv[3];
+            std::cout << "Usage: " << argv[0] << " " << argv[1] << " " << argv[2] << " " << argv[3] << " [labels]\n\n";
+            std::cout << "No text file with labels provided: skipping output accessor\n\n";
+        }
+        else
+        {
+            data_path = argv[2];
+            image     = argv[3];
+            label     = argv[4];
+        }
+
+        graph << target_hint
+              << convolution_hint
+              << Tensor(TensorInfo(TensorShape(224U, 224U, 3U, 1U), 1, DataType::F32),
+                        get_input_accessor(image, mean_r, mean_g, mean_b))
+              // Layer 1
+              << ConvolutionLayer(
+                  3U, 3U, 64U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_1_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_1_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 64U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_2_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_2_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
+              // Layer 2
+              << ConvolutionLayer(
+                  3U, 3U, 128U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_1_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_1_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 128U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_2_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_2_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
+              // Layer 3
+              << ConvolutionLayer(
+                  3U, 3U, 256U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_1_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_1_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 256U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_2_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_2_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 256U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_3_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_3_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 256U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_4_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_4_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
+              // Layer 4
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_1_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_1_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_2_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_2_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_3_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_3_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_4_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_4_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
+              // Layer 5
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_1_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_1_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_2_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_2_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_3_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_3_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << ConvolutionLayer(
+                  3U, 3U, 512U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_4_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_4_b.npy"),
+                  PadStrideInfo(1, 1, 1, 1))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
+              // Layer 6
+              << FullyConnectedLayer(
+                  4096U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc6_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc6_b.npy"))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              // Layer 7
+              << FullyConnectedLayer(
+                  4096U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc7_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc7_b.npy"))
+              << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
+              // Layer 8
+              << FullyConnectedLayer(
+                  1000U,
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc8_w.npy"),
+                  get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc8_b.npy"))
+              // Softmax
+              << SoftmaxLayer()
+              << Tensor(get_output_accessor(label, 5));
     }
-    else
+    void do_run() override
     {
-        data_path = argv[2];
-        image     = argv[3];
-        label     = argv[4];
+        // Run graph
+        graph.run();
     }
 
-    Graph graph;
-
-    graph << target_hint
-          << convolution_hint
-          << Tensor(TensorInfo(TensorShape(224U, 224U, 3U, 1U), 1, DataType::F32),
-                    get_input_accessor(image, mean_r, mean_g, mean_b))
-          // Layer 1
-          << ConvolutionLayer(
-              3U, 3U, 64U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_1_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_1_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 64U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_2_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv1_2_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
-          // Layer 2
-          << ConvolutionLayer(
-              3U, 3U, 128U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_1_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_1_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 128U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_2_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv2_2_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
-          // Layer 3
-          << ConvolutionLayer(
-              3U, 3U, 256U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_1_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_1_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 256U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_2_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_2_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 256U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_3_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_3_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 256U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_4_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv3_4_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
-          // Layer 4
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_1_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_1_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_2_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_2_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_3_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_3_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_4_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv4_4_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
-          // Layer 5
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_1_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_1_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_2_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_2_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_3_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_3_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << ConvolutionLayer(
-              3U, 3U, 512U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_4_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/conv5_4_b.npy"),
-              PadStrideInfo(1, 1, 1, 1))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          << PoolingLayer(PoolingLayerInfo(PoolingType::MAX, 2, PadStrideInfo(2, 2, 0, 0)))
-          // Layer 6
-          << FullyConnectedLayer(
-              4096U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc6_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc6_b.npy"))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          // Layer 7
-          << FullyConnectedLayer(
-              4096U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc7_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc7_b.npy"))
-          << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))
-          // Layer 8
-          << FullyConnectedLayer(
-              1000U,
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc8_w.npy"),
-              get_weights_accessor(data_path, "/cnn_data/vgg19_model/fc8_b.npy"))
-          // Softmax
-          << SoftmaxLayer()
-          << Tensor(get_output_accessor(label, 5));
-
-    // Run graph
-    graph.run();
-}
+private:
+    Graph graph{};
+};
 
 /** Main program for VGG19
  *
@@ -227,5 +235,5 @@ void main_graph_vgg19(int argc, char **argv)
  */
 int main(int argc, char **argv)
 {
-    return arm_compute::utils::run_example(argc, argv, main_graph_vgg19);
+    return arm_compute::utils::run_example<GraphVGG19Example>(argc, argv);
 }