Revert "COMPMID-1329: Add support for GenerateProposals operator in CL"

This reverts commit cd96a26f67bfbb9b0efe6e0e2b229d0b46b4e3e6.

Change-Id: I1d46f37095c94968ad4f3b781269adaa03e2e410
Signed-off-by: giuros01 <giuseppe.rossini@arm.com>
Reviewed-on: https://review.mlplatform.org/706
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

9 files changed, 8 insertions, 201 deletions

diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h
index b73f4f23ca..cf213e4e51 100644
--- a/arm_compute/graph/GraphBuilder.h
+++ b/arm_compute/graph/GraphBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -253,19 +253,6 @@ public:
                                             const FullyConnectedLayerInfo fc_info            = FullyConnectedLayerInfo(),
                                             const QuantizationInfo        weights_quant_info = QuantizationInfo(),
                                             const QuantizationInfo        out_quant_info     = QuantizationInfo());
-    /** Adds a generate proposals layer node to the graph
-     *
-     * @param[in] g       Graph to add the layer to
-     * @param[in] params  Common node parameters
-     * @param[in] scores  Input scores to the generate proposals layer node as a NodeID-Index pair
-     * @param[in] deltas  Input deltas to the generate proposals layer node as a NodeID-Index pair
-     * @param[in] anchors Input anchors to the generate proposals layer node as a NodeID-Index pair
-     * @param[in] info    Generate proposals operation information
-     *
-     * @return Node ID of the created node, EmptyNodeID in case of error
-     */
-    static NodeID add_generate_proposals_node(Graph &g, NodeParams params, NodeIdxPair scores, NodeIdxPair deltas,
-                                              NodeIdxPair anchors, GenerateProposalsInfo info);
     /** Adds a normalization layer node to the graph
      *
      * @param[in] g         Graph to add the node to
diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h
index e33c984fd6..faa7f31911 100644
--- a/arm_compute/graph/TypePrinter.h
+++ b/arm_compute/graph/TypePrinter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -98,9 +98,6 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type)
         case NodeType::FullyConnectedLayer:
             os << "FullyConnectedLayer";
             break;
-        case NodeType::GenerateProposalsLayer:
-            os << "GenerateProposalsLayer";
-            break;
         case NodeType::NormalizationLayer:
             os << "NormalizationLayer";
             break;
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index 60fe0a883e..ee136e2a1e 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -138,7 +138,6 @@ enum class NodeType
     EltwiseLayer,
     FlattenLayer,
     FullyConnectedLayer,
-    GenerateProposalsLayer,
     NormalizationLayer,
     NormalizePlanarYUVLayer,
     PadLayer,
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index 96adffee46..548afd27c5 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -688,55 +688,6 @@ std::unique_ptr<IFunction> create_fully_connected_layer(FullyConnectedLayerNode
     return std::move(func);
 }
 
-/** Create a backend generate proposals layer function
- *
- * @tparam GenerateProposalsLayerFunction Backend generate proposals function
- * @tparam TargetInfo                     Target-specific information
- *
- * @param[in] node Node to create the backend function for
- * @param[in] ctx  Graph context
- *
- * @return Backend generate proposals layer function
- */
-template <typename GenerateProposalsLayerFunction, typename TargetInfo>
-std::unique_ptr<IFunction> create_generate_proposals_layer(GenerateProposalsLayerNode &node, GraphContext &ctx)
-{
-    validate_node<TargetInfo>(node, 3 /* expected inputs */, 3 /* expected outputs */);
-
-    // Extract IO and info
-    typename TargetInfo::TensorType *scores              = get_backing_tensor<TargetInfo>(node.input(0));
-    typename TargetInfo::TensorType *deltas              = get_backing_tensor<TargetInfo>(node.input(1));
-    typename TargetInfo::TensorType *anchors             = get_backing_tensor<TargetInfo>(node.input(2));
-    typename TargetInfo::TensorType *proposals           = get_backing_tensor<TargetInfo>(node.output(0));
-    typename TargetInfo::TensorType *scores_out          = get_backing_tensor<TargetInfo>(node.output(1));
-    typename TargetInfo::TensorType *num_valid_proposals = get_backing_tensor<TargetInfo>(node.output(2));
-    const GenerateProposalsInfo      info                = node.info();
-
-    ARM_COMPUTE_ERROR_ON(scores == nullptr);
-    ARM_COMPUTE_ERROR_ON(deltas == nullptr);
-    ARM_COMPUTE_ERROR_ON(anchors == nullptr);
-    ARM_COMPUTE_ERROR_ON(proposals == nullptr);
-    ARM_COMPUTE_ERROR_ON(scores_out == nullptr);
-
-    // Create and configure function
-    auto func = support::cpp14::make_unique<GenerateProposalsLayerFunction>(get_memory_manager(ctx, TargetInfo::TargetType));
-    func->configure(scores, deltas, anchors, proposals, scores_out, num_valid_proposals, info);
-
-    // Log info
-    ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type()
-                               << " Target " << TargetInfo::TargetType
-                               << " Data Type: " << scores->info()->data_type()
-                               << " Scores shape: " << scores->info()->tensor_shape()
-                               << " Deltas shape: " << deltas->info()->tensor_shape()
-                               << " Anchors shape: " << anchors->info()->tensor_shape()
-                               << " Proposals shape: " << proposals->info()->tensor_shape()
-                               << " Num valid proposals shape: " << num_valid_proposals->info()->tensor_shape()
-                               << " Scores Out shape: " << scores_out->info()->tensor_shape()
-                               << std::endl);
-
-    return std::move(func);
-}
-
 /** Create a backend normalization layer function
  *
  * @tparam NormalizationLayerFunction Backend normalization function
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index f1e53613ab..1b06f31bed 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -228,33 +228,6 @@ Status validate_detection_output_layer(DetectionOutputLayerNode &node)
     return DetectionOutputLayer::validate(input0, input1, input2, output, detect_info);
 }
 
-/** Validates a Generate Proposals layer node
- *
- * @tparam GenerateProposalsLayer Generate Proposals layer type
- *
- * @param[in] node Node to validate
- *
- * @return Status
- */
-template <typename GenerateProposalsLayer>
-Status validate_generate_proposals_layer(GenerateProposalsLayerNode &node)
-{
-    ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating GenerateProposalsLayer node with ID : " << node.id() << " and Name: " << node.name() << std::endl);
-    ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 3);
-    ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 3);
-
-    // Extract IO and info
-    arm_compute::ITensorInfo   *scores              = detail::get_backing_tensor_info(node.input(0));
-    arm_compute::ITensorInfo   *deltas              = detail::get_backing_tensor_info(node.input(1));
-    arm_compute::ITensorInfo   *anchors             = detail::get_backing_tensor_info(node.input(2));
-    arm_compute::ITensorInfo   *proposals           = get_backing_tensor_info(node.output(0));
-    arm_compute::ITensorInfo   *scores_out          = get_backing_tensor_info(node.output(1));
-    arm_compute::ITensorInfo   *num_valid_proposals = get_backing_tensor_info(node.output(2));
-    const GenerateProposalsInfo info                = node.info();
-
-    return GenerateProposalsLayer::validate(scores, deltas, anchors, proposals, scores_out, num_valid_proposals, info);
-}
-
 /** Validates a NormalizePlanarYUV layer node
  *
  * @tparam NormalizePlanarYUVLayer layer type
diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h
index 72353a2bbd..d10fa7f27a 100644
--- a/arm_compute/graph/frontend/Layers.h
+++ b/arm_compute/graph/frontend/Layers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -608,44 +608,6 @@ private:
     const QuantizationInfo        _out_quant_info;
 };
 
-/** Generate Proposals Layer */
-class GenerateProposalsLayer final : public ILayer
-{
-public:
-    /** Construct a generate proposals layer.
-     *
-     * @param[in] ss_scores  Graph sub-stream for the scores.
-     * @param[in] ss_deltas  Graph sub-stream for the deltas.
-     * @param[in] ss_anchors Graph sub-stream for the anchors.
-     * @param[in] info       Generate Proposals operation information.
-     */
-    GenerateProposalsLayer(SubStream &&ss_scores, SubStream &&ss_deltas, SubStream &&ss_anchors, GenerateProposalsInfo info)
-        : _ss_scores(std::move(ss_scores)), _ss_deltas(std::move(ss_deltas)), _ss_anchors(std::move(ss_anchors)), _info(info)
-    {
-    }
-
-    /** Create layer and add to the given stream.
-     *
-     * @param[in] s Stream to add layer to.
-     *
-     * @return ID of the created node.
-     */
-    NodeID create_layer(IStream &s) override
-    {
-        NodeParams  common_params = { name(), s.hints().target_hint };
-        NodeIdxPair scores        = { _ss_scores.tail_node(), 0 };
-        NodeIdxPair deltas        = { _ss_deltas.tail_node(), 0 };
-        NodeIdxPair anchors       = { _ss_anchors.tail_node(), 0 };
-        return GraphBuilder::add_generate_proposals_node(s.graph(), common_params, scores, deltas, anchors, _info);
-    }
-
-private:
-    SubStream             _ss_scores;
-    SubStream             _ss_deltas;
-    SubStream             _ss_anchors;
-    GenerateProposalsInfo _info;
-};
-
 /** Normalization Layer */
 class NormalizationLayer final : public ILayer
 {
diff --git a/arm_compute/graph/nodes/GenerateProposalsLayerNode.h b/arm_compute/graph/nodes/GenerateProposalsLayerNode.h
deleted file mode 100644
index 09fbb3ee15..0000000000
--- a/arm_compute/graph/nodes/GenerateProposalsLayerNode.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2018 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__
-#define __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__
-
-#include "arm_compute/graph/INode.h"
-
-namespace arm_compute
-{
-namespace graph
-{
-/** Generate Proposals Layer node */
-class GenerateProposalsLayerNode final : public INode
-{
-public:
-    /** Constructor
-     *
-     * @param[in] info Generate proposals operation information.
-     */
-    GenerateProposalsLayerNode(GenerateProposalsInfo &info);
-    /** GenerateProposalsInfo accessor
-     *
-     * @return GenerateProposalsInfo
-     */
-    const GenerateProposalsInfo &info() const;
-
-    // Inherited overridden methods:
-    NodeType         type() const override;
-    bool             forward_descriptors() override;
-    TensorDescriptor configure_output(size_t idx) const override;
-    void accept(INodeVisitor &v) override;
-
-private:
-    GenerateProposalsInfo _info;
-};
-} // namespace graph
-} // namespace arm_compute
-#endif /* __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__ */
diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h
index c85c4dc375..79ae5d4ae7 100644
--- a/arm_compute/graph/nodes/Nodes.h
+++ b/arm_compute/graph/nodes/Nodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -38,7 +38,6 @@
 #include "arm_compute/graph/nodes/EltwiseLayerNode.h"
 #include "arm_compute/graph/nodes/FlattenLayerNode.h"
 #include "arm_compute/graph/nodes/FullyConnectedLayerNode.h"
-#include "arm_compute/graph/nodes/GenerateProposalsLayerNode.h"
 #include "arm_compute/graph/nodes/InputNode.h"
 #include "arm_compute/graph/nodes/NormalizationLayerNode.h"
 #include "arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h"
diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h
index 542c129ad6..6a0be1bf59 100644
--- a/arm_compute/graph/nodes/NodesFwd.h
+++ b/arm_compute/graph/nodes/NodesFwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -44,7 +44,6 @@ class DummyNode;
 class EltwiseLayerNode;
 class FlattenLayerNode;
 class FullyConnectedLayerNode;
-class GenerateProposalsLayerNode;
 class InputNode;
 class NormalizationLayerNode;
 class NormalizePlanarYUVLayerNode;